Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/materialPlan/index.vue

@@ -281,7 +281,7 @@
       },
 
       handleDetails(row) {
-        if (row.status == 0) {
+        if (row.approvalStatus == 0) {
           this.$message.info('未提交没有审核流程');
         } else {
           this.$refs.detailRef.open(row.processInstanceId);

src/views/workOrder/index.vue

@@ -300,13 +300,13 @@
           },
           {
             prop: 'productCode',
-            label: '产品编码',
+            label: '编码',
             align: 'center',
             minWidth: 110
           },
           {
             prop: 'productName',
-            label: '产品名称',
+            label: '名称',
             align: 'center',
             minWidth: 110
           },

vue.config.js

@@ -33,7 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.210:86/',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''