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

.eslintrc.js

@@ -7,8 +7,10 @@ module.exports = {
   },
   parser: 'vue-eslint-parser',
   extends: [
+    '@vue/prettier',
     'plugin:vue/essential',
     'eslint:recommended',
+    'prettier',
     'plugin:prettier/recommended'
   ],
   parserOptions: {

package.json

@@ -50,6 +50,7 @@
     "@vue/cli-plugin-router": "^5.0.8",
     "@vue/cli-plugin-vuex": "^5.0.8",
     "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-prettier": "^8.0.0",
     "compression-webpack-plugin": "^9.2.0",
     "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.5.0",

src/views/productionPlan/workOrderPublish.vue

@@ -176,7 +176,11 @@
 
         this.infoData = data.productionPlan;
 
-        this.orderList = data.workOrderList;
+        this.orderList = data.workOrderList.map(itm => ({
+          ...itm,
+          productCode: data.productionPlan.productCode,
+          productName: data.productionPlan.productName
+        }));
       }
     },
     created () {