Преглед изворни кода

修改工序报工任务提交时会判断重量的问题

695593266@qq.com пре 8 месеци
родитељ
комит
0fba20e0e3

+ 14 - 14
src/views/produce/components/taskDialog/index.vue

@@ -322,15 +322,15 @@
         if (!row.qualifiedQuantity && row.qualifiedQuantity != 0) {
           return this.$message.warning('请输入合格数量');
         }
-        if (!row.qualifiedWeight && row.qualifiedWeight != 0) {
-          return this.$message.warning('请输入合格重量');
-        }
+        // if (!row.qualifiedWeight && row.qualifiedWeight != 0) {
+        //   return this.$message.warning('请输入合格重量');
+        // }
         if (!row.unqualifiedQuantity && row.unqualifiedQuantity != 0) {
           return this.$message.warning('请输入不合格数量');
         }
-        if (!row.unqualifiedWeight && row.unqualifiedWeight != 0) {
-          return this.$message.warning('请输入不合格重量');
-        }
+        // if (!row.unqualifiedWeight && row.unqualifiedWeight != 0) {
+        //   return this.$message.warning('请输入不合格重量');
+        // }
         if (
           row.qualifiedQuantity - 0 + (row.unqualifiedQuantity - 0) !=
           row.quantity - 0
@@ -339,14 +339,14 @@
             `合格数量加不合格数量需要等于任务数量${row.quantity}`
           );
         }
-        if (
-          row.qualifiedWeight - 0 + (row.unqualifiedWeight - 0) !=
-          row.weight - 0
-        ) {
-          return this.$message.warning(
-            `合格重量加不合格重量需要等于任务重量${row.weight}`
-          );
-        }
+        // if (
+        //   row.qualifiedWeight - 0 + (row.unqualifiedWeight - 0) !=
+        //   row.weight - 0
+        // ) {
+        //   return this.$message.warning(
+        //     `合格重量加不合格重量需要等于任务重量${row.weight}`
+        //   );
+        // }
 
         let params = {
           realStartTime: row.realStartTime,

+ 1 - 1
src/views/taskList/components/task-search.vue

@@ -42,7 +42,7 @@
             placeholder: ''
           },
           {
-            label: '单编码:',
+            label: '单编码:',
             value: 'workOrderCode',
             type: 'input',
             placeholder: ''

+ 1 - 1
vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',