lizhuo submits AnnualSaleGoal at 2023-7-21 17:00

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

@@ -12,7 +12,7 @@ export function listAnnualSaleGoalDetails(query) {
 // 查询年度销售目标明细详细
 export function getAnnualSaleGoalDetails(id) {
   return request({
-    url: '/goal_management/annualSaleGoalDetails/' + id,
+    url: '/goal_management/annualSaleGoalDetails/parent/' + id,
     method: 'get'
   })
 }

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

@@ -1,44 +1,17 @@
 import request from '@/utils/request'
 
-// 查询年销售目标合并明细列表
-export function listAnnualSaleMergeDetails(query) {
-  return request({
-    url: '/goal_management/annualSaleGoalMerge/list',
-    method: 'get',
-    params: query
-  })
-}
-
 // 查询年销售目标合并明细详细
-export function getAnnualSaleMergeDetails(id) {
+export function getAnnualSaleMergeDetails(parentId) {
   return request({
-    url: '/goal_management/annualSaleGoalMerge/' + id,
+    url: '/goal_management/annualSaleMergeDetails/parent/' + parentId,
     method: 'get'
   })
 }
 
-// 新增年销售目标合并明细
-export function addAnnualSaleMergeDetails(data) {
-  return request({
-    url: '/goal_management/annualSaleGoalMerge/addAnnualSaleMergeDetails',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改年销售目标合并明细
-export function updateAnnualSaleMergeDetails(data) {
-  return request({
-    url: '/goal_management/annualSaleGoalMerge',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除年销售目标合并明细
 export function delAnnualSaleMergeDetails(id) {
   return request({
-    url: '/goal_management/annualSaleGoalMerge/' + id,
+    url: '/goal_management/annualSaleMergeDetails/' + id,
     method: 'delete'
   })
 }

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

@@ -417,6 +417,11 @@ import {
   updateAnnualSaleGoal
 } from "@/api/business/spd/goal_management/annualSaleGoal";
 
+import {
+  delAnnualSaleGoalDetails,
+  getAnnualSaleGoalDetails
+} from "@/api/business/spd/goal_management/annualSaleGoalDetails"
+
 // 树形参照
 import TreeRefers from '@/components/Refers/treeRefer.vue'
 import ElPopoverSelectV2 from "@/components/popover-select-v2"
@@ -582,6 +587,16 @@ export default {
         }
       });
     },
+    getListDetails() {
+      this.loading = true
+      getAnnualSaleGoalDetails(this.form.id).then(response => {
+        this.annualSaleGoalDetailsList = response.data
+        this.computeTotal()
+        this.form.annualGoalMergeDetails = this.annualSaleGoalDetailsList
+        updateAnnualSaleGoal(this.form).then(response => {})
+        this.loading = false
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -743,8 +758,23 @@ export default {
       });
     },
     handleDeleteDetails(index, row) {
-      this.annualSaleGoalDetailsList.splice(index, 1)
-      this.computeTotal()
+      if (this.form.id === null) {
+        this.annualSaleGoalDetailsList.splice(index, 1)
+        this.computeTotal()
+      } else {
+        if (row.id !== null) {
+          this.$modal.confirm('是否确认删除年度销售目标明细编号为"' + row.id + '"的数据项？').then(function () {
+            return delAnnualSaleGoalDetails(row.id)
+          }).then(() => {
+            this.getListDetails()
+            this.$modal.msgSuccess('删除成功')
+          }).catch(() => {})
+        } else {
+          this.annualSaleGoalDetailsList.splice(index, 1)
+          this.$message.success('删除成功')
+          this.computeTotal()
+        }
+      }
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -764,7 +794,7 @@ export default {
     // 复制明细
     handleCopyDetails(row) {
       let list = {
-        id: row.id,
+        id: null,
         code: row.code,
         saleOrg: row.saleOrg,
         saleZone: row.saleZone,

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

@@ -589,21 +589,21 @@
 
 <script>
 import {
-  listAnnualSaleGoalMerge,
-  getAnnualSaleGoalMerge,
-  delAnnualSaleGoalMerge,
   addAnnualSaleGoalMerge,
+  delAnnualSaleGoalMerge,
+  getAnnualSaleGoalMerge,
+  listAnnualSaleGoalMerge,
   updateAnnualSaleGoalMerge
 } from "@/api/business/spd/goal_management/annualSaleGoalMerge";
 import {
+  mergeAnnualSaleMergeDetails,
   delAnnualSaleMergeDetails,
-  mergeAnnualSaleMergeDetails
+  getAnnualSaleMergeDetails
 } from "@/api/business/spd/goal_management/annualSaleMergeDetails"
 
 // 树形参照
 import TreeRefers from '@/components/Refers/treeRefer.vue'
 import ElPopoverSelectV2 from "@/components/popover-select-v2"
-import log from "../../../monitor/job/log";
 
 export default {
   name: "AnnualSaleGoalMerge",
@@ -625,10 +625,10 @@ export default {
       // 总条数
       total: 0,
       // 年度销售目标明细表格数据
-      annualSaleGoalMergeList: [],
-      annualSaleGoalMergeDetailsList: [],
-      areaDetailList: [],
-      customerDetailList: [],
+      annualSaleGoalMergeList: null,
+      annualSaleGoalMergeDetailsList: null,
+      areaDetailList: null,
+      customerDetailList: null,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -704,7 +704,8 @@ export default {
         septemberGoal: null,
         octoberGoal: null,
         novemberGoal: null,
-        decemberGoal: null
+        decemberGoal: null,
+        delFlag: null
       },
       // 表单校验
       rules: {},
@@ -736,6 +737,19 @@ export default {
         this.loading = false;
       });
     },
+    getListDetails() {
+      this.loading = true;
+      getAnnualSaleMergeDetails(this.form.id).then(response => {
+        console.log(response);
+        this.annualSaleGoalMergeDetailsList = response.data;
+        this.computeTotal()
+        this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
+        updateAnnualSaleGoalMerge(this.form).then(response => {
+          this.$modal.msgSuccess("目标值汇总修改成功");
+        });
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -820,7 +834,8 @@ export default {
         septemberGoal: null,
         octoberGoal: null,
         novemberGoal: null,
-        decemberGoal: null
+        decemberGoal: null,
+        delFlag: null
       }
       this.annualSaleGoalMergeDetailsList.push(list)
     },
@@ -831,7 +846,7 @@ export default {
       getAnnualSaleGoalMerge(id).then(response => {
         console.log(response);
         this.form = response.data;
-        this.annualSaleGoalMergeDetailsList = this.form.annualGoalMergeDetailsList
+        this.annualSaleGoalMergeDetailsList = response.data.annualGoalMergeDetailsList
         this.open = true;
         this.title = "修改年度销售目标明细";
       });
@@ -842,6 +857,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
+            console.log(this.form);
             updateAnnualSaleGoalMerge(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -872,18 +888,23 @@ export default {
       });
     },
     handleDeleteDetails(index, row) {
-      if (row.id === null || row.id === '') {
+      if (this.form.id === null) { // 新增
         this.annualSaleGoalMergeDetailsList.splice(index, 1)
         this.computeTotal()
-      } else {
-        this.$modal.confirm('是否确认删除年度销售目标明细编号为"' + row.id + '"的数据项？').then(function () {
-          return delAnnualSaleMergeDetails(row.id);
-        }).then(() => {
+      } else { // 修改
+        if (row.id !== null) {
+          this.$modal.confirm('是否确认删除年度销售目标明细编号为"' + row.id + '"的数据项？').then(function () {
+            return delAnnualSaleMergeDetails(row.id);
+          }).then(() => {
+            this.getListDetails();
+            this.$modal.msgSuccess("删除成功");
+          }).catch(() => {
+          });
+        } else {
           this.annualSaleGoalMergeDetailsList.splice(index, 1)
+          this.$message.success('删除成功')
           this.computeTotal()
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {
-        });
+        }
       }
     },
     /** 导出按钮操作 */
@@ -1008,7 +1029,7 @@ export default {
     // 复制明细
     handleCopyDetails(row) {
       let list = {
-        id: row.id,
+        id: null,
         mergeCode: row.mergeCode,
         saleOrg: row.saleOrg,
         saleZone: row.saleZone,
@@ -1030,7 +1051,8 @@ export default {
         septemberGoal: row.septemberGoal,
         octoberGoal: row.octoberGoal,
         novemberGoal: row.novemberGoal,
-        decemberGoal: row.decemberGoal
+        decemberGoal: row.decemberGoal,
+        delFlag: row.delFlag
       }
       this.annualSaleGoalMergeDetailsList.push(list)
       this.computeTotal()