lizhuo merges Goal Management into dev at 2023-7-31 9:00

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

@@ -100,6 +100,18 @@
         <el-button
           type="primary"
           plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['goal_management:annualSaleGoal:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
           icon="el-icon-grape"
           size="mini"
           :disabled="multiple"
@@ -126,6 +138,8 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="export">导出</el-dropdown-item>
             <el-dropdown-item command="exportDetails">导出明细</el-dropdown-item>
+            <el-dropdown-item command="exportZoneSum">导出区域目标汇总</el-dropdown-item>
+            <el-dropdown-item command="exportCustomSum">导出客户目标汇总</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </el-col>
@@ -1033,6 +1047,11 @@ export default {
         ...this.queryParams
       }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
     },
+    handleExportDetails() {
+      this.download('goal_management/annualSaleMergeDetails/export', {
+        ...this.queryParams
+      }, `annualSaleMergeDetails_${new Date().getTime()}.xlsx`)
+    },
     // 树形参照
     chooseTreeReferForQuery(type, isPage, title) {
       this.referCondition.type = type
@@ -1298,7 +1317,11 @@ export default {
         this.handleExport()
       } else if (command === 'exportDetails') {
         console.log('导出明细');
-        // this.handleExportDetails()
+        this.handleExportDetails()
+      } else if (command === 'exportZoneSum') {
+        console.log('导出区域目标汇总')
+      } else if (command === 'exportCustomSum') {
+        console.log('导出客户目标汇总')
       }
     }
   }

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

@@ -1,6 +1,9 @@
 <template>
 <div class="app-container">
   <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form-item label="编码" prop="code">
+      <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter.native="handleQuery"/>
+    </el-form-item>
     <el-form-item label="目标名称" prop="goalName">
       <el-input v-model="queryParams.goalName" placeholder="请输入目标名称" clearable @keyup.enter.native="handleQuery"/>
     </el-form-item>
@@ -19,6 +22,10 @@
         :picker-options="pickerOptions">
       </el-date-picker>
     </el-form-item>
+    <el-form-item>
+      <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+    </el-form-item>
     <el-form-item label="年度" prop="annual">
       <el-date-picker
         v-model="queryParams.annual"
@@ -29,10 +36,6 @@
         placeholder="请输入年度">
       </el-date-picker>
     </el-form-item>
-    <el-form-item>
-      <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-    </el-form-item>
     <el-form-item label="月份" prop="monthly">
       <el-date-picker
         v-model="queryParams.monthly"