695593266@qq.com пре 9 месеци
родитељ
комит
19347b56c3
2 измењених фајлова са 10 додато и 4 уклоњено
  1. 8 2
      src/views/material/BOMmanage/components/workingProcedure.vue
  2. 2 2
      vue.config.js

+ 8 - 2
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',

+ 2 - 2
vue.config.js

@@ -37,13 +37,13 @@ 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',
 
-        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {