Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao

package.json

@@ -15,7 +15,7 @@
     "core-js": "^3.6.5",
     "echarts": "^5.2.0",
     "element-china-area-data": "^5.0.2",
-    "element-plus": "^1.2.0-beta.6",
+    "element-plus": "^1.0.2-beta.48",
     "moment": "^2.29.1",
     "vue": "^3.2.26",
     "vue-picture-cropper": "^0.1.11",

src/main.js

@@ -5,7 +5,7 @@ import Vuex from 'vuex'
 import { modules } from "./store";
 import ElementPlus from "element-plus";
 import './icons'
-import "element-plus/dist/index.css";
+import "element-plus/lib/theme-chalk/index.css";
 import "dayjs/locale/zh-cn";
 import "./assets/css/base.css";
 import locale from "element-plus/lib/locale/lang/zh-cn";

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

@@ -195,6 +195,7 @@ export default {
       selectKey: "",
       tableWidth: "calc(100% - 15px)",
       promptMessage:"",
+      editKeyList:[],
     };
   },
   created() {
@@ -347,6 +348,9 @@ export default {
     },
     // 编辑航
     editRow(data) {
+
+      if( !this.editKeyList.includes(this.selectKey) ) this.editKeyList.push(this.selectKey)
+      console.log('%cindex.vue line:353 this.editKeyList', 'color: #007acc;', this.editKeyList);
       this.editKey = this.selectKey;
       this.editField = data;
     },
@@ -418,6 +422,19 @@ export default {
         // this.$message({ type: "error", message: "访问失败" });
       });
     },
+    getEditTableDataJson(){
+  
+      let editMapList = JSON.parse(JSON.stringify(this.TableData)).filter(item => this.editKeyList.includes(item.key))
+      editMapList.forEach(item => {
+        item["AP_ArticleDemand-ArtId"] = item.key;
+        delete item.index;
+        delete item.show;
+        delete item.key;
+        delete item.Label;
+      });
+      console.log('%cindex.vue line:435 editMapList', 'color: #007acc;', editMapList);
+      return JSON.stringify(editMapList); 
+    },
     // 保存数据
     saveDemandData() {
       // if (!this.editField) {
@@ -428,7 +445,7 @@ export default {
       let param = {};
       param.customerid = this.customerId;
       param.artid = this.artId;
-      param.maplist = this.getTableDataJson();
+      param.maplist = this.getEditTableDataJson();
       this.INIT_evaluationSecondResourceListData();
       this.INIT_evaluationMainResourceData();
       this.SET_evaluationMainResourceLoading(true);
@@ -438,6 +455,8 @@ export default {
         this.SET_evaluationSecondResourceListData(data["ArticleSecondResourceMpsGroupLst"] || []);
         this.SET_evaluationSecondResourceLoading(false);
         this.SET_evaluationMainResourceLoading(false);
+        this.handleQuery()
+        this.editKeyList = []
         this.$message({ type: "success", message: "保存成功" });
       }).catch(() => {
         this.SET_evaluationSecondResourceLoading(false);