Quellcode durchsuchen

Merge branch 'goalManagementDev' into dev

002637 vor 1 Jahr
Ursprung
Commit
43bc433c3c

+ 3 - 3
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
   })
 }

+ 3 - 3
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
   })
 }

+ 3 - 3
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
   })
 }

+ 145 - 115
src/views/business/spd/goal_management/AnnualSaleGoal.vue

@@ -1,82 +1,107 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="编码" prop="code">
+            <el-input
+              v-model="queryParams.code"
+              placeholder="请输入编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="目标名称" prop="goalName">
+            <el-input
+              v-model="queryParams.goalName"
+              placeholder="请输入年度销售目标名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="documentDate">
+            <el-date-picker
+              v-model="queryParams.documentDateRange"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              align="right"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              placeholder="请选择单据日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-col>
+      </el-row>
+
+    </el-form>
     <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>
-      <el-form-item label="单据日期" prop="documentDate">
-        <el-date-picker
-          v-model="queryParams.documentDateRange"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          placeholder="请选择单据日期"
-          :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"
-          type="year"
-          value-format="yyyy"
-          placeholder="选择年度"
-          clearable
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="客户" prop="custom">
-        <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ customCode: 'code', custom: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入客户" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="销售区域" prop="saleZone">
-        <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="制单人" prop="creator">
-        <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
-                              referName="CONTACTS_PARAM"
-                              :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入制单人" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="部门" prop="dept">
-        <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
-                              referName="DEPT_PARAM"
-                              :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="年度" prop="annual">
+            <el-date-picker
+              v-model="queryParams.annual"
+              type="year"
+              value-format="yyyy"
+              placeholder="选择年度"
+              clearable
+              @keyup.enter.native="handleQuery">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="客户" prop="custom">
+            <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
+                                  referName="CUSTOMER_PARAM"
+                                  :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入客户" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="销售区域" prop="saleZone">
+            <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
+                                  referName="MK_SALESAREA_PARAM"
+                                  :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="制单人" prop="creator">
+            <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
+                                  referName="CONTACTS_PARAM"
+                                  :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入制单人" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="部门" prop="dept">
+            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
+                                  referName="DEPT_PARAM"
+                                  :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -155,6 +180,13 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-document-copy"
+            @click="handleCopy(scope.row.id)"
+          >复制
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改
@@ -216,7 +248,7 @@
           <el-col :span="6">
             <el-form-item label="销售区域" prop="saleZone">
               <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -254,19 +286,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态" prop="documentStatus">
-              <el-input v-model="form.documentStatus" placeholder="单据状态后端自动生成" clearable disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="操作">
-              <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
-              <el-button @click="cancel" size="medium">返 回</el-button>
+              <el-input v-model="form.documentStatus" placeholder="未提交" clearable disabled/>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div id="addDetails">
-        <el-row :gutter="10" class="mb8">
+        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
           </el-col>
@@ -276,8 +302,7 @@
           <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
-                                    @blur="validateField(scope.row, 'saleOrg')"
+                                    referName="ORG_PARAM"
                                     :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                     :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
               </el-popover-select-v2>
@@ -286,7 +311,7 @@
           <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -419,6 +444,10 @@
             </template>
           </el-table-column>
         </el-table>
+        <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
+          <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
+          <el-button @click="cancel" size="medium">返 回</el-button>
+        </div>
       </div>
     </el-drawer>
 
@@ -460,7 +489,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 年度销售目标表格数据
@@ -594,15 +623,6 @@ export default {
         this.total = response.total;
         this.loading = false;
         console.log(this.annualSaleGoalList);
-        for (const element of this.annualSaleGoalList) {
-          if (element.documentStatus === '0') {
-            element.documentStatus = '未提交'
-          } else if (element.documentStatus === '1') {
-            element.documentStatus = '审核中'
-          } else {
-            element.documentStatus = '已审核'
-          }
-        }
       });
     },
     getListDetails() {
@@ -683,15 +703,19 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.title = "添加年度销售目标";
+      this.title = "添加--年度销售目标";
       this.annualSaleGoalDetailsList = []
       this.open = true;
+      this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+      this.form.annual = new Date().getFullYear().toString()
+      this.form.creator = this.$store.state.user.nickName
+      this.form.dept = this.$store.state.user.deptName
     },
     handleAddDetails() {
       let list = {
         id: null,
         code: null,
-        saleOrg: this.form.saleZone,
+        saleOrg: this.$store.state.user.orgName,
         saleZone: this.form.saleZone,
         custom: this.form.custom,
         creator: this.form.creator,
@@ -726,16 +750,28 @@ export default {
         this.form = response.data;
         this.annualSaleGoalDetailsList = this.form.annualGoalMergeDetails
         this.open = true;
-        this.title = "修改年度销售目标";
-        if (this.form.documentStatus === '0') {
-          this.form.documentStatus = '未提交'
-        } else if (this.form.documentStatus === '1') {
-          this.form.documentStatus = '审批中'
-        } else if (this.form.documentStatus === '2') {
-          this.form.documentStatus = '已审核'
-        }
+        this.title = "修改--年度销售目标";
       });
     },
