Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -1651,12 +1651,18 @@
         this.resourceBomId = resourceBomId;
         this.attributeData = attributeData;
 
-        if (this.attributeData) {
-          this.form.baseCount = this.attributeData.baseCount;
+        if (rowData.baseCount) {
+          this.form.baseCount = rowData.baseCount;
         } else {
           this.form.baseCount = 1;
         }
 
+        // if (this.attributeData) {
+        //   this.form.baseCount = this.attributeData.baseCount;
+        // } else {
+        //   this.form.baseCount = 1;
+        // }
+
         if (!this.isView) {
           this.columns = this.defaultColumns.concat({
             columnKey: 'action',

vue.config.js

@@ -37,8 +37,8 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
 
         // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.125:18086',
         target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',