695593266@qq.com 8 ماه پیش
والد
کامیت
6723b8ad10

+ 2 - 2
src/views/produce/components/feeding/components/batchProductsBom.vue

@@ -249,9 +249,9 @@
             align: 'center',
             showOverflowTooltip: true,
             formatter: (row) => {
-              return row.reworks == '1'
+              return row.rework == '1'
                 ? '返工'
-                : row.reworks == '2'
+                : row.rework == '2'
                 ? '返修'
                 : '';
             }

+ 2 - 2
src/views/produce/components/jobBooking/components/batchSemiProductJobBom.vue

@@ -1093,9 +1093,9 @@
             align: 'center',
             showOverflowTooltip: true,
             formatter: (row) => {
-              return row.reworks == '1'
+              return row.rework == '1'
                 ? '返工'
-                : row.reworks == '2'
+                : row.rework == '2'
                 ? '返修'
                 : '';
             }

+ 2 - 2
src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -951,9 +951,9 @@
             align: 'center',
             showOverflowTooltip: true,
             formatter: (row) => {
-              return row.reworks == '1'
+              return row.rework == '1'
                 ? '返工'
-                : row.reworks == '2'
+                : row.rework == '2'
                 ? '返修'
                 : '';
             }

+ 7 - 7
src/views/produce/components/workPlan/index.vue

@@ -499,13 +499,13 @@
       },
 
       async openEdit(type, row) {
-        // if (type == 'edit') {
-        //   const code = await verificationQualityInspector(row.id);
-        //   if (code == '-1') {
-        //     console.log('不是报工人');
-        //     return;
-        //   }
-        // }
+        if (type == 'edit') {
+          const code = await verificationQualityInspector(row.id);
+          if (code == '-1') {
+            console.log('不是报工人');
+            return;
+          }
+        }
 
         const req = {
           workOrderId: row.id,