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

src/api/business/spd/goal_management/annualSaleMergeDetails.js

@@ -17,10 +17,10 @@ export function delAnnualSaleMergeDetails(id) {
 }
 
 // 年销售目标合并明细
-export function mergeAnnualSaleMergeDetails(query) {
+export function mergeAnnualSaleMergeDetails(data) {
   return request({
     url: '/goal_management/annualSaleGoalMerge/merge',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }

src/api/business/spd/goal_management/monthGoalMergeDetails.js

@@ -44,10 +44,10 @@ export function delMonthGoalMergeDetails(id) {
 }
 
 // 合并月销售目标明细
-export function mergeMonthSaleMergeDetails(query) {
+export function mergeMonthSaleMergeDetails(data) {
   return request({
     url: '/goal_management/monthGoalMergeDetails/merge',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }

src/api/business/spd/goal_management/monthReturnMergeDetails.js

@@ -44,10 +44,10 @@ export function delMonthReturnMergeDetails(id) {
 }
 
 // 合并月销售目标明细
-export function mergeMonthReturnMergeDetails(query) {
+export function mergeMonthReturnMergeDetails(data) {
   return request({
     url: '/mk/monthReturnMergeDetails/merge',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }

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

@@ -1263,7 +1263,7 @@ export default {
     // 合并数据
     clickMerge() {
       if (this.form.id !== null) {
-        this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
+        this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetailsList))
       }
       if (this.activeName !== 'annualSaleGoalMergeDetails') {
         return this.$message.error('当前标签不是年销售目标合并明细')