+    // 复制按钮
+    handleCopy(id) {
+      this.reset();
+      getAnnualSaleGoal(id).then(response => {
+        this.form = response.data;
+        this.form.id = null
+        this.form.code = null
+        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        this.form.annual = new Date().getFullYear().toString()
+        this.annualSaleGoalDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetails))
+        for (const element of this.annualSaleGoalDetailsList) {
+          element.id = null
+          element.code = null
+        }
+        this.open = true;
+        this.title = "新增--年度销售目标";
+        console.log(this.form);
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       if (!this.justiceDetailsList()) {
@@ -744,21 +780,15 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            if (this.form.documentStatus === '未提交') {
-              this.form.documentStatus = 0
-            } else if (this.form.documentStatus === '审批中') {
-              this.form.documentStatus = 1
-            } else {
-              this.form.documentStatus = 2
-            }
-            this.form.annualGoalMergeDetails = this.annualSaleGoalDetailsList
+            this.form.annualGoalMergeDetails = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
             updateAnnualSaleGoal(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            this.form.annualGoalMergeDetails = this.annualSaleGoalDetailsList
+            this.form.documentStatus = '未提交'
+            this.form.annualGoalMergeDetails = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
             addAnnualSaleGoal(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

Datei-Diff unterdrückt, da er zu groß ist
+ 493 - 438
src/views/business/spd/goal_management/AnnualSaleGoalMerge.vue


+ 431 - 247
src/views/business/spd/goal_management/MonthGoalMerge.vue

@@ -1,106 +1,133 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="编码" prop="code">
+            <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="目标名称" prop="goalName">
+            <el-input v-model="queryParams.goalName" placeholder="请输入目标名称" clearable @keyup.enter.native="handleQuery"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="documentDate">
+            <el-date-picker
+              v-model="documentDateRange"
+              @change="setBeginAndEnd"
+              type="daterange"
+              align="right"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              @keyup.enter.native="handleQuery"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-col>
+      </el-row>
+    </el-form>
     <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>
-      <el-form-item label="单据日期" prop="documentDate">
-        <el-date-picker
-          v-model="documentDateRange"
-          @change="setBeginAndEnd"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd"
-          @keyup.enter.native="handleQuery"
-          :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"
-          type="year"
-          clearable
-          value-format="yyyy"
-          @keyup.enter.native="handleQuery"
-          placeholder="请输入年度">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="月份" prop="monthly">
-        <el-date-picker
-          v-model="queryParams.monthly"
-          type="month"
-          clearable
-          value-format="yyyy-MM"
-          @keyup.enter.native="handleQuery"
-          placeholder="请输入月份">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="制单人" prop="creator">
-        <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
-                              referName="CONTACTS_PARAM"
-                              :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入制单人">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="部门" prop="dept">
-        <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
-                              referName="DEPT_PARAM"
-                              :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入部门">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="目标类型" prop="goalCategory">
-        <el-select v-model="queryParams.goalCategory" placeholder="请输入目标类型" @change="changeGoalCategoryQuery" @keyup.enter.native="handleQuery">
-          <el-option
-            v-for="item in goalCategoryList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="queryParams.goalCategory === '客户维度'" label="客户" prop="custom">
-        <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ customCode: 'code', custom: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入客户">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item v-if="queryParams.goalCategory === '销售区域'" label="销售区域" prop="saleZone">
-        <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
-                              referName="DEPT_PARAM"
-                              :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入销售区域">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item v-if="queryParams.goalCategory === '一级分类'" label="一级分类" prop="oneLevelClassify">
-        <el-select v-model="queryParams.oneLevelClassify" size="mini" clearable
-                   @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '一级物料分类')"
-                   style="width: 200px">
-          <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="queryParams.goalCategory === '二级分类'" label="二级分类" prop="custom">
-        <el-select v-model="queryParams.twoLevelClassify" size="mini" clearable
-                   @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '二级物料分类')"
-                   style="width: 200px">
-          <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="年度" prop="annual">
+            <el-date-picker
+              v-model="queryParams.annual"
+              type="year"
+              clearable
+              value-format="yyyy"
+              @keyup.enter.native="handleQuery"
+              placeholder="请输入年度">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="月份" prop="monthly">
+            <el-date-picker
+              v-model="queryParams.monthly"
+              type="month"
+              clearable
+              value-format="yyyy-MM"
+              @keyup.enter.native="handleQuery"
+              placeholder="请输入月份">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="制单人" prop="creator">
+            <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
+                                  referName="CONTACTS_PARAM"
+                                  :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入制单人">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="部门" prop="dept">
+            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
+                                  referName="DEPT_PARAM"
+                                  :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入部门">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="目标类型" prop="goalCategory">
+            <el-select v-model="queryParams.goalCategory" placeholder="请输入目标类型" @change="changeGoalCategoryQuery" @keyup.enter.native="handleQuery">
+              <el-option
+                v-for="item in goalCategoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item v-if="queryParams.goalCategory === '客户维度'" label="客户" prop="custom">
+            <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
+                                  referName="CUSTOMER_PARAM"
+                                  :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入客户">
+            </el-popover-select-v2>
+          </el-form-item>
+          <el-form-item v-if="queryParams.goalCategory === '销售区域'" label="销售区域" prop="saleZone">
+            <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
+                                  referName="MK_SALESAREA_PARAM"
+                                  :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入销售区域">
+            </el-popover-select-v2>
+          </el-form-item>
+          <el-form-item v-if="queryParams.goalCategory === '一级分类'" label="一级分类" prop="oneLevelClassify">
+            <el-select v-model="queryParams.oneLevelClassify" size="mini" clearable
+                       @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '一级物料分类')"
+                       style="width: 200px">
+              <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="queryParams.goalCategory === '二级分类'" label="二级分类" prop="custom">
+            <el-select v-model="queryParams.twoLevelClassify" size="mini" clearable
+                       @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '二级物料分类')"
+                       style="width: 200px">
+              <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -179,6 +206,13 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-document-copy"
+            @click="handleCopy(scope.row.id)"
+          >复制
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改
@@ -289,14 +323,14 @@
             <el-form-item v-if="form.goalCategory === '客户维度'" label="客户" prop="custom">
               <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name"
                                     referName="CUSTOMER_PARAM"
-                                    :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                    :dataMapping="{custom: 'name'}"
                                     :source.sync="form" placeholder="请输入客户">
               </el-popover-select-v2>
             </el-form-item>
             <el-form-item v-if="form.goalCategory === '销售区域'" label="销售区域" prop="saleZone">
-              <el-popover-select-v2 v-model="form.saleZoneCode" title="销售区域" valueKey="name"
-                                    referName="ORG_PARAM"
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+              <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
+                                    referName="MK_SALESAREA_PARAM"
+                                    :dataMapping="{saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
             </el-form-item>
@@ -316,133 +350,212 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="操作">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
+            <el-form-item label="单据状态" prop="documentStatus">
+              <el-input v-model="form.documentStatus" placeholder="未提交" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
 
