lizhuo merges Goal Management into dev at 2023-8-1 9:00

src/views/business/spd/goal_management/AnnualSaleGoalMerge.vue

@@ -770,7 +770,8 @@ export default {
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
         twoLevelClassify: null,
-        annualGoalMergeDetailsList: null
+        annualGoalMergeDetailsList: null,
+        oldAnnualGoalMergeDetailsList: null
       },
       formDetails: {
         id: null,
@@ -878,7 +879,8 @@ export default {
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
         twoLevelClassify: null,
-        detailsList: null
+        annualGoalMergeDetailsList: null,
+        oldAnnualGoalMergeDetailsList: null
       };
       this.resetForm("form");
     },
@@ -985,7 +987,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
+            this.form.annualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
             console.log(this.form);
             updateAnnualSaleGoalMerge(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -1235,6 +1237,9 @@ export default {
     },
     // 合并数据
     clickMerge() {
+      if (this.form.id !== null) {
+        this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
+      }
       if (this.activeName !== 'annualSaleGoalMergeDetails') {
         return this.$message.error('当前标签不是年销售目标合并明细')
       }

src/views/business/spd/goal_management/MonthGoalMerge.vue

@@ -648,7 +648,8 @@ export default {
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
         twoLevelClassify: null,
-        monthMergeDetailsList: null
+        monthMergeDetailsList: null,
+        oldMonthMergeDetailsList: null
       },
       formDetails: {
         id: null,
@@ -745,7 +746,9 @@ export default {
         oneLevelClassifyCode: null,
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
-        twoLevelClassify: null
+        twoLevelClassify: null,
+        monthMergeDetailsList: null,
+        oldMonthMergeDetailsList: null
       };
       this.resetForm("form");
     },
@@ -836,7 +839,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== null) {
-            this.form.monthMergeDetailsList = this.monthGoalMergeDetailsList
+            this.form.monthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+            console.log(this.form);
             updateMonthGoalMerge(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -1118,6 +1122,9 @@ export default {
     },
     // 合并数据
     clickMerge() {
+      if (this.form.id !== null) {
+        this.form.oldMonthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+      }
       if (this.activeName !== 'monthGoalMergeDetails') {
         return this.$message.error('当前标签不是月销售目标合并明细')
       }

src/views/business/spd/goal_management/MonthReturnMerge.vue

@@ -476,7 +476,8 @@ export default {
         goalSum: null,
         documentStatus: null,
         delFlag: null,
-        monthReturnMergeDetailsList: null
+        monthReturnMergeDetailsList: null,
+        oldMonthReturnMergeDetailsList: null
       },
       formDetails: {
         id: null,
@@ -638,7 +639,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== null) {
-            this.form.monthReturnMergeDetailsList = this.monthReturnMergeDetailsList
+            this.form.monthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
             updateMonthReturnMerge(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -647,7 +648,7 @@ export default {
           } else {
             this.form.documentStatus = '未提交'
             this.form.goalCategory = '客户维度'
-            this.form.monthReturnMergeDetailsList = this.monthReturnMergeDetailsList
+            this.form.monthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
             console.log(this.form);
             addMonthReturnMerge(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -716,6 +717,9 @@ export default {
     },
     // 合并数据
     clickMerge() {
+      if (this.form.id !== null) {
+        this.form.oldMonthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
+      }
       if (this.activeName !== 'monthReturnMergeDetails') {
         return this.$message.error('当前页签不是月回款合并明细')
       }