Browse Source

修改bug

695593266@qq.com 11 tháng trước cách đây
mục cha
commit
7060f7eab7

+ 5 - 2
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -433,6 +433,7 @@
                       >
                       >
                       </el-input>
                       </el-input>
                     </el-form-item>
                     </el-form-item>
+
                     <el-form-item prop="baseCountUnit" label="单位">
                     <el-form-item prop="baseCountUnit" label="单位">
                       <!-- <DictSelection
                       <!-- <DictSelection
                         dictName="计量单位"
                         dictName="计量单位"
@@ -823,7 +824,7 @@
           ]
           ]
         },
         },
         form: {
         form: {
-          baseCount: '',
+          baseCount: 0,
           baseCountUnit: ''
           baseCountUnit: ''
         },
         },
         baseCountUnit: '',
         baseCountUnit: '',
@@ -1642,7 +1643,9 @@
         // this.baseCount = rowData.baseCount;
         // this.baseCount = rowData.baseCount;
         // this.baseCountUnit = rowData.baseCountUnit;
         // this.baseCountUnit = rowData.baseCountUnit;
 
 
-        this.form.baseCount = rowData.baseCount;
+        console.log(rowData, 'rowData');
+
+        this.form.baseCount = rowData.baseCount || 1;
         this.form.baseCountUnit = rowData.baseCountUnit;
         this.form.baseCountUnit = rowData.baseCountUnit;
 
 
         this.baseCount2 = rowData.baseCount2;
         this.baseCount2 = rowData.baseCount2;

+ 1 - 0
src/views/material/BOMmanage/components/workmanship.vue

@@ -496,6 +496,7 @@
         let data = await getMbomPage({
         let data = await getMbomPage({
           ...where,
           ...where,
           bomCategoryId: this.resourceBomId,
           bomCategoryId: this.resourceBomId,
+          categoryCode: this.attributeData.categoryCode,
           pageNum: page,
           pageNum: page,
           size: limit
           size: limit
         });
         });

+ 2 - 1
vue.config.js

@@ -36,7 +36,8 @@ module.exports = {
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.251: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.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
         pathRewrite: {
           '^/api': ''
           '^/api': ''