目标管理-修复年销售合并中点击合并没反应。

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

@@ -1408,7 +1408,7 @@
       // 合并数据
       clickMerge() {
         if (this.form.id !== null) {
-          this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.annualGoalMergeDetailsList))
+          this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetailsList))
         }
         if (this.activeName !== 'annualSaleGoalMergeDetails') {
           return this.$message.error('当前标签不是年销售目标合并明细')
@@ -1431,8 +1431,9 @@
             return this.$message.error('请输入二级分类')
           }
         }
+        console.log(query, 'query')
         mergeAnnualSaleMergeDetails(query).then(response => {
-          console.log(response);
+          console.log(response, 'response');
           if (response.data.consolidatedDetail.length > 0) {
             // for (const consolidatedDetail of response.data.consolidatedDetail) {
             //   consolidatedDetail.totalGoal = consolidatedDetail.totalGoal.toFixed(2)

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

@@ -1243,7 +1243,7 @@
       // 合并数据
       clickMerge() {
         if (this.form.id !== null) {
-          this.form.oldMonthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+          this.form.oldMonthMergeDetailsList = JSON.parse(JSON.stringify(this.form.monthMergeDetailsList))
         }
         if (this.activeName !== 'monthGoalMergeDetails') {
           return this.$message.error('当前标签不是月销售目标合并明细')
@@ -1270,7 +1270,7 @@
           }
         }
         mergeMonthSaleMergeDetails(query).then(response => {
-          console.log(response);
+          console.log(response, 'response');
           if (response.data.monthGoalMergeDetails.length > 0) {
             this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
             this.computeTotal()