-      <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-col>-->
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-folder-opened" size="mini" @click="clickMerge">合 并</el-button>
-        </el-col>
-      </el-row>
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
-          <el-table v-loading="loading" :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" fixed />
-            <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM" disabled
-                                      :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
-                                      :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="CUSTOMER_PARAM" disabled
-                                      :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                      :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="客户" align="center" prop="custom" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                      referName="CUSTOMER_PARAM" disabled
-                                      :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                      :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入客户">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="部门" align="center" prop="dept" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].dept" title="部门" valueKey="name"
-                                      referName="DEPT_PARAM" disabled
-                                      :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                      :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入客户">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="制单人" align="center" prop="creator" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].creator" title="负责人" valueKey="name"
-                                      referName="CONTACTS_PARAM" disabled
-                                      :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                      :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入负责人">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="科室" align="center" prop="department" width="180">
-              <template slot-scope="scope">
-                <el-input v-model="monthGoalMergeDetailsList[scope.$index].department" placeholder="请输入科室" disabled></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="220">
-              <template slot-scope="scope">
-                <el-select v-model="monthGoalMergeDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
-                           @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
-                           style="width: 200px" disabled>
-                  <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="220">
-              <template slot-scope="scope">
-                <el-select v-model="monthGoalMergeDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
-                           @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
-                           style="width: 200px" disabled>
-                  <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="物料" align="center" prop="material" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].material" title="物料" valueKey="name"
-                                      referName="MATERIAL_PARAM" disabled
-                                      :dataMapping="{ materialCode: 'code', material: 'name'}"
-                                      :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入物料">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="月份" align="center" prop="monthly" width="250">
-              <template slot-scope="scope">
-                <el-date-picker disabled v-model="monthGoalMergeDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
-                </el-date-picker>
-              </template>
-            </el-table-column>
-            <el-table-column label="目标值" align="center" prop="totalGoal" width="220">
-              <template slot-scope="scope">
-                <el-input-number @change="computeTotal" v-model="monthGoalMergeDetailsList[scope.$index].goalValue" :precision="2" :step="1" :min="0"></el-input-number>
-              </template>
-            </el-table-column>
-<!--            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDeleteDetails(scope.$index, scope.row)"
-                >删除</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleCopyDetails(scope.row)"
-                >复制</el-button>
-              </template>
-            </el-table-column>-->
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
+      <div>
+        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-folder-opened" size="mini" @click="clickMerge">合 并</el-button>
+          </el-col>
+        </el-row>
+        <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
+          <el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
+            <el-table v-loading="loading" :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                        referName="ORG_PARAM" disabled
+                                        :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                                        :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                        referName="MK_SALESAREA_PARAM" disabled
+                                        :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                        :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户" align="center" prop="custom" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].custom" title="客户" valueKey="name"
+                                        referName="CUSTOMER_PARAM" disabled
+                                        :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                        :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="部门" align="center" prop="dept" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].dept" title="部门" valueKey="name"
+                                        referName="DEPT_PARAM" disabled
+                                        :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                        :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="制单人" align="center" prop="creator" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].creator" title="负责人" valueKey="name"
+                                        referName="CONTACTS_PARAM" disabled
+                                        :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                        :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入负责人">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="科室" align="center" prop="department" width="180">
+                <template slot-scope="scope">
+                  <el-input v-model="monthGoalMergeDetailsList[scope.$index].department" placeholder="请输入科室" disabled></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="220">
+                <template slot-scope="scope">
+                  <el-select v-model="monthGoalMergeDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
+                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
+                             style="width: 200px" disabled>
+                    <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="220">
+                <template slot-scope="scope">
+                  <el-select v-model="monthGoalMergeDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
+                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
+                             style="width: 200px" disabled>
+                    <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="物料" align="center" prop="material" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].material" title="物料" valueKey="name"
+                                        referName="MATERIAL_PARAM" disabled
+                                        :dataMapping="{ materialCode: 'code', material: 'name'}"
+                                        :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入物料">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="月份" align="center" prop="monthly" width="250">
+                <template slot-scope="scope">
+                  <el-date-picker disabled v-model="monthGoalMergeDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="目标值" align="center" prop="totalGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotal" v-model="monthGoalMergeDetailsList[scope.$index].goalValue" :precision="2" :step="1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <!--            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+                            <template slot-scope="scope">
+                              <el-button
+                                size="mini"
+                                type="text"
+                                icon="el-icon-delete"
+                                @click="handleDeleteDetails(scope.$index, scope.row)"
+                              >删除</el-button>
+                              <el-button
+                                size="mini"
+                                type="text"
+                                icon="el-icon-delete"
+                                @click="handleCopyDetails(scope.row)"
+                              >复制</el-button>
+                            </template>
+                          </el-table-column>-->
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="区域目标汇总(月)" name="zoneGoalSum">
+            <el-table :data="zoneGoalSumList">
+              <el-table-column label="序号" type="index" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                        referName="ORG_PARAM" disabled
+                                        :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                                        :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入销售组织">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                        referName="ORG_PARAM" disabled
+                                        :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                        :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入销售区域">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="月份" align="center" prop="monthly" width="250">
+                <template slot-scope="scope">
+                  <el-date-picker disabled v-model="zoneGoalSumList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="目标值" align="center" prop="totalGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotal" v-model="zoneGoalSumList[scope.$index].goalValue" :precision="2" :step="1" :min="0" disabled></el-input-number>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="客户目标汇总(月)" name="customGoalSum">
+            <el-table :data="customGoalSumList">
+              <el-table-column label="序号" type="index" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="customGoalSumList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                        referName="ORG_PARAM" disabled
+                                        :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                                        :source.sync="customGoalSumList[scope.$index]" placeholder="请输入销售组织">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="customGoalSumList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                        referName="ORG_PARAM" disabled
+                                        :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                        :source.sync="customGoalSumList[scope.$index]" placeholder="请输入销售区域">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户" align="center" prop="custom" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="customGoalSumList[scope.$index].custom" title="客户" valueKey="name"
+                                        referName="CUSTOMER_PARAM" disabled
+                                        :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                        :source.sync="customGoalSumList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="月份" align="center" prop="monthly" width="250">
+                <template slot-scope="scope">
+                  <el-date-picker disabled v-model="customGoalSumList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="目标值" align="center" prop="totalGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotal" v-model="customGoalSumList[scope.$index].goalValue" :precision="2" :step="1" :min="0" disabled></el-input-number>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+        <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
+          <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
+          <el-button @click="cancel" size="medium">返 回</el-button>
+        </div>
+      </div>
     </el-drawer>
 
     <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true"/>
@@ -485,12 +598,14 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 月销售目标合并表格数据
       monthGoalMergeList: [],
       monthGoalMergeDetailsList: [],
+      zoneGoalSumList: [],
+      customGoalSumList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -572,7 +687,8 @@ export default {
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
         twoLevelClassify: null,
-        monthMergeDetailsList: null
+        monthMergeDetailsList: null,
+        oldMonthMergeDetailsList: null
       },
       formDetails: {
         id: null,
@@ -669,7 +785,9 @@ export default {
         oneLevelClassifyCode: null,
         oneLevelClassify: null,
         twoLevelClassifyCode: null,
-        twoLevelClassify: null
+        twoLevelClassify: null,
+        monthMergeDetailsList: null,
+        oldMonthMergeDetailsList: null
       };
       this.resetForm("form");
     },
