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

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

@@ -42,3 +42,12 @@ export function delMonthGoalMergeDetails(id) {
     method: 'delete'
   })
 }
+
+// 合并月销售目标明细
+export function mergeAnnualSaleMergeDetails(query) {
+  return request({
+    url: '/goal_management/monthSaleGoalDetails/merge',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -139,7 +139,6 @@
 
     <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="id唯一标识" align="center" prop="id"/>
       <el-table-column label="编码" align="center" prop="code"/>
       <el-table-column label="目标名称" align="center" prop="goalName"/>
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
@@ -149,16 +148,12 @@
       </el-table-column>
       <el-table-column label="年度" align="center" prop="annual"/>
       <el-table-column label="月份" align="center" prop="monthly"/>
-      <el-table-column label="客户编码" align="center" prop="customCode"/>
       <el-table-column label="客户" align="center" prop="custom"/>
-      <el-table-column label="制单人编码" align="center" prop="creatorCode"/>
       <el-table-column label="制单人" align="center" prop="creator"/>
-      <el-table-column label="部门编码" align="center" prop="deptCode"/>
       <el-table-column label="部门" align="center" prop="dept"/>
       <el-table-column label="目标类型" align="center" prop="goalCategory"/>
       <el-table-column label="目标值合计" align="center" prop="goalSum"/>
       <el-table-column label="单据状态" align="center" prop="documentStatus"/>
-      <el-table-column label="删除状态" align="center" prop="deleteStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -313,7 +308,7 @@
 
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增 行</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-folder-opened" size="mini" @click="clickMerge">合 并</el-button>
@@ -981,18 +976,16 @@ export default {
         if (classifyValue === null) {
           return this.$message.error('请输入二级分类')
         }
+      } else if (classify === '客户维度') {
+        classifyValue = this.form.custom
+        if (classifyValue === null) {
+          return this.$message.error('请输入客户')
+        }
       }
       let query = { classify: classify, classifyValue: classifyValue }
       mergeAnnualSaleMergeDetails(query).then(response => {
         console.log(response);
-        this.annualSaleGoalMergeDetailsList = response.data.consolidatedDetail
-        if (classify !== '销售区域') {
-          this.areaDetailList = []
-          this.customerDetailList = []
-        } else {
-          this.areaDetailList = response.data.areaDetail
-          this.customerDetailList = response.data.customerDetail
-        }
+        this.monthGoalMergeDetailsList = response.data.consolidatedDetail
         this.computeTotal()
       })
     }