lucw 7 mesi fa
parent
commit
03c4cc2d7c

+ 1 - 1
src/views/batchRecord/components/list.vue

@@ -65,7 +65,7 @@
           :underline="false"
           @click="execute(row)"
         >
-          执行
+          报工
         </el-link>
 
         <el-link

+ 4 - 4
src/views/checklistManagement/checklist.vue

@@ -132,17 +132,17 @@
             }
           },
           {
-            prop: 'code1',
+            prop: 'code',
             label: '生产工单号',
             align: 'center',
             minWidth: 110,
             showOverflowTooltip: true,
             formatter: (row) => {
-              return row.orders.map((i) => i.id).join(', ');
+              return row.orders.map((i) => i.workOrderCode).join(', ');
             }
           },
           {
-            prop: 'code2',
+            prop: 'formingNum',
             label: '数量',
             align: 'center',
             minWidth: 110,
@@ -152,7 +152,7 @@
             }
           },
           {
-            prop: 'code3',
+            prop: 'specification',
             label: '规格',
             align: 'center',
             minWidth: 110,

+ 2 - 2
src/views/produce/components/prenatalExamination/index.vue

@@ -92,11 +92,11 @@
       executeStatusTest(status) {
         switch (status) {
           case 0:
-            return '未执行';
+            return '未报工';
           case 1:
             return '执行中';
           default:
-            return '已执行';
+            return '已报工';
         }
       },
       // 获取数据

+ 2 - 2
vue.config.js

@@ -37,8 +37,8 @@ module.exports = {
         // 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.116:18086', // 赵沙金
-        target: 'http://192.168.1.251:18086', // 开发环境
+        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.144:18086',
         // target: 'http://192.168.1.30:18086',