@@ -719,8 +837,16 @@ export default {
     handleAdd() {
       this.reset();
       this.monthGoalMergeDetailsList = []
+      this.customGoalSumList = []
+      this.zoneGoalSumList = []
+      this.activeName = 'monthGoalMergeDetails'
       this.open = true;
-      this.title = "添加月销售目标合并";
+      this.title = "添加--月销售目标合并";
+      this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+      this.form.annual = new Date().getFullYear().toString()
+      this.form.monthly = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0')
+      this.form.creator = this.$store.state.user.nickName
+      this.form.dept = this.$store.state.user.deptName
     },
     handleAddDetails() {
       let list = {
@@ -747,20 +873,43 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.customGoalSumList = []
+      this.zoneGoalSumList = []
+      this.activeName = 'monthGoalMergeDetails'
       const id = row.id || this.ids
       getMonthGoalMerge(id).then(response => {
         this.form = response.data;
         this.monthGoalMergeDetailsList = this.form.monthMergeDetailsList
         this.open = true;
-        this.title = "修改月销售目标合并";
+        this.title = "修改--月销售目标合并";
       });
     },
+    // 复制按钮操作
+    handleCopy(id) {
+      this.reset()
+      this.monthGoalMergeDetailsList = []
+      this.customGoalSumList = []
+      this.zoneGoalSumList = []
+      this.activeName = 'monthGoalMergeDetails'
+      getMonthGoalMerge(id).then(response => {
+        this.form = response.data
+        this.form.id = null
+        this.form.code = null
+        this.title = "添加--月销售目标合并";
+        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        this.form.annual = new Date().getFullYear().toString()
+        this.form.monthly = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0')
+        this.open = true
+        this.changeGoalCategoryForm()
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== null) {
-            this.form.monthMergeDetailsList = this.monthGoalMergeDetailsList
+            this.form.monthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+            console.log(this.form);
             updateMonthGoalMerge(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -1042,32 +1191,32 @@ export default {
     },
     // 合并数据
     clickMerge() {
-      let classify = this.form.goalCategory
-      let classifyValue;
-      if (classify === null || classify === '') {
+      if (this.form.id !== null) {
+        this.form.oldMonthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+      }
+      if (this.activeName !== 'monthGoalMergeDetails') {
+        return this.$message.error('当前标签不是月销售目标合并明细')
+      }
+      let query = JSON.parse(JSON.stringify(this.form))
+      if (query.goalCategory === null || query.goalCategory === '') {
         return this.$message.error('请输入目标分类')
-      } else if (classify === '销售区域') {
-        classifyValue = this.form.saleZone
-        if (classifyValue === null) {
+      } else if (query.goalCategory === '销售区域') {
+        if (query.saleZone === null) {
           return this.$message.error('请输入销售区域')
         }
-      } else if (classify === '一级分类') {
-        classifyValue = this.form.oneLevelClassify
-        if (classifyValue === null) {
+      } else if (query.goalCategory === '一级分类') {
+        if (query.oneLevelClassify === null) {
           return this.$message.error('请输入一级分类')
         }
-      } else if (classify === '二级分类') {
-        classifyValue = this.form.twoLevelClassify
-        if (classifyValue === null) {
+      } else if (query.goalCategory === '二级分类') {
+        if (query.twoLevelClassify === null) {
           return this.$message.error('请输入二级分类')
         }
-      } else if (classify === '客户维度') {
-        classifyValue = this.form.custom
-        if (classifyValue === null) {
+      } else if (query.goalCategory === '客户维度') {
+        if (query.custom === null) {
           return this.$message.error('请输入客户')
         }
       }
-      let query = { classify: classify, classifyValue: classifyValue }
       mergeMonthSaleMergeDetails(query).then(response => {
         console.log(response);
         this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
@@ -1099,7 +1248,42 @@ export default {
         console.log('导出明细');
         this.handleExportDetails()
       }
-    }
+    },
+    // 获得区域目标汇总or客户目标汇总
+    getNewTwoArray() {
+      let arr = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+      // 如果子表标签是annualSaleGoalMergeDetails 或者 主表的目标分类是“销售区域”
+      if (this.activeName === 'monthGoalMergeDetails' || this.form.goalCategory !== '销售区域') {
+        this.zoneGoalSumList = null
+        this.customGoalSumList = null
+        return
+      }
+      // 根据某三个属性进行合并并相加totalGoal的函数
+      const mergeAndSumTotalGoal = (array) => {
+        return Array.from(array.reduce((map, obj) => {
+          let key = null
+          if (this.activeName === 'zoneGoalSum') {
+            key = `${obj.saleOrg}-${obj.saleZone}-${obj.monthly}`
+          } else if (this.activeName === 'customerGoalSum') {
+            key = `${obj.saleOrg}-${obj.saleZone}-${obj.custom}-${obj.monthly}`
+          }
+          if (map.has(key)) {
+            const existingObj = map.get(key)
+            existingObj.goalValue += obj.goalValue
+          } else {
+            map.set(key, { ...obj })
+          }
+          return map
+        }, new Map()).values())
+      }
+      // 调用合并函数
+      const mergedArray = mergeAndSumTotalGoal(arr)
+      if (this.activeName === 'zoneGoalSum') {
+        this.zoneGoalSumList = mergedArray
+      } else if (this.activeName === 'customGoalSum') {
+        this.customGoalSumList = mergedArray
+      }
+    },
   }
 };
 </script>

+ 224 - 170
src/views/business/spd/goal_management/MonthReturnGoal.vue

@@ -1,80 +1,105 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="编码" prop="code">
+            <el-input
+              v-model="queryParams.code"
+              placeholder="请输入编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="目标名称" prop="goalName">
+            <el-input
+              v-model="queryParams.goalName"
+              placeholder="请输入目标名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="documentDate">
+            <el-date-picker
+              v-model="documentDateRange"
+              @change="setBeginAndEnd"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              align="right"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-col>
+      </el-row>
+    </el-form>
     <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>
-      <el-form-item label="单据日期" prop="documentDate">
-        <el-date-picker
-          v-model="documentDateRange"
-          @change="setBeginAndEnd"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :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"
-          type="year"
-          value-format="yyyy"
-          placeholder="选择年度"
-          clearable
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="客户" prop="custom">
-        <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ customCode: 'code', custom: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入客户" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="制单人" prop="creator">
-        <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
-                              referName="CONTACTS_PARAM"
-                              :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入制单人" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="销售区域" prop="saleZone">
-        <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="部门" prop="dept">
-        <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
-                              referName="DEPT_PARAM"
-                              :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="年度" prop="annual">
+            <el-date-picker
+              v-model="queryParams.annual"
+              type="year"
+              value-format="yyyy"
+              placeholder="选择年度"
+              clearable
+              @keyup.enter.native="handleQuery">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="客户" prop="custom">
+            <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
+                                  referName="CUSTOMER_PARAM"
+                                  :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入客户" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="制单人" prop="creator">
+            <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
+                                  referName="CONTACTS_PARAM"
+                                  :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入制单人" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="销售区域" prop="saleZone">
+            <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
+                                  referName="MK_SALESAREA_PARAM"
+                                  :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="部门" prop="dept">
+            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
+                                  referName="DEPT_PARAM"
+                                  :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -152,6 +177,13 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-document-copy"
+            @click="handleCopy(scope.row.id)"
+          >复制
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改
@@ -230,7 +262,7 @@
           <el-col :span="6">
             <el-form-item label="销售区域" prop="saleZone">
               <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -259,101 +291,101 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态" prop="documentStatus">
-              <el-input v-model="form.documentStatus" placeholder="新增页默认'未提交'" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="操作">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
+              <el-input v-model="form.documentStatus" placeholder="未提交" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <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-col>
-      </el-row>
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="月回款目标明细" name="monthReturnGoalDetails">
-          <el-table v-loading="loading" :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" fixed />
-            <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
-                                      :dataMapping="{saleOrg: 'name'}"
-                                      :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
-                                      :dataMapping="{saleZone: 'name'}"
-                                      :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="客户" align="center" prop="custom" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
-                                      :dataMapping="{custom: 'name'}"
-                                      :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入客户">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="部门" align="center" prop="dept" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].dept" title="部门" valueKey="name"
-                                      referName="DEPT_PARAM"
-                                      :dataMapping="{dept: 'name'}"
-                                      :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入客户">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="制单人" align="center" prop="creator" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].creator" title="负责人" valueKey="name"
-                                      referName="CONTACTS_PARAM"
-                                      :dataMapping="{creator: 'name'}"
-                                      :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入负责人">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="月份" align="center" prop="monthly" width="250" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-date-picker v-model="monthReturnGoalDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
-                </el-date-picker>
-              </template>
-            </el-table-column>
-            <el-table-column label="目标值" align="center" prop="goalSum" width="220" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-input-number @change="computeTotal" v-model="monthReturnGoalDetailsList[scope.$index].goalSum" :precision="2" :step="1" :min="0"></el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDeleteDetails(scope.$index, scope.row)"
-                >删除</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleCopyDetails(scope.row)"
-                >复制</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
+      <div>
+        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
+          </el-col>
+        </el-row>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="月回款目标明细" name="monthReturnGoalDetails">
+            <el-table v-loading="loading" :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                        referName="ORG_PARAM"
+                                        :dataMapping="{saleOrg: 'name'}"
+                                        :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                        referName="MK_SALESAREA_PARAM"
+                                        :dataMapping="{saleZone: 'name'}"
+                                        :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户" align="center" prop="custom" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
+                                        referName="CUSTOMER_PARAM"
+                                        :dataMapping="{custom: 'name'}"
+                                        :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="部门" align="center" prop="dept" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].dept" title="部门" valueKey="name"
+                                        referName="DEPT_PARAM"
+                                        :dataMapping="{dept: 'name'}"
+                                        :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="制单人" align="center" prop="creator" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].creator" title="负责人" valueKey="name"
+                                        referName="CONTACTS_PARAM"
+                                        :dataMapping="{creator: 'name'}"
+                                        :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入负责人">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="月份" align="center" prop="monthly" width="250" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="monthReturnGoalDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="目标值" align="center" prop="goalSum" width="220" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotal" v-model="monthReturnGoalDetailsList[scope.$index].goalSum" :precision="2" :step="1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDeleteDetails(scope.$index, scope.row)"
+                  >删除</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleCopyDetails(scope.row)"
+                  >复制</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+        <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
+          <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
+          <el-button @click="cancel" size="medium">返 回</el-button>
+        </div>
+      </div>
     </el-drawer>
 
   </div>
@@ -393,7 +425,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 月回款目标填报表格数据
@@ -570,17 +602,21 @@ export default {
       this.monthReturnGoalDetailsList = []
       this.open = true;
       this.title = "添加--月回款目标填报";
+      this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+      this.form.annual = new Date().getFullYear().toString()
+      this.form.creator = this.$store.state.user.nickName
+      this.form.dept = this.$store.state.user.deptName
     },
     handleAddDetails() {
       let list = {
         id: null,
         code: null,
-        saleOrg: this.form.saleZone,
+        saleOrg: this.$store.state.user.orgName,
         saleZone: this.form.saleZone,
         custom: this.form.custom,
         dept: this.form.dept,
         creator: this.form.creator,
-        monthly: null,
+        monthly: new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0'),
         goalSum: 0
       }
       this.monthReturnGoalDetailsList.push(list)
@@ -598,6 +634,24 @@ export default {
         this.title = "修改--月回款目标填报";
       });
     },
+    // 复制按钮操作
+    handleCopy(id) {
+      this.reset();
+      getMonthReturnGoal(id).then(response => {
+        this.form = response.data;
+        this.form.id = null
+        this.form.code = null
+        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        this.form.annual = new Date().getFullYear().toString()
+        this.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthReturnGoalDetailsList))
+        for (const element of this.monthReturnGoalDetailsList) {
+          element.id = null
+          element.code = null
+        }
+        this.open = true;
+        this.title = "新增--月销售目标填报";
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       if (!this.justiceDetailsList()) {
@@ -606,7 +660,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            this.form.monthReturnGoalDetailsList = this.monthReturnGoalDetailsList
+            this.form.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
             updateMonthReturnGoal(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -614,7 +668,7 @@ export default {
             });
           } else {
             this.form.documentStatus = '未提交'
-            this.form.monthReturnGoalDetailsList = this.monthReturnGoalDetailsList
+            this.form.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
             console.log(this.form);
             addMonthReturnGoal(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");

+ 237 - 188
src/views/business/spd/goal_management/MonthReturnMerge.vue

@@ -1,81 +1,108 @@
 <template>
 <div class="app-container">
+  <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-form-item label="编码" prop="code">
+          <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="目标名称" prop="goalName">
+          <el-input v-model="queryParams.goalName" placeholder="请输入目标名称" clearable @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="单据日期" prop="documentDate">
+          <el-date-picker
+            v-model="documentDateRange"
+            @change="setBeginAndEnd"
+            type="daterange"
+            align="right"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            @keyup.enter.native="handleQuery"
+            :picker-options="pickerOptions">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <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-col>
+    </el-row>
+  </el-form>
   <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>
-    <el-form-item label="单据日期" prop="documentDate">
-      <el-date-picker
-        v-model="documentDateRange"
-        @change="setBeginAndEnd"
-        type="daterange"
-        align="right"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        @keyup.enter.native="handleQuery"
-        :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"
-        type="year"
-        clearable
-        value-format="yyyy"
-        @keyup.enter.native="handleQuery"
-        placeholder="请输入年度">
-      </el-date-picker>
-    </el-form-item>
-    <el-form-item label="月份" prop="monthly">
-      <el-date-picker
-        v-model="queryParams.monthly"
-        type="month"
-        clearable
-        value-format="yyyy-MM"
-        @keyup.enter.native="handleQuery"
-        placeholder="请输入月份">
-      </el-date-picker>
-    </el-form-item>
-    <el-form-item label="客户" prop="custom">
-      <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
-                            referName="CUSTOMER_PARAM"
-                            :dataMapping="{ customCode: 'code', custom: 'name'}"
-                            :source.sync="queryParams" placeholder="请输入客户">
-      </el-popover-select-v2>
-    </el-form-item>
-    <el-form-item label="销售区域" prop="saleZone">
-      <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
-                            referName="DEPT_PARAM"
-                            :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                            :source.sync="queryParams" placeholder="请输入销售区域">
-      </el-popover-select-v2>
-    </el-form-item>
-    <el-form-item label="制单人" prop="creator">
-      <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
-                            referName="CONTACTS_PARAM"
-                            :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                            :source.sync="queryParams" placeholder="请输入制单人">
-      </el-popover-select-v2>
-    </el-form-item>
-    <el-form-item label="部门" prop="dept">
-      <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
-                            referName="DEPT_PARAM"
-                            :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                            :source.sync="queryParams" placeholder="请输入部门">
-      </el-popover-select-v2>
-    </el-form-item>
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-form-item label="年度" prop="annual">
+          <el-date-picker
+            v-model="queryParams.annual"
+            type="year"
+            clearable
+            value-format="yyyy"
+            @keyup.enter.native="handleQuery"
+            placeholder="请输入年度">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="月份" prop="monthly">
+          <el-date-picker
+            v-model="queryParams.monthly"
+            type="month"
+            clearable
+            value-format="yyyy-MM"
+            @keyup.enter.native="handleQuery"
+            placeholder="请输入月份">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="客户" prop="custom">
+          <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
+                                referName="CUSTOMER_PARAM"
+                                :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                :source.sync="queryParams" placeholder="请输入客户">
+          </el-popover-select-v2>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="销售区域" prop="saleZone">
+          <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
+                                referName="MK_SALESAREA_PARAM"
+                                :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                :source.sync="queryParams" placeholder="请输入销售区域">
+          </el-popover-select-v2>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-form-item label="制单人" prop="creator">
+          <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
+                                referName="CONTACTS_PARAM"
+                                :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                :source.sync="queryParams" placeholder="请输入制单人">
+          </el-popover-select-v2>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="部门" prop="dept">
+          <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
+                                referName="DEPT_PARAM"
+                                :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                :source.sync="queryParams" placeholder="请输入部门">
+          </el-popover-select-v2>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
-  <el-row :gutter="10" class="mb8">
+  <el-row :gutter="10" class="mb8" style="float: right">
     <el-col :span="1.5">
       <el-button
         type="primary"
@@ -126,6 +153,7 @@
         <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-menu>
       </el-dropdown>
     </el-col>
@@ -154,6 +182,13 @@
         <el-button
           size="mini"
           type="text"
+          icon="el-icon-document-copy"
+          @click="handleCopy(scope.row.id)"
+        >复制
+        </el-button>
+        <el-button
+          size="mini"
+          type="text"
           icon="el-icon-edit"
           @click="handleUpdate(scope.row)"
         >修改
@@ -234,7 +269,7 @@
         <el-col :span="6">
           <el-form-item label="销售区域" prop="saleZone">
             <el-popover-select-v2 v-model="form.saleZoneCode" title="销售区域" valueKey="name"
-                                  referName="DEPT_PARAM"
+                                  referName="MK_SALESAREA_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="form" placeholder="请输入销售区域">
             </el-popover-select-v2>
@@ -274,115 +309,96 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="单据状态" prop="goalSum">
-            <el-input v-model="form.documentStatus" placeholder="新增页面默认'未提交'" disabled/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="操作">
-            <el-button type="primary" @click="submitForm">确 定</el-button>
-            <el-button @click="cancel">取 消</el-button>
+            <el-input v-model="form.documentStatus" placeholder="未提交" disabled/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <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-col>-->
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-folder-opened" size="mini" @click="clickMerge">合 并</el-button>
-      </el-col>
-    </el-row>
-    <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
-      <el-tab-pane label="月回款目标合并明细" name="monthReturnMergeDetails">
-        <el-table v-loading="loading" :data="monthReturnMergeDetailsList">
-          <el-table-column label="序号" type="index" width="55" align="center" fixed />
-          <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                    referName="CUSTOMER_PARAM" disabled
-                                    :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
-                                    :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM" disabled
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                    :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="客户" align="center" prop="custom" width="180">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                    referName="CUSTOMER_PARAM" disabled
-                                    :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                    :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入客户">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="部门" align="center" prop="dept" width="180">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].dept" title="部门" valueKey="name"
-                                    referName="DEPT_PARAM" disabled
-                                    :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                    :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入客户">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="制单人" align="center" prop="creator" width="180">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].creator" title="制单人" valueKey="name"
-                                    referName="CONTACTS_PARAM" disabled
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入制单人">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="月份" align="center" prop="monthly" width="250">
-            <template slot-scope="scope">
-              <el-date-picker disabled v-model="monthReturnMergeDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
-              </el-date-picker>
-            </template>
-          </el-table-column>
-          <el-table-column label="目标值" align="center" prop="totalGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotal" v-model="monthReturnMergeDetailsList[scope.$index].goalSum" :precision="2" :step="1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDeleteDetails(scope.$index, scope.row)"
-              >删除</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleCopyDetails(scope.row)"
-              >复制</el-button>
-            </template>
-          </el-table-column>-->
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="区域目标汇总(月回款)" name="zoneGoalSum(monthReturn)">
-        <el-table :data="zoneGoalSumList">
-          <el-table-column label="序号" type="index" width="55" align="center" fixed />
-          <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" />
-          <el-table-column label="区域" align="center" prop="saleZone" width="180" />
-          <el-table-column label="部门" align="center" prop="dept" width="180" />
-          <el-table-column label="制单人" align="center" prop="creator" width="180" />
-          <el-table-column label="月份" align="center" prop="monthly" width="180" />
-          <el-table-column label="目标值" align="center" prop="goalSum" width="180" />
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
+    <div>
+      <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="el-icon-folder-opened" size="mini" @click="clickMerge">合 并</el-button>
+        </el-col>
+      </el-row>
+      <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
+        <el-tab-pane label="月回款目标合并明细" name="monthReturnMergeDetails">
+          <el-table v-loading="loading" :data="monthReturnMergeDetailsList">
+            <el-table-column label="序号" type="index" width="55" align="center" fixed />
+            <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
+              <template slot-scope="scope">
+                <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                      referName="ORG_PARAM" disabled
+                                      :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                                      :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
+                </el-popover-select-v2>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
+              <template slot-scope="scope">
+                <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                      referName="MK_SALESAREA_PARAM" disabled
+                                      :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                      :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
+                </el-popover-select-v2>
+              </template>
+            </el-table-column>
+            <el-table-column label="客户" align="center" prop="custom" width="180">
+              <template slot-scope="scope">
+                <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].custom" title="客户" valueKey="name"
+                                      referName="CUSTOMER_PARAM" disabled
+                                      :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                      :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入客户">
+                </el-popover-select-v2>
+              </template>
+            </el-table-column>
+            <el-table-column label="部门" align="center" prop="dept" width="180">
+              <template slot-scope="scope">
+                <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].dept" title="部门" valueKey="name"
+                                      referName="DEPT_PARAM" disabled
+                                      :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                      :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入客户">
+                </el-popover-select-v2>
+              </template>
+            </el-table-column>
+            <el-table-column label="制单人" align="center" prop="creator" width="180">
+              <template slot-scope="scope">
+                <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].creator" title="制单人" valueKey="name"
+                                      referName="CONTACTS_PARAM" disabled
+                                      :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                      :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入制单人">
+                </el-popover-select-v2>
+              </template>
+            </el-table-column>
+            <el-table-column label="月份" align="center" prop="monthly" width="250">
+              <template slot-scope="scope">
+                <el-date-picker disabled v-model="monthReturnMergeDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column label="目标值" align="center" prop="totalGoal" width="220">
+              <template slot-scope="scope">
+                <el-input-number @change="computeTotal" v-model="monthReturnMergeDetailsList[scope.$index].goalSum" :precision="2" :step="1" :min="0"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="区域目标汇总(月回款)" name="zoneGoalSum(monthReturn)">
+          <el-table :data="zoneGoalSumList">
+            <el-table-column label="序号" type="index" width="55" align="center" fixed />
+            <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" />
+            <el-table-column label="区域" align="center" prop="saleZone" width="180" />
+            <el-table-column label="部门" align="center" prop="dept" width="180" />
+            <el-table-column label="制单人" align="center" prop="creator" width="180" />
+            <el-table-column label="月份" align="center" prop="monthly" width="180" />
+            <el-table-column label="目标值" align="center" prop="goalSum" width="180" />
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
+        <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
+        <el-button @click="cancel" size="medium">返 回</el-button>
+      </div>
+    </div>
   </el-drawer>
 </div>
 </template>
@@ -422,7 +438,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 月销售目标合并表格数据
@@ -475,7 +491,8 @@ export default {
         goalSum: null,
         documentStatus: null,
         delFlag: null,
-        monthReturnMergeDetailsList: null
+        monthReturnMergeDetailsList: null,
+        oldMonthReturnMergeDetailsList: null
       },
       formDetails: {
         id: null,
@@ -603,8 +620,14 @@ export default {
       this.reset();
       this.activeName = 'monthReturnMergeDetails'
       this.monthReturnMergeDetailsList = []
+      this.zoneGoalSumList = []
       this.open = true;
       this.title = "添加--月回款目标合并";
+      this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+      this.form.annual = new Date().getFullYear().toString()
+      this.form.monthly = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0')
+      this.form.creator = this.$store.state.user.nickName
+      this.form.dept = this.$store.state.user.deptName
     },
     handleAddDetails() {
       let list = {
@@ -632,12 +655,30 @@ export default {
         this.title = "修改--月回款目标合并";
       });
     },
+    // 复制按钮操作
+    handleCopy(id) {
+      this.reset()
+      this.monthGoalMergeDetailsList = []
+      this.activeName = 'monthReturnMergeDetails'
+      this.monthReturnMergeDetailsList = []
+      this.zoneGoalSumList = []
+      getMonthReturnMerge(id).then(response => {
+        this.form = response.data
+        this.form.id = null
+        this.form.code = null
+        this.title = "添加--月销售目标合并";
+        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        this.form.annual = new Date().getFullYear().toString()
+        this.form.monthly = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0')
+        this.open = true
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== null) {
-            this.form.monthReturnMergeDetailsList = this.monthReturnMergeDetailsList
+            this.form.monthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
             updateMonthReturnMerge(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -646,7 +687,7 @@ export default {
           } else {
             this.form.documentStatus = '未提交'
             this.form.goalCategory = '客户维度'
-            this.form.monthReturnMergeDetailsList = this.monthReturnMergeDetailsList
+            this.form.monthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
             console.log(this.form);
             addMonthReturnMerge(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -699,6 +740,11 @@ export default {
         ...this.queryParams
       }, `monthReturnMergeDetails_${new Date().getTime()}.xlsx`)
     },
+    handleExportZoneSum() {
+      this.download('mk/monthReturnMergeDetails/exportZoneSum', {
+        ...this.queryParams
+      }, `zoneSum_${new Date().getTime()}.xlsx`)
+    },
     // 关闭抽屉
     handleClose(done) {
       this.$confirm('确认关闭?')
@@ -710,16 +756,16 @@ export default {
     },
     // 合并数据
     clickMerge() {
+      if (this.form.id !== null) {
+        this.form.oldMonthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
+      }
       if (this.activeName !== 'monthReturnMergeDetails') {
         return this.$message.error('当前页签不是月回款合并明细')
       }
       if (this.form.custom === null) {
         return this.$message.error('请输入客户')
       }
-      let classify = this.form.goalCategory
-      let classifyValue = this.form.custom
-      let query = { classify: classify, classifyValue: classifyValue }
-      mergeMonthReturnMergeDetails(query).then(response => {
+      mergeMonthReturnMergeDetails(this.form).then(response => {
         console.log(response)
         this.monthReturnMergeDetailsList = response.data.monthReturnMergeDetails
         this.computeTotal()
@@ -796,6 +842,9 @@ export default {
       } else if (command === 'exportDetails') {
         console.log('导出明细');
         this.handleExportDetails()
+      } else if (command === 'exportZoneSum') {
+        console.log('导出区域目标汇总');
+        this.handleExportZoneSum()
       }
     }
   }

+ 262 - 209
src/views/business/spd/goal_management/MonthSaleGoal.vue

@@ -1,81 +1,106 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="编码" prop="code">
+            <el-input
+              v-model="queryParams.code"
+              placeholder="请输入编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="目标名称" prop="goalName">
+            <el-input
+              v-model="queryParams.goalName"
+              placeholder="请输入目标名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="documentDate">
+            <el-date-picker
+              v-model="documentDateRange"
+              value-format="yyyy-MM-dd"
+              @change="setBeginAndEnd"
+              type="daterange"
+              align="right"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-col>
+      </el-row>
+    </el-form>
     <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>
-      <el-form-item label="单据日期" prop="documentDate">
-        <el-date-picker
-          v-model="documentDateRange"
-          value-format="yyyy-MM-dd"
-          @change="setBeginAndEnd"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :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"
-          type="year"
-          value-format="yyyy"
-          placeholder="选择年度"
-          clearable
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="客户" prop="custom">
-        <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ customCode: 'code', custom: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入客户" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="销售区域" prop="saleZone">
-        <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
-                              referName="CUSTOMER_PARAM"
-                              :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="制单人" prop="creator">
-        <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
-                              referName="CONTACTS_PARAM"
-                              :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入制单人" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
-      <el-form-item label="部门" prop="dept">
-        <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
-                              referName="DEPT_PARAM"
-                              :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                              :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
-        </el-popover-select-v2>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="年度" prop="annual">
+            <el-date-picker
+              v-model="queryParams.annual"
+              type="year"
+              value-format="yyyy"
+              placeholder="选择年度"
+              clearable
+              @keyup.enter.native="handleQuery">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="客户" prop="custom">
+            <el-popover-select-v2 v-model="queryParams.custom" title="客户" valueKey="name"
+                                  referName="CUSTOMER_PARAM"
+                                  :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入客户" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="销售区域" prop="saleZone">
+            <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
+                                  referName="MK_SALESAREA_PARAM"
+                                  :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="制单人" prop="creator">
+            <el-popover-select-v2 v-model="queryParams.creator" title="制单人" valueKey="name"
+                                  referName="CONTACTS_PARAM"
+                                  :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入制单人" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="部门" prop="dept">
+            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
+                                  referName="DEPT_PARAM"
+                                  :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                  :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
+            </el-popover-select-v2>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -154,6 +179,13 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-document-copy"
+            @click="handleCopy(scope.row.id)"
+          >复制
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改
@@ -224,7 +256,7 @@
           <el-col :span="6">
             <el-form-item label="销售区域" prop="saleZone">
               <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -261,138 +293,138 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态" prop="documentStatus">
-              <el-input v-model="form.documentStatus" placeholder="新增页默认'未提交'" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="操作">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
+              <el-input v-model="form.documentStatus" placeholder="未提交" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <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-col>
-      </el-row>
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="月销售目标明细" name="monthSaleGoalDetails">
-          <el-table v-loading="loading" :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" fixed />
-            <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
-                                      :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
-                                      :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
-                                      :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                      :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="客户" align="center" prop="custom" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
-                                      :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                      :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="部门" align="center" prop="dept" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].dept" title="部门" valueKey="name"
-                                      referName="DEPT_PARAM"
-                                      :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                      :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入部门">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="制单人" align="center" prop="creator" width="180" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].creator" title="制单人" valueKey="name"
-                                      referName="CONTACTS_PARAM"
-                                      :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                      :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入制单人">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="220" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-select v-model="monthSaleGoalDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
-                           @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
-                           style="width: 200px">
-                  <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="220" :render-header="addRedStar">
-              <template slot-scope="scope">
-                <el-select v-model="monthSaleGoalDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
-                           @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
-                           style="width: 200px">
-                  <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="物料" align="center" prop="material" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].material" title="物料" valueKey="name"
-                                      referName="MATERIAL_PARAM"
-                                      :dataMapping="{ materialCode: 'code', material: 'name'}"
-                                      :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="科室" align="center" prop="department" width="180">
-              <template slot-scope="scope">
-                <el-input v-model="monthSaleGoalDetailsList[scope.$index].department" placeholder="请输入科室"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="数量" align="center" prop="num" width="220">
-              <template slot-scope="scope">
-                <el-input-number v-model="monthSaleGoalDetailsList[scope.$index].num" :min="0"></el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column label="月份" align="center" prop="monthly" width="250">
-              <template slot-scope="scope">
-                <el-date-picker v-model="monthSaleGoalDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
-                </el-date-picker>
-              </template>
-            </el-table-column>
-            <el-table-column label="合计" align="center" prop="totalGoal" width="220">
-              <template slot-scope="scope">
-                <el-input-number @change="computeTotal" v-model="monthSaleGoalDetailsList[scope.$index].goalValue" :precision="2" :step="1" :min="0"></el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDeleteDetails(scope.$index, scope.row)"
-                >删除</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleCopyDetails(scope.row)"
-                >复制</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-      </el-tabs>
+      <div>
+        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
+          </el-col>
+        </el-row>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="月销售目标明细" name="monthSaleGoalDetails">
+            <el-table v-loading="loading" :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                        referName="ORG_PARAM"
+                                        :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                        referName="MK_SALESAREA_PARAM"
+                                        :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户" align="center" prop="custom" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
+                                        referName="CUSTOMER_PARAM"
+                                        :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="部门" align="center" prop="dept" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].dept" title="部门" valueKey="name"
+                                        referName="DEPT_PARAM"
+                                        :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入部门">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="制单人" align="center" prop="creator" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].creator" title="制单人" valueKey="name"
+                                        referName="CONTACTS_PARAM"
+                                        :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入制单人">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="220" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-select v-model="monthSaleGoalDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
+                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
+                             style="width: 200px">
+                    <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="220" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-select v-model="monthSaleGoalDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
+                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
+                             style="width: 200px">
+                    <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="物料" align="center" prop="material" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].material" title="物料" valueKey="name"
+                                        referName="MATERIAL_PARAM"
+                                        :dataMapping="{ materialCode: 'code', material: 'name'}"
+                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="科室" align="center" prop="department" width="180">
+                <template slot-scope="scope">
+                  <el-input v-model="monthSaleGoalDetailsList[scope.$index].department" placeholder="请输入科室"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="数量" align="center" prop="num" width="220">
+                <template slot-scope="scope">
+                  <el-input-number v-model="monthSaleGoalDetailsList[scope.$index].num" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="月份" align="center" prop="monthly" width="250" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="monthSaleGoalDetailsList[scope.$index].monthly" value-format="yyyy-MM" type="month" placeholder="选择月份">
+                  </el-date-picker>
+                </template>
+              </el-table-column>
+              <el-table-column label="目标值" align="center" prop="goalValue" width="220" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotal" v-model="monthSaleGoalDetailsList[scope.$index].goalValue" :precision="2" :step="1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDeleteDetails(scope.$index, scope.row)"
+                  >删除</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleCopyDetails(scope.row)"
+                  >复制</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+        <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
+          <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
+          <el-button @click="cancel" size="medium">返 回</el-button>
+        </div>
+      </div>
     </el-drawer>
 
     <TreeRefers ref="treeDetails" @doSubmit="selectionsToInputForDetails" :single="true"/>
@@ -415,7 +447,6 @@ import {
 // 树形参照
 import TreeRefers from '@/components/Refers/treeRefer.vue'
 import ElPopoverSelectV2 from "@/components/popover-select-v2"
-import log from "../../../monitor/job/log";
 
 export default {
   name: "MonthSaleGoal",
@@ -433,7 +464,7 @@ export default {
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 月销售目标填报表格数据
@@ -537,7 +568,7 @@ export default {
         annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
         custom: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
         saleZone: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
+        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
         dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }]
       },
       // 参照条件
@@ -642,12 +673,16 @@ export default {
       this.monthSaleGoalDetailsList = []
       this.open = true;
       this.title = "添加月销售目标填报";
+      this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+      this.form.annual = new Date().getFullYear().toString()
+      this.form.creator = this.$store.state.user.nickName
+      this.form.dept = this.$store.state.user.deptName
     },
     handleAddDetails() {
       let list = {
         id: null,
         code: null,
-        saleOrg: this.form.saleZone,
+        saleOrg: this.$store.state.user.orgName,
         saleZone: this.form.saleZone,
         custom: this.form.custom,
         dept: this.form.dept,
@@ -677,6 +712,24 @@ export default {
         this.title = "修改月销售目标填报";
       });
     },
+    // 复制按钮
+    handleCopy(id) {
+      this.reset();
+      getMonthSaleGoal(id).then(response => {
+        this.form = response.data;
+        this.form.id = null
+        this.form.code = null
+        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        this.form.annual = new Date().getFullYear().toString()
+        this.monthSaleGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthDetailsList))
+        for (const element of this.monthSaleGoalDetailsList) {
+          element.id = null
+          element.code = null
+        }
+        this.open = true;
+        this.title = "新增--月销售目标填报";
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       if (!this.justiceDetailsList()) {
@@ -685,7 +738,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            this.form.monthDetailsList = this.monthSaleGoalDetailsList
+            this.form.monthDetailsList = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
             updateMonthSaleGoal(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -693,7 +746,7 @@ export default {
             });
           } else {
             this.form.documentStatus = '未提交'
-            this.form.monthDetailsList = this.monthSaleGoalDetailsList
+            this.form.monthDetailsList = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
             console.log(this.form);
             addMonthSaleGoal(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
@@ -827,7 +880,7 @@ export default {
     justiceDetailsList() {
       const arr = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
       for (const element of arr) {
-        if (element.saleOrg === null || element.saleZone === null || element.custom === null || element.dept === null || element.creator === null || element.oneLevelClassify === null || element.twoLevelClassify === null) {
+        if (element.saleOrg === null || element.saleZone === null || element.custom === null || element.dept === null || element.creator === null || element.oneLevelClassify === null || element.twoLevelClassify === null || element.monthly === null || element.goalValue === 0) {
           return false
         }
       }

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.