目标管理-所有木块增加回退按钮功能，以及修复明细导入功能。

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

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+//收回
+export function rollBack(params) {
+  return request({
+    url: '/goal_management/rollBack',
+    method: 'post',
+    data: params
+  })
+}

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

@@ -4,35 +4,19 @@
       <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-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-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="请选择单据日期"
+            <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>
@@ -42,7 +26,8 @@
             <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
-              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle @click="showSearch = !showSearch"></el-button>
+              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle
+                @click="showSearch = !showSearch"></el-button>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -53,40 +38,32 @@
       <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
+            <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 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">
+              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 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>
@@ -94,26 +71,17 @@
       <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="{ deptId: 'id', dept: 'name'}"
-                                  :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
+            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+              :dataMapping="{ deptId: 'id', dept: '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="status">
-            <el-select
-              size="mini"
-              v-model="queryParams.status"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+            <el-select size="mini" v-model="queryParams.status" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -122,13 +90,7 @@
 
     <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -144,56 +106,38 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column label="编码" align="center" prop="code" width="180"/>
-      <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
+    <el-table v-loading="loading" :data="annualSaleGoalList" @selection-change="handleSelectionChange"
+      v-horizontal-scroll>
+      <el-table-column label="编码" align="center" prop="code" width="180" />
+      <el-table-column label="目标名称" align="center" prop="goalName" width="180" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="年度" align="center" prop="annual"/>
-      <el-table-column label="客户" align="center" prop="custom" width="180"/>
-      <el-table-column label="销售区域" align="center" prop="saleZone" width="180"/>
-      <el-table-column label="制单人" align="center" prop="creator"/>
-      <el-table-column label="部门" align="center" prop="dept" width="180"/>
-      <el-table-column label="目标合计" align="center" prop="goalTotal"/>
-      <el-table-column label="备注" align="center" prop="notes" width="180"/>
+      <el-table-column label="年度" align="center" prop="annual" />
+      <el-table-column label="客户" align="center" prop="custom" width="180" />
+      <el-table-column label="销售区域" align="center" prop="saleZone" width="180" />
+      <el-table-column label="制单人" align="center" prop="creator" />
+      <el-table-column label="部门" align="center" prop="dept" width="180" />
+      <el-table-column label="目标合计" align="center" prop="goalTotal" />
+      <el-table-column label="备注" align="center" prop="notes" width="180" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_status"
-            :value="scope.row.status"
-          />
+          <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' || scope.row.status == '3'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
-            >删除
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-            >提交</el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)">提交</el-button>
           </div>
           <div v-if="scope.row.status == '1'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleReback(scope.row)"
-            >收回</el-button>
+            <el-button size="mini" type="text" @click="handleReback(scope.row)">收回</el-button>
           </div>
           <!-- <el-button
             size="mini"
@@ -206,32 +150,27 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[10, 20, 50, 100]"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]" @pagination="getList" />
 
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
+      v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
-              <el-input v-model="form.code" placeholder="编码后端自动生成" clearable disabled/>
+              <el-input v-model="form.code" placeholder="编码后端自动生成" clearable disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="目标名称" prop="goalName">
-              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" clearable disabled/>
+              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" clearable disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据日期" prop="documentDate">
-              <el-date-picker v-model="form.documentDate" type="date" format="yyyy-MM-dd"
-                              placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model="form.documentDate" type="date" format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -243,37 +182,29 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="客户" prop="custom">
-              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
-                                    :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                    :source.sync="form" placeholder="请输入客户">
+              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name" referName="CUSTOMER_PARAM"
+                :dataMapping="{ customCode: 'code', custom: 'name'}" :source.sync="form" 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="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="MK_SALESAREA_PARAM"
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                    :source.sync="form" placeholder="请输入销售区域">
+              <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM"
+                :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}" :source.sync="form" placeholder="请输入销售区域">
               </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="form.creator" title="制单人" valueKey="name"
-                                    referName="CONTACTS_PARAM"
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="form" placeholder="请输入制单人">
+              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name" referName="CONTACTS_PARAM"
+                :dataMapping="{ creatorCode: 'code', creator: 'name'}" :source.sync="form" 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="form.dept" title="部门" valueKey="name"
-                                    referName="DEPT_PARAM"
-                                    :dataMapping="{ deptId: 'id', dept: 'name'}"
-                                    :source.sync="form" placeholder="请输入部门">
+              <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+                :dataMapping="{ deptId: 'id', dept: 'name'}" :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
           </el-col>
@@ -281,23 +212,19 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="目标合计" prop="goalTotal">
-              <el-input v-model="form.goalTotal" placeholder="目标合计自动计算" clearable disabled/>
+              <el-input v-model="form.goalTotal" placeholder="目标合计自动计算" clearable disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="备注" prop="notes">
-              <el-input v-model="form.notes" placeholder="请输入备注" clearable/>
+              <el-input v-model="form.notes" placeholder="请输入备注" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>
-                <el-option
-                  v-for="dict in dict.type.sys_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -306,7 +233,8 @@
       <div id="addDetails">
         <el-row :gutter="10" class="mb8" style="margin-left: 80%">
           <el-col :span="1.5">
-            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载</el-button>
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-upload ref="upload" action="" :http-request="handleImport">
@@ -317,66 +245,74 @@
             <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-edit-outline" size="mini" @click="dialogUpdateMore.dialogFormVisible = true">批量修改</el-button>
+            <el-button type="primary" plain icon="el-icon-edit-outline" size="mini"
+              @click="dialogUpdateMore.dialogFormVisible = true">批量修改</el-button>
           </el-col>
         </el-row>
         <el-tabs v-model="activeName">
           <el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
-              <el-table-column label="销售组织" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="销售组织" align="center" width="180"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                        referName="ORG_PARAM"
-                                        :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
-                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织"
+                    valueKey="name" referName="ORG_PARAM" :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
-              <el-table-column label="销售区域" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="销售区域" align="center" width="180"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                        referName="MK_SALESAREA_PARAM"
-                                        :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域"
+                    valueKey="name" referName="MK_SALESAREA_PARAM"
+                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
-              <el-table-column label="客户" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="客户" align="center" width="180"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                        referName="CUSTOMER_PARAM"
-                                        :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].custom" title="客户"
+                    valueKey="name" referName="CUSTOMER_PARAM" :dataMapping="{ customCode: 'code', custom: 'name'}"
+                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
-              <el-table-column label="负责人" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="负责人" align="center" width="180"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].creator" title="负责人" valueKey="name"
-                                        referName="CONTACTS_PARAM"
-                                        :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入负责人">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].creator" title="负责人"
+                    valueKey="name" referName="CONTACTS_PARAM" :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入负责人">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
-              <el-table-column label="一级分类" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="一级分类" align="center" width="180"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-input v-model="annualSaleGoalDetailsList[scope.$index].oneLevelClassify" placeholder="请输入一级分类" disabled></el-input>
+                  <el-input v-model="annualSaleGoalDetailsList[scope.$index].oneLevelClassify" placeholder="请输入一级分类"
+                    disabled></el-input>
                 </template>
               </el-table-column>
-              <el-table-column label="二级分类" align="center" width="180" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="二级分类" align="center" width="180"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-input v-model="annualSaleGoalDetailsList[scope.$index].twoLevelClassify" placeholder="请输入二级分类" disabled></el-input>
+                  <el-input v-model="annualSaleGoalDetailsList[scope.$index].twoLevelClassify" placeholder="请输入二级分类"
+                    disabled></el-input>
                 </template>
               </el-table-column>
-              <el-table-column label="物料" align="center" width="220" :render-header="(h, obj) => addRedStar(h, obj, '0')">
+              <el-table-column label="物料" align="center" width="220"
+                :render-header="(h, obj) => addRedStar(h, obj, '0')">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].material" title="物料" valueKey="name"
-                                        referName="MATERIAL_PARAM"
-                                        @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, annualSaleGoalDetailsList[scope.$index])"
-                                        :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass'}"
-                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].material" title="物料"
+                    valueKey="name" referName="MATERIAL_PARAM"
+                    @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, annualSaleGoalDetailsList[scope.$index])"
+                    :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass'}"
+                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
@@ -387,78 +323,95 @@
               </el-table-column>
               <el-table-column label="一月" align="center" prop="januaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="二月" align="center" prop="februaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="三月" align="center" prop="marchGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="四月" align="center" prop="aprilGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="五月" align="center" prop="mayGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="六月" align="center" prop="juneGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="七月" align="center" prop="julyGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="八月" align="center" prop="augustGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="九月" align="center" prop="septemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十月" align="center" prop="octoberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十一月" align="center" prop="novemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十二月" align="center" prop="decemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])"
+                    v-model="annualSaleGoalDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.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">
+              <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>
+                  <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>
@@ -471,37 +424,31 @@
       </div>
     </el-drawer>
     <!-- 批量修改对话框-->
-    <el-dialog title="批量修改" width="30%" :visible.sync="dialogUpdateMore.dialogFormVisible" append-to-body @closed="resetDialogUpdateMore">
+    <el-dialog title="批量修改" width="30%" :visible.sync="dialogUpdateMore.dialogFormVisible" append-to-body
+      @closed="resetDialogUpdateMore">
       <el-form>
         <el-form-item label="修改项" label-width="100px">
           <el-select @change="changeDialogData" v-model="dialogUpdateMore.updateName" placeholder="请选择需要批量修改的字段">
-            <el-option v-for="item in dialogUpdateMore.optionList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="item in dialogUpdateMore.optionList" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="修改值" label-width="100px">
-          <el-popover-select-v2 v-if="dialogUpdateMore.updateName === 1"
-                                v-model="dialogUpdateMore.updateData" title="销售组织" valueKey="name"
-                                referName="ORG_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入销售组织">
+          <el-popover-select-v2 v-if="dialogUpdateMore.updateName === 1" v-model="dialogUpdateMore.updateData"
+            title="销售组织" valueKey="name" referName="ORG_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入销售组织">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 2"
-                                v-model="dialogUpdateMore.updateData" title="销售区域" valueKey="name"
-                                referName="MK_SALESAREA_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入销售区域">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 2" v-model="dialogUpdateMore.updateData"
+            title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入销售区域">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 3"
-                                v-model="dialogUpdateMore.updateData" title="客户" valueKey="name"
-                                referName="CUSTOMER_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入客户">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 3" v-model="dialogUpdateMore.updateData"
+            title="客户" valueKey="name" referName="CUSTOMER_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入客户">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 4"
-                                v-model="dialogUpdateMore.updateData" title="制单人" valueKey="name"
-                                referName="CONTACTS_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入制单人">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 4" v-model="dialogUpdateMore.updateData"
+            title="制单人" valueKey="name" referName="CONTACTS_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入制单人">
           </el-popover-select-v2>
           <el-input v-else placeholder="请输入修改项" disabled></el-input>
         </el-form-item>
@@ -514,615 +461,693 @@
 </template>
 
 <script>
-import {
-  listAnnualSaleGoal,
-  getAnnualSaleGoal,
-  delAnnualSaleGoal,
-  addAnnualSaleGoal,
-  updateAnnualSaleGoal,
-  submit,
-} from "@/api/business/spd/goal_management/annualSaleGoal";
-import {
-  delAnnualSaleGoalDetails,
-  getAnnualSaleGoalDetails,
-  importData
-} from "@/api/business/spd/goal_management/annualSaleGoalDetails"
-import { getToken } from "@/utils/auth";
-import { getSummary } from "@/api/business/spd/goal_management/commonWays";
+  import {
+    listAnnualSaleGoal,
+    getAnnualSaleGoal,
+    delAnnualSaleGoal,
+    addAnnualSaleGoal,
+    updateAnnualSaleGoal,
+    submit
+  } from "@/api/business/spd/goal_management/annualSaleGoal";
+  import {
+    delAnnualSaleGoalDetails,
+    getAnnualSaleGoalDetails,
+    importData
+  } from "@/api/business/spd/goal_management/annualSaleGoalDetails"
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    getSummary
+  } from "@/api/business/spd/goal_management/commonWays";
+  import {
+    rollBack
+  } from "@/api/business/spd/goal_management/publicInterface";
 
-// 树形参照
-import TreeRefers from '@/components/Refers/treeRefer.vue'
-import ElPopoverSelectV2 from "@/components/popover-select-v2"
+  // 树形参照
+  import TreeRefers from '@/components/Refers/treeRefer.vue'
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
 
-export default {
-  name: "AnnualSaleGoal",
-  dicts: ["sys_status"],
-  components: {
-    TreeRefers, ElPopoverSelectV2
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 年度销售目标表格数据
-      annualSaleGoalList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        delFlag: null,
-        documentDateRange: null
+  export default {
+    name: "AnnualSaleGoal",
+    dicts: ["sys_status", "oa_templete_id"],
+    components: {
+      TreeRefers,
+      ElPopoverSelectV2
+    },
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: false,
+        // 总条数
+        total: 0,
+        // 年度销售目标表格数据
+        annualSaleGoalList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          delFlag: null,
+          documentDateRange: null
+        },
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        // 表单参数
+        form: {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalTotal: null,
+          notes: null,
+          status: '开立态',
+          deleteStatus: 0,
+          annualGoalMergeDetails: []
+        },
+        formDetails: {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          creator: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          materialCode: null,
+          material: null,
+          totalGoal: null,
+          januaryGoal: null,
+          februaryGoal: null,
+          marchGoal: null,
+          aprilGoal: null,
+          mayGoal: null,
+          juneGoal: null,
+          julyGoal: null,
+          augustGoal: null,
+          septemberGoal: null,
+          octoberGoal: null,
+          novemberGoal: null,
+          decemberGoal: null
+        },
+        // 表单校验
+        rules: {
+          documentDate: [{
+            required: true,
+            message: '单据日期不能为空',
+            trigger: 'blur'
+          }],
+          annual: [{
+            required: true,
+            message: '年度不能为空',
+            trigger: 'blur'
+          }],
+          custom: [{
+            required: true,
+            message: '客户不能为空',
+            trigger: 'blur'
+          }],
+          saleZone: [{
+            required: true,
+            message: '销售区域不能为空',
+            trigger: 'blur'
+          }],
+          creator: [{
+            required: true,
+            message: '制单人不能为空',
+            trigger: 'blur'
+          }],
+          dept: [{
+            required: true,
+            message: '部门不能为空',
+            trigger: 'blur'
+          }]
+        },
+        // 子表数组
+        annualSaleGoalDetailsList: [],
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoal/importData"
+        },
+        activeName: 'annualSaleGoalDetails',
+        dialogUpdateMore: {
+          updateName: null,
+          dialogFormVisible: false,
+          updateData: null,
+          optionList: [{
+            value: 1,
+            label: '销售组织'
+          }, {
+            value: 2,
+            label: '销售区域'
+          }, {
+            value: 3,
+            label: '客户'
+          }, {
+            value: 4,
+            label: '制单人'
+          }, ]
+        }
+      };
+    },
+    created() {
+      console.log(this.$store.state.user, 'this.$store.state.user')
+      this.getList();
+    },
+    methods: {
+      /** 查询年度销售目标列表 */
+      getList() {
+        this.loading = true;
+        listAnnualSaleGoal(this.queryParams).then(response => {
+          this.annualSaleGoalList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+          console.log(this.annualSaleGoalList);
+        });
       },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+      getListDetails() {
+        this.loading = true
+        getAnnualSaleGoalDetails(this.form.id).then(response => {
+          this.annualSaleGoalDetailsList = response.data
+          this.computeTotal()
+          this.form.annualGoalMergeDetails = this.annualSaleGoalDetailsList
+          updateAnnualSaleGoal(this.form).then(response => {})
+          this.loading = false
+        })
       },
-      // 表单参数
-      form: {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalTotal: null,
-        notes: null,
-        status: '开立态',
-        deleteStatus: 0,
-        annualGoalMergeDetails: []
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
       },
-      formDetails: {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        creator: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        totalGoal: null,
-        januaryGoal: null,
-        februaryGoal: null,
-        marchGoal: null,
-        aprilGoal: null,
-        mayGoal: null,
-        juneGoal: null,
-        julyGoal: null,
-        augustGoal: null,
-        septemberGoal: null,
-        octoberGoal: null,
-        novemberGoal: null,
-        decemberGoal: null
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          deleteStatus: null
+        };
+        this.resetForm("form");
       },
-      // 表单校验
-      rules: {
-        documentDate: [{required: true, message: '单据日期不能为空', trigger: 'blur'}],
-        annual: [{required: true, message: '年度不能为空', trigger: 'blur'}],
-        custom: [{required: true, message: '客户不能为空', trigger: 'blur'}],
-        saleZone: [{required: true, message: '销售区域不能为空', trigger: 'blur'}],
-        creator: [{required: true, message: '制单人不能为空', trigger: 'blur'}],
-        dept: [{required: true, message: '部门不能为空', trigger: 'blur'}]
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
       },
-      // 子表数组
-      annualSaleGoalDetailsList: [],
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoal/importData"
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          delFlag: null,
+          documentDateRange: null
+        }
+        this.resetForm("queryForm");
+        this.handleQuery();
       },
-      activeName: 'annualSaleGoalDetails',
-      dialogUpdateMore: {
-        updateName: null,
-        dialogFormVisible: false,
-        updateData: null,
-        optionList:[{value: 1, label: '销售组织'}, {value: 2, label: '销售区域'}, {value: 3, label: '客户'}, {value: 4, label: '制单人'},]
-      }
-    };
-  },
-  created() {
-    console.log(this.$store.state.user, 'this.$store.state.user')
-    this.getList();
-  },
-  methods: {
-    /** 查询年度销售目标列表 */
-    getList() {
-      this.loading = true;
-      listAnnualSaleGoal(this.queryParams).then(response => {
-        this.annualSaleGoalList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        console.log(this.annualSaleGoalList);
-      });
-    },
-    getListDetails() {
-      this.loading = true
-      getAnnualSaleGoalDetails(this.form.id).then(response => {
-        this.annualSaleGoalDetailsList = response.data
-        this.computeTotal()
-        this.form.annualGoalMergeDetails = this.annualSaleGoalDetailsList
-        updateAnnualSaleGoal(this.form).then(response => {})
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        deleteStatus: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        delFlag: null,
-        documentDateRange: null
-      }
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      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.creatorCode = this.$store.state.user.name
-      this.form.creator = this.$store.state.user.nickName
-      this.form.deptId = this.$store.state.user.deptId
-      this.form.dept = this.$store.state.user.deptName
-    },
-    handleAddDetails() {
-      let list = {
-        id: null,
-        code: null,
-        saleOrg: this.$store.state.user.orgName,
-        saleZone: this.form.saleZone,
-        custom: this.form.custom,
-        creator: this.form.creator,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        totalGoal: '0.00',
-        januaryGoal: null,
-        februaryGoal: null,
-        marchGoal: null,
-        aprilGoal: null,
-        mayGoal: null,
-        juneGoal: null,
-        julyGoal: null,
-        augustGoal: null,
-        septemberGoal: null,
-        octoberGoal: null,
-        novemberGoal: null,
-        decemberGoal: null
-      }
-      this.annualSaleGoalDetailsList.push(list)
-      this.computeTotal()
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getAnnualSaleGoal(id).then(response => {
-        this.form = response.data;
-        this.saveFormTwoPoint(this.form)
-        this.annualSaleGoalDetailsList = this.form.annualGoalMergeDetails
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.title = "添加--年度销售目标";
+        this.annualSaleGoalDetailsList = []
         this.open = true;
-        this.title = "修改--年度销售目标";
-      });
-    },
-    // 复制按钮
-    handleCopy(id) {
-      this.reset();
-      getAnnualSaleGoal(id).then(response => {
-        console.log(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.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.saveFormTwoPoint(this.form)
-        this.annualSaleGoalDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetails))
-        for (const element of this.annualSaleGoalDetailsList) {
-          element.id = null
-          element.code = null
+        this.form.creatorCode = this.$store.state.user.name
+        this.form.creator = this.$store.state.user.nickName
+        this.form.deptId = this.$store.state.user.deptId
+        this.form.dept = this.$store.state.user.deptName
+      },
+      handleAddDetails() {
+        let list = {
+          id: null,
+          code: null,
+          saleOrg: this.$store.state.user.orgName,
+          saleZone: this.form.saleZone,
+          custom: this.form.custom,
+          creator: this.form.creator,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          materialCode: null,
+          material: null,
+          totalGoal: '0.00',
+          januaryGoal: null,
+          februaryGoal: null,
+          marchGoal: null,
+          aprilGoal: null,
+          mayGoal: null,
+          juneGoal: null,
+          julyGoal: null,
+          augustGoal: null,
+          septemberGoal: null,
+          octoberGoal: null,
+          novemberGoal: null,
+          decemberGoal: null
         }
-        this.open = true;
-        this.title = "新增--年度销售目标";
-        console.log(this.form);
-      })
-    },
-    // 进入修改复制界面保留两位小数
-    saveFormTwoPoint(form) {
-      form.goalTotal = form.goalTotal.toFixed(2)
-      for (const element of form.annualGoalMergeDetails) {
-        element.totalGoal = element.totalGoal.toFixed(2)
-      }
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if (!this.justiceDetailsList()) {
-        return this.$message.error('子表有必填字段没有赋值')
-      }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            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.status = '0'
-            this.form.annualGoalMergeDetails = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
-            console.log(this.form);
-            addAnnualSaleGoal(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        this.annualSaleGoalDetailsList.push(list)
+        this.computeTotal()
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getAnnualSaleGoal(id).then(response => {
+          this.form = response.data;
+          this.saveFormTwoPoint(this.form)
+          this.annualSaleGoalDetailsList = this.form.annualGoalMergeDetails
+          this.open = true;
+          this.title = "修改--年度销售目标";
+        });
+      },
+      // 复制按钮
+      handleCopy(id) {
+        this.reset();
+        getAnnualSaleGoal(id).then(response => {
+          console.log(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.saveFormTwoPoint(this.form)
+          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);
+        })
+      },
+      // 进入修改复制界面保留两位小数
+      saveFormTwoPoint(form) {
+        form.goalTotal = form.goalTotal.toFixed(2)
+        for (const element of form.annualGoalMergeDetails) {
+          element.totalGoal = element.totalGoal.toFixed(2)
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除年销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
-        return delAnnualSaleGoal(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    handleDeleteDetails(index, row) {
-      if (this.form.id === null) {
-        this.annualSaleGoalDetailsList.splice(index, 1)
-        this.computeTotal()
-      } else {
-        if (row.id !== null) {
-          this.$modal.confirm('是否确认删除年度销售目标明细序号为"' + (index + 1) + '"的数据项？').then(function () {
-            return delAnnualSaleGoalDetails(row.id)
-          }).then(() => {
-            this.getListDetails()
-            this.$modal.msgSuccess('删除成功')
-          }).catch(() => {})
-        } else {
+      },
+      /** 提交按钮 */
+      submitForm() {
+        if (!this.justiceDetailsList()) {
+          return this.$message.error('子表有必填字段没有赋值')
+        }
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              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.status = '0'
+              this.form.annualGoalMergeDetails = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
+              console.log(this.form);
+              addAnnualSaleGoal(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除年销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
+          return delAnnualSaleGoal(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      handleDeleteDetails(index, row) {
+        if (this.form.id === null) {
           this.annualSaleGoalDetailsList.splice(index, 1)
-          this.$message.success('删除成功')
           this.computeTotal()
+        } else {
+          if (row.id !== null) {
+            this.$modal.confirm('是否确认删除年度销售目标明细序号为"' + (index + 1) + '"的数据项？').then(function () {
+              return delAnnualSaleGoalDetails(row.id)
+            }).then(() => {
+              this.getListDetails()
+              this.$modal.msgSuccess('删除成功')
+            }).catch(() => {})
+          } else {
+            this.annualSaleGoalDetailsList.splice(index, 1)
+            this.$message.success('删除成功')
+            this.computeTotal()
+          }
         }
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('goal_management/annualSaleGoal/export', {
-        ...this.queryParams
-      }, `annualSaleGoal_${new Date().getTime()}.xlsx`)
-    },
-    handleExportDetails() {
-      this.download('goal_management/annualSaleGoalDetails/export', {
-        ...this.queryParams
-      }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-          this.reset()
-        })
-        .catch(_ => {
-        });
-    },
-    // 复制明细
-    handleCopyDetails(row) {
-      let list = {
-        id: null,
-        code: row.code,
-        saleOrg: row.saleOrg,
-        saleZone: row.saleZone,
-        custom: row.custom,
-        creator: row.creator,
-        oneLevelClassifyCode: row.oneLevelClassifyCode,
-        oneLevelClassify: row.oneLevelClassify,
-        twoLevelClassifyCode: row.oneLevelClassifyCode,
-        twoLevelClassify: row.twoLevelClassify,
-        materialCode: row.materialCode,
-        material: row.material,
-        totalGoal: row.totalGoal,
-        januaryGoal: row.januaryGoal,
-        februaryGoal: row.februaryGoal,
-        marchGoal: row.marchGoal,
-        aprilGoal: row.aprilGoal,
-        mayGoal: row.mayGoal,
-        juneGoal: row.juneGoal,
-        julyGoal: row.julyGoal,
-        augustGoal: row.augustGoal,
-        septemberGoal: row.septemberGoal,
-        octoberGoal: row.octoberGoal,
-        novemberGoal: row.novemberGoal,
-        decemberGoal: row.decemberGoal
-      }
-      this.annualSaleGoalDetailsList.push(list)
-      this.computeTotal()
-    },
-    // 计算子表合计
-    computeTotalDetails(index, row) {
-      let array = [row.januaryGoal, row.februaryGoal, row.marchGoal, row.aprilGoal, row.mayGoal, row.juneGoal, row.julyGoal, row.augustGoal, row.septemberGoal, row.octoberGoal, row.novemberGoal, row.decemberGoal]
-      let sum = 0
-      for (const element of array) {
-        sum = (sum * 1000000 + element * 1000000) / 1000000
-      }
-      this.annualSaleGoalDetailsList[index].totalGoal = sum.toFixed(2)
-      this.computeTotal()
-    },
-    // 计算主表合计
-    computeTotal() {
-      let list = this.annualSaleGoalDetailsList
-      let sum = 0
-      for (const listElement of list) {
-        sum = (sum * 1000000 + listElement.totalGoal * 1000000) / 1000000
-      }
-      this.form.goalTotal = sum.toFixed(2)
-    },
-    getSummaries(param) {
-      return getSummary(param)
-    },
-    // 给table添加必填项
-    addRedStar(h, { column }, required) {
-      if (required === '0') {
-        return [
-          h('span', { style: 'color: #F56C6C' }, '*'),
-          h('span', '' + column.label)
-        ]
-      } else {
-        return [
-          // h('span', { style: 'color: #F56C6C' }, '*'),
-          h('span', '' + column.label)
-        ]
-      }
-    },
-    // 判断子表的字段是否都填了
-    justiceDetailsList() {
-      const arr = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
-      for (const element of arr) {
-        const flag1 = (element.saleZone !== null) && (element.saleOrg !== null) && (element.custom !== null) && (element.creator !== null) && (element.materialCode !== null) && (element.material !== null)
-        const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !== undefined) && (element.creator !== undefined) && (element.materialCode != undefined) && (element.material !== undefined)
-        if (flag1 && flag2) {
-          return true
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('goal_management/annualSaleGoal/export', {
+          ...this.queryParams
+        }, `annualSaleGoal_${new Date().getTime()}.xlsx`)
+      },
+      handleExportDetails() {
+        this.download('goal_management/annualSaleGoalDetails/export', {
+          ...this.queryParams
+        }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reset()
+          })
+          .catch(_ => {});
+      },
+      // 复制明细
+      handleCopyDetails(row) {
+        let list = {
+          id: null,
+          code: row.code,
+          saleOrg: row.saleOrg,
+          saleZone: row.saleZone,
+          custom: row.custom,
+          creator: row.creator,
+          oneLevelClassifyCode: row.oneLevelClassifyCode,
+          oneLevelClassify: row.oneLevelClassify,
+          twoLevelClassifyCode: row.oneLevelClassifyCode,
+          twoLevelClassify: row.twoLevelClassify,
+          materialCode: row.materialCode,
+          material: row.material,
+          totalGoal: row.totalGoal,
+          januaryGoal: row.januaryGoal,
+          februaryGoal: row.februaryGoal,
+          marchGoal: row.marchGoal,
+          aprilGoal: row.aprilGoal,
+          mayGoal: row.mayGoal,
+          juneGoal: row.juneGoal,
+          julyGoal: row.julyGoal,
+          augustGoal: row.augustGoal,
+          septemberGoal: row.septemberGoal,
+          octoberGoal: row.octoberGoal,
+          novemberGoal: row.novemberGoal,
+          decemberGoal: row.decemberGoal
         }
-      }
-      return false
-    },
-    handleCommand(command) {
-      // 执行对应的功能
-      if (command === 'export') {
-        console.log('导出主表');
-        this.handleExport()
-      } else if (command === 'exportDetails') {
-        console.log('导出明细');
-        this.handleExportDetails()
-      }
-    },
-    // 选择物料后，给一级分类和二级分类复赋值
-    setClassify(one, two, obj) {
-      const oneArray = one.split("&")
-      const twoArray = two.split("&")
-      obj.oneLevelClassifyCode = oneArray[1]
-      obj.oneLevelClassify = oneArray[0]
-      obj.twoLevelClassifyCode = twoArray[1]
-      obj.twoLevelClassify = twoArray[0]
-      console.log(obj);
-    },
-    // 批量修改对话框的方法
-    dialogUpdateMoreSave() {
-      console.log(this.dialogUpdateMore);
-      if (this.dialogUpdateMore.updateData === null) {
-        return this.$message.error('请输入修改值')
-      }
-      const array = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
-      if (array.length !== 0) {
-        let condition = this.dialogUpdateMore.updateName
+        this.annualSaleGoalDetailsList.push(list)
+        this.computeTotal()
+      },
+      // 计算子表合计
+      computeTotalDetails(index, row) {
+        let array = [row.januaryGoal, row.februaryGoal, row.marchGoal, row.aprilGoal, row.mayGoal, row.juneGoal, row
+          .julyGoal, row.augustGoal, row.septemberGoal, row.octoberGoal, row.novemberGoal, row.decemberGoal
+        ]
+        let sum = 0
         for (const element of array) {
-          if (condition === 1) {
-            element.saleOrg = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 2) {
-            element.saleZone = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 3) {
-            element.custom = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 4) {
-            element.creator = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+          sum = (sum * 1000000 + element * 1000000) / 1000000
+        }
+        this.annualSaleGoalDetailsList[index].totalGoal = sum.toFixed(2)
+        this.computeTotal()
+      },
+      // 计算主表合计
+      computeTotal() {
+        let list = this.annualSaleGoalDetailsList
+        let sum = 0
+        for (const listElement of list) {
+          sum = (sum * 1000000 + listElement.totalGoal * 1000000) / 1000000
+        }
+        this.form.goalTotal = sum.toFixed(2)
+      },
+      getSummaries(param) {
+        return getSummary(param)
+      },
+      // 给table添加必填项
+      addRedStar(h, {
+        column
+      }, required) {
+        if (required === '0') {
+          return [
+            h('span', {
+              style: 'color: #F56C6C'
+            }, '*'),
+            h('span', '' + column.label)
+          ]
+        } else {
+          return [
+            // h('span', { style: 'color: #F56C6C' }, '*'),
+            h('span', '' + column.label)
+          ]
+        }
+      },
+      // 判断子表的字段是否都填了
+      justiceDetailsList() {
+        const arr = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
+        for (const element of arr) {
+          const flag1 = (element.saleZone !== null) && (element.saleOrg !== null) && (element.custom !== null) && (
+            element.creator !== null) && (element.materialCode !== null) && (element.material !== null)
+          const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !==
+            undefined) && (element.creator !== undefined) && (element.materialCode != undefined) && (element
+            .material !== undefined)
+          if (flag1 && flag2) {
+            return true
           }
         }
-      }
-      this.annualSaleGoalDetailsList = array
-      this.dialogUpdateMore.dialogFormVisible = !this.dialogUpdateMore.dialogFormVisible
-      this.dialogUpdateMore.updateData = null
-      this.dialogUpdateMore.updateName = null
-    },
-    changeDialogData() {
-      this.dialogUpdateMore.updateData = null
-    },
-    resetDialogUpdateMore() {
-      this.dialogUpdateMore.updateName = null
-      this.dialogUpdateMore.updateData = null
-    },
-    //提交
-    async handleSubmit(row){
-      this.$modal.loading("提交中...");
-      try {
-        const {msg, code} = await submit(row.id);
-        if (code === 200) {
-          this.$modal.notifySuccess("提交成功");
+        return false
+      },
+      handleCommand(command) {
+        // 执行对应的功能
+        if (command === 'export') {
+          console.log('导出主表');
+          this.handleExport()
+        } else if (command === 'exportDetails') {
+          console.log('导出明细');
+          this.handleExportDetails()
+        }
+      },
+      // 选择物料后，给一级分类和二级分类复赋值
+      setClassify(one, two, obj) {
+        const oneArray = one.split("&")
+        const twoArray = two.split("&")
+        obj.oneLevelClassifyCode = oneArray[1]
+        obj.oneLevelClassify = oneArray[0]
+        obj.twoLevelClassifyCode = twoArray[1]
+        obj.twoLevelClassify = twoArray[0]
+        console.log(obj);
+      },
+      // 批量修改对话框的方法
+      dialogUpdateMoreSave() {
+        console.log(this.dialogUpdateMore);
+        if (this.dialogUpdateMore.updateData === null) {
+          return this.$message.error('请输入修改值')
+        }
+        const array = JSON.parse(JSON.stringify(this.annualSaleGoalDetailsList))
+        if (array.length !== 0) {
+          let condition = this.dialogUpdateMore.updateName
+          for (const element of array) {
+            if (condition === 1) {
+              element.saleOrg = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 2) {
+              element.saleZone = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 3) {
+              element.custom = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 4) {
+              element.creator = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            }
+          }
+        }
+        this.annualSaleGoalDetailsList = array
+        this.dialogUpdateMore.dialogFormVisible = !this.dialogUpdateMore.dialogFormVisible
+        this.dialogUpdateMore.updateData = null
+        this.dialogUpdateMore.updateName = null
+      },
+      changeDialogData() {
+        this.dialogUpdateMore.updateData = null
+      },
+      resetDialogUpdateMore() {
+        this.dialogUpdateMore.updateName = null
+        this.dialogUpdateMore.updateData = null
+      },
+      //提交
+      async handleSubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await submit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
+          }
+        } catch (err) {
+          console.error(err);
           this.$modal.closeLoading();
-          row.status = '1'
-          // this.getList(this.queryParams)
         }
-      }catch (err) {
-        console.error(err);
-        this.$modal.closeLoading();
-      }
-    },
-    //收回
-    handleReback(){
-
-    },
-    //模板下载
-    handleTemplateDownload(){
-      this.download('/goal_management/annualSaleGoalDetails/importTemplate', {
-      }, `AnnualSaleGoal_${new Date().getTime()}.xlsx`)
-    },
-    //导入
-    handleImport(file){
-      this.loading = true;
-      let formData = new FormData()
-      formData.append('file',file.file)
-      importData(formData).then((res) => {
-        console.log('res',res);
-        if(res.code == '200'){
-          this.form.annualGoalMergeDetails.push.apply(this.form.annualGoalMergeDetails,res.data);
-          this.$message.success(res.msg);
-        }else{
-          this.$message.success(res.msg);
+      },
+      //收回
+      handleReback(row) {
+        this.$modal.loading("收回中...");
+        let params = {
+          billCode: row.code,
+          fdId: row.flowId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "销售目标"
+          }).value,
+          billMaker: row.createBy,
+          type: "1"
         }
-        this.loading = false;
-      }).catch((e) => {
-        this.$message.error(e.message)
-      }).finally((e) => {
-        this.$refs['upload'].clearFiles();
-        this.resetList();
-        this.loading = false;
-      })
-    },
-  }
-};
+        rollBack(params).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("收回成功");
+            this.$modal.closeLoading();
+            this.getList(this.queryParams)
+          }
+        }).catch(err => {
+          this.$modal.closeLoading();
+        })
+      },
+      //模板下载
+      handleTemplateDownload() {
+        this.download('/goal_management/annualSaleGoalDetails/importTemplate', {},
+          `AnnualSaleGoal_${new Date().getTime()}.xlsx`)
+      },
+      //导入
+      handleImport(file) {
+        this.loading = true;
+        let formData = new FormData()
+        formData.append('file', file.file)
+        importData(formData).then((res) => {
+          console.log('res', res);
+          if (res.code == '200') {
+            // this.form.annualGoalMergeDetails.push.apply(this.form.annualGoalMergeDetails, res.data);
+            this.annualSaleGoalDetailsList.push.apply(this.annualSaleGoalDetailsList, res.data);
+            this.$message.success(res.msg);
+          } else {
+            this.$message.success(res.msg);
+          }
+          this.loading = false;
+        }).catch((e) => {
+          this.$message.error(e.message)
+        }).finally((e) => {
+          this.$refs['upload'].clearFiles();
+          this.resetList();
+          this.loading = false;
+        })
+      },
+    }
+  };
+
 </script>

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

@@ -4,27 +4,20 @@
       <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-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-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"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              @change="setBeginAndEnd"
-              align="right"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              placeholder="请选择单据日期"
-              :picker-options="pickerOptions">
+            <el-date-picker v-model="documentDateRange" type="daterange" value-format="yyyy-MM-dd"
+              @change="setBeginAndEnd" align="right" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+              placeholder="请选择单据日期" :picker-options="pickerOptions">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -33,7 +26,8 @@
             <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
-              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle @click="showSearch = !showSearch"></el-button>
+              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle
+                @click="showSearch = !showSearch"></el-button>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -43,22 +37,16 @@
       <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
+            <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="dept">
-            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name"
-                                  referName="DEPT_PARAM"
-                                  :dataMapping="{ deptId: 'id', dept: 'name'}"
-                                  :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
+            <el-popover-select-v2 v-model="queryParams.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+              :dataMapping="{ deptId: 'id', dept: 'name'}" :source.sync="queryParams" placeholder="请输入部门"
+              @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
           </el-form-item>
         </el-col>
@@ -67,9 +55,7 @@
             <el-select v-model="queryParams.goalCategory" placeholder="请输入目标类型">
               <el-option
                 v-for="item in [{ value: '销售区域', label: '销售区域' }, { value: '一级分类', label: '一级分类' }, { value: '二级分类', label: '二级分类' }]"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -77,9 +63,8 @@
         <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="请输入销售区域">
+              referName="MK_SALESAREA_PARAM" :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+              :source.sync="queryParams" placeholder="请输入销售区域">
             </el-popover-select-v2>
           </el-form-item>
         </el-col>
@@ -87,18 +72,15 @@
       <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 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="oneLevelClassify">
             <el-select v-model="queryParams.oneLevelClassify" size="mini" clearable placeholder="请输入一级分类"
-                       @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '一级物料分类')"
-                       style="width: 200px">
+              @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>
@@ -106,25 +88,16 @@
         <el-col :span="6">
           <el-form-item label="二级分类" prop="twoLevelClassify">
             <el-select v-model="queryParams.twoLevelClassify" size="mini" clearable placeholder="请输入二级分类"
-                       @focus="chooseTreeReferForQuery('MATERIALCLASSIFY_PARAM', false, '二级物料分类')"
-                       style="width: 200px">
+              @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-col :span="6">
           <el-form-item label="单据状态" prop="status">
-            <el-select
-              size="mini"
-              v-model="queryParams.status"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+            <el-select size="mini" v-model="queryParams.status" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -133,13 +106,7 @@
 
     <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -157,74 +124,51 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="annualSaleGoalMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column label="编码" align="center" prop="code" width="180"/>
-      <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
+    <el-table v-loading="loading" :data="annualSaleGoalMergeList" @selection-change="handleSelectionChange"
+      v-horizontal-scroll>
+      <el-table-column label="编码" align="center" prop="code" width="180" />
+      <el-table-column label="目标名称" align="center" prop="goalName" width="180" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="年度" align="center" prop="annual" width="180"/>
+      <el-table-column label="年度" align="center" prop="annual" width="180" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_status"
-            :value="scope.row.status"
-          />
+          <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="制单人" align="center" prop="creator" width="180"/>
-      <el-table-column label="部门" align="center" prop="dept" width="180"/>
-      <el-table-column label="目标类型" align="center" prop="goalCategory" width="180"/>
-      <el-table-column label="目标值汇总" align="center" prop="goalTotal" width="180"/>
-      <el-table-column label="销售区域" align="center" prop="saleZone" width="220"/>
-      <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="180"/>
-      <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="180"/>
-      <el-table-column label="备注" align="center" prop="notes" width="180"/>
+      <el-table-column label="制单人" align="center" prop="creator" width="180" />
+      <el-table-column label="部门" align="center" prop="dept" width="180" />
+      <el-table-column label="目标类型" align="center" prop="goalCategory" width="180" />
+      <el-table-column label="目标值汇总" align="center" prop="goalTotal" width="180" />
+      <el-table-column label="销售区域" align="center" prop="saleZone" width="220" />
+      <el-table-column label="一级分类" align="center" prop="oneLevelClassify" width="180" />
+      <el-table-column label="二级分类" align="center" prop="twoLevelClassify" width="180" />
+      <el-table-column label="备注" align="center" prop="notes" width="180" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' || scope.row.status == '3'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
-            >删除
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-            >提交</el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)">提交</el-button>
           </div>
           <div v-if="scope.row.status == '1'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleReback(scope.row)"
-            >收回</el-button>
+            <el-button size="mini" type="text" @click="handleReback(scope.row)">收回</el-button>
           </div>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[10, 20, 50, 100]"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]" @pagination="getList" />
 
     <!-- 添加或修改年度销售目标明细对话框 -->
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
+      v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">
@@ -253,30 +197,22 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="制单人" prop="creator">
-              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name"
-                                    referName="CONTACTS_PARAM"
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="form" placeholder="请输入制单人">
+              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name" referName="CONTACTS_PARAM"
+                :dataMapping="{ creatorCode: 'code', creator: 'name'}" :source.sync="form" 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="form.dept" title="部门" valueKey="name"
-                                    referName="DEPT_PARAM"
-                                    :dataMapping="{ deptId: 'id', dept: 'name'}"
-                                    :source.sync="form" placeholder="请输入部门">
+              <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+                :dataMapping="{ deptId: 'id', dept: 'name'}" :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="目标分类" prop="goalCategory">
               <el-select v-model="form.goalCategory" placeholder="请选择" @change="changeGoalCategoryForm">
-                <el-option
-                  v-for="item in goalCategoryList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                <el-option v-for="item in goalCategoryList" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -295,23 +231,19 @@
           </el-col>
           <el-col :span="6">
             <el-form-item v-if="form.goalCategory === '销售区域'" label="销售区域" prop="saleZone">
-              <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="MK_SALESAREA_PARAM"
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                    :source.sync="form" placeholder="请输入销售区域">
+              <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM"
+                :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}" :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
             </el-form-item>
             <el-form-item v-if="form.goalCategory === '一级分类'" label="一级分类" prop="oneLevelClassify">
               <el-select v-model="form.oneLevelClassify" clearable
-                         @focus="chooseTreeReferForMain('MATERIALCLASSIFY_PARAM', false, '一级物料分类')"
-                         style="width: 200px">
+                @focus="chooseTreeReferForMain('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="form.goalCategory === '二级分类'" label="二级分类" prop="twoLevelClassify">
               <el-select v-model="form.twoLevelClassify" clearable
-                         @focus="chooseTreeReferForMain('MATERIALCLASSIFY_PARAM', false, '二级物料分类')"
-                         style="width: 200px">
+                @focus="chooseTreeReferForMain('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>
@@ -319,12 +251,8 @@
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>
-                <el-option
-                  v-for="dict in dict.type.sys_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -338,58 +266,57 @@
         </el-row>
         <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
           <el-tab-pane label="年销售目标合并明细" name="annualSaleGoalMergeDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="annualSaleGoalMergeDetailsList" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="annualSaleGoalMergeDetailsList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                        referName="ORG_PARAM" disabled
-                                        :dataMapping="{saleOrg: 'name'}"
-                                        :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
+                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].saleOrg" title="销售组织"
+                    valueKey="name" referName="ORG_PARAM" disabled :dataMapping="{saleOrg: 'name'}"
+                    :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="销售区域" align="center" width="180">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                        referName="MK_SALESAREA_PARAM" disabled
-                                        :dataMapping="{saleZone: 'name'}"
-                                        :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
+                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].saleZone" title="销售区域"
+                    valueKey="name" referName="MK_SALESAREA_PARAM" disabled :dataMapping="{saleZone: 'name'}"
+                    :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="客户" align="center" width="180">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                        referName="CUSTOMER_PARAM" disabled
-                                        :dataMapping="{custom: 'name'}"
-                                        :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入客户">
+                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].custom" title="客户"
+                    valueKey="name" referName="CUSTOMER_PARAM" disabled :dataMapping="{custom: 'name'}"
+                    :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入客户">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="负责人" align="center" width="180">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].creator" title="负责人" valueKey="name"
-                                        referName="CONTACTS_PARAM" disabled
-                                        :dataMapping="{creator: 'name'}"
-                                        :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入负责人">
+                  <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].creator" title="负责人"
+                    valueKey="name" referName="CONTACTS_PARAM" disabled :dataMapping="{creator: 'name'}"
+                    :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入负责人">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="一级分类" align="center" width="220">
                 <template slot-scope="scope">
-                  <el-select v-model="annualSaleGoalMergeDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
-                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
-                             style="width: 200px" disabled>
+                  <el-select v-model="annualSaleGoalMergeDetailsList[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" width="220">
                 <template slot-scope="scope">
-                  <el-select v-model="annualSaleGoalMergeDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
-                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
-                             style="width: 200px" disabled>
+                  <el-select v-model="annualSaleGoalMergeDetailsList[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>
@@ -401,93 +328,127 @@
               </el-table-column>
               <el-table-column label="一月" align="center" prop="januaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="二月" align="center" prop="februaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="三月" align="center" prop="marchGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="四月" align="center" prop="aprilGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="五月" align="center" prop="mayGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="六月" align="center" prop="juneGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="七月" align="center" prop="julyGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0">
+                  </el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="八月" align="center" prop="augustGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="九月" align="center" prop="septemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十月" align="center" prop="octoberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十一月" align="center" prop="novemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十二月" align="center" prop="decemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])" v-model="annualSaleGoalMergeDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number
+                    @change="computeTotalDetails(scope.$index, annualSaleGoalMergeDetailsList[scope.$index])"
+                    v-model="annualSaleGoalMergeDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="区域目标汇总(年)" name="zoneGoalSum(year)">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="areaDetailList" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="areaDetailList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180">
                 <template slot-scope="scope">
                   <el-popover-select-v2 v-model="areaDetailList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                        referName="CUSTOMER_PARAM" disabled
-                                        :dataMapping="{saleOrg: 'name'}"
-                                        :source.sync="areaDetailList[scope.$index]" placeholder="请输入销售组织">
+                    referName="CUSTOMER_PARAM" disabled :dataMapping="{saleOrg: 'name'}"
+                    :source.sync="areaDetailList[scope.$index]" placeholder="请输入销售组织">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="销售区域" align="center" width="180">
                 <template slot-scope="scope">
                   <el-popover-select-v2 v-model="areaDetailList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                        referName="CUSTOMER_PARAM" disabled
-                                        :dataMapping="{saleZone: 'name'}"
-                                        :source.sync="areaDetailList[scope.$index]" placeholder="请输入销售区域">
+                    referName="CUSTOMER_PARAM" disabled :dataMapping="{saleZone: 'name'}"
+                    :source.sync="areaDetailList[scope.$index]" placeholder="请输入销售区域">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="负责人" align="center" width="180">
                 <template slot-scope="scope">
                   <el-popover-select-v2 v-model="areaDetailList[scope.$index].creator" title="负责人" valueKey="name"
-                                        referName="CONTACTS_PARAM" disabled
-                                        :dataMapping="{creator: 'name'}"
-                                        :source.sync="areaDetailList[scope.$index]" placeholder="请输入负责人">
+                    referName="CONTACTS_PARAM" disabled :dataMapping="{creator: 'name'}"
+                    :source.sync="areaDetailList[scope.$index]" placeholder="请输入负责人">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
@@ -498,93 +459,103 @@
               </el-table-column>
               <el-table-column label="一月" align="center" prop="januaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].januaryGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="二月" align="center" prop="februaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].februaryGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="三月" align="center" prop="marchGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].marchGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="四月" align="center" prop="aprilGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].aprilGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="五月" align="center" prop="mayGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].mayGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="六月" align="center" prop="juneGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].juneGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="七月" align="center" prop="julyGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].julyGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="八月" align="center" prop="augustGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].augustGoal" :precision="2" :step="0.1"
+                    :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="九月" align="center" prop="septemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].septemberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十月" align="center" prop="octoberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].octoberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十一月" align="center" prop="novemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].novemberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十二月" align="center" prop="decemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="areaDetailList[scope.$index].decemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="areaDetailList[scope.$index].decemberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="客户目标汇总(年)" name="customerGoalSum(year)">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="customerDetailList" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="customerDetailList" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" width="180">
                 <template slot-scope="scope">
                   <el-popover-select-v2 v-model="customerDetailList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                        referName="CUSTOMER_PARAM" disabled
-                                        :dataMapping="{saleOrg: 'name'}"
-                                        :source.sync="customerDetailList[scope.$index]" placeholder="请输入销售组织">
+                    referName="CUSTOMER_PARAM" disabled :dataMapping="{saleOrg: 'name'}"
+                    :source.sync="customerDetailList[scope.$index]" placeholder="请输入销售组织">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="销售区域" align="center" width="180">
                 <template slot-scope="scope">
                   <el-popover-select-v2 v-model="customerDetailList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                        referName="CUSTOMER_PARAM" disabled
-                                        :dataMapping="{saleZone: 'name'}"
-                                        :source.sync="customerDetailList[scope.$index]" placeholder="请输入销售区域">
+                    referName="CUSTOMER_PARAM" disabled :dataMapping="{saleZone: 'name'}"
+                    :source.sync="customerDetailList[scope.$index]" placeholder="请输入销售区域">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
               <el-table-column label="客户" align="center" width="180">
                 <template slot-scope="scope">
                   <el-popover-select-v2 v-model="customerDetailList[scope.$index].custom" title="客户" valueKey="name"
-                                        referName="CUSTOMER_PARAM" disabled
-                                        :dataMapping="{custom: 'name'}"
-                                        :source.sync="customerDetailList[scope.$index]" placeholder="请输入客户">
+                    referName="CUSTOMER_PARAM" disabled :dataMapping="{custom: 'name'}"
+                    :source.sync="customerDetailList[scope.$index]" placeholder="请输入客户">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
@@ -595,62 +566,74 @@
               </el-table-column>
               <el-table-column label="一月" align="center" prop="januaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].januaryGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="二月" align="center" prop="februaryGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].februaryGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="三月" align="center" prop="marchGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].marchGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="四月" align="center" prop="aprilGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].aprilGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="五月" align="center" prop="mayGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].mayGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="六月" align="center" prop="juneGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].juneGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="七月" align="center" prop="julyGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].julyGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="八月" align="center" prop="augustGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].augustGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="九月" align="center" prop="septemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].septemberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十月" align="center" prop="octoberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].octoberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十一月" align="center" prop="novemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].novemberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
               <el-table-column label="十二月" align="center" prop="decemberGoal" width="220">
                 <template slot-scope="scope">
-                  <el-input-number disabled v-model="customerDetailList[scope.$index].decemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                  <el-input-number disabled v-model="customerDetailList[scope.$index].decemberGoal" :precision="2"
+                    :step="0.1" :min="0"></el-input-number>
                 </template>
               </el-table-column>
             </el-table>
@@ -665,18 +648,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -684,7 +658,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer">
@@ -693,808 +668,893 @@
       </div>
     </el-dialog>
 
-    <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true"/>
+    <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true" />
     <TreeRefers ref="treeMain" @doSubmit="selectionsToInputForMain" :single="true" />
     <TreeRefers ref="treeDetails" @doSubmit="selectionsToInputForDetails" :single="true" />
   </div>
 </template>
 
 <script>
-import {
-  addAnnualSaleGoalMerge,
-  delAnnualSaleGoalMerge,
-  getAnnualSaleGoalMerge,
-  listAnnualSaleGoalMerge,
-  updateAnnualSaleGoalMerge,
-  submit
-} from "@/api/business/spd/goal_management/annualSaleGoalMerge";
-import {
-  mergeAnnualSaleMergeDetails,
-  delAnnualSaleMergeDetails,
-  getAnnualSaleMergeDetails
-} from "@/api/business/spd/goal_management/annualSaleMergeDetails"
-import { getToken } from "@/utils/auth";
-import { getSummary } from "@/api/business/spd/goal_management/commonWays";
+  import {
+    addAnnualSaleGoalMerge,
+    delAnnualSaleGoalMerge,
+    getAnnualSaleGoalMerge,
+    listAnnualSaleGoalMerge,
+    updateAnnualSaleGoalMerge,
+    submit
+  } from "@/api/business/spd/goal_management/annualSaleGoalMerge";
+  import {
+    mergeAnnualSaleMergeDetails,
+    delAnnualSaleMergeDetails,
+    getAnnualSaleMergeDetails
+  } from "@/api/business/spd/goal_management/annualSaleMergeDetails"
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    getSummary
+  } from "@/api/business/spd/goal_management/commonWays";
+  import {
+    rollBack
+  } from "@/api/business/spd/goal_management/publicInterface";
 
-// 树形参照
-import TreeRefers from '@/components/Refers/treeRefer.vue'
-import ElPopoverSelectV2 from "@/components/popover-select-v2"
-import log from "../../../monitor/job/log";
+  // 树形参照
+  import TreeRefers from '@/components/Refers/treeRefer.vue'
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
+  import log from "../../../monitor/job/log";
 
-export default {
-  name: "AnnualSaleGoalMerge",
-  components: {
-    TreeRefers, ElPopoverSelectV2
-  },
-    dicts: ["sys_status"],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 年度销售目标明细表格数据
-      annualSaleGoalMergeList: null,
-      annualSaleGoalMergeDetailsList: null,
-      areaDetailList: null,
-      customerDetailList: null,
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalCategory: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        delFlag: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        params: { beginTime: null, endTime: null }
-      },
-      documentDateRange: null,
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
+  export default {
+    name: "AnnualSaleGoalMerge",
+    components: {
+      TreeRefers,
+      ElPopoverSelectV2
+    },
+    dicts: ["sys_status", "oa_templete_id"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: false,
+        // 总条数
+        total: 0,
+        // 年度销售目标明细表格数据
+        annualSaleGoalMergeList: null,
+        annualSaleGoalMergeDetailsList: null,
+        areaDetailList: null,
+        customerDetailList: null,
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalCategory: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          delFlag: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          params: {
+            beginTime: null,
+            endTime: null
           }
-        }]
-      },
-      // 表单参数
-      form: {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalCategory: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        delFlag: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        annualGoalMergeDetailsList: null,
-        oldAnnualGoalMergeDetailsList: null
-      },
-      formDetails: {
-        id: null,
-        mergeCode: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        creator: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        goalSum: null,
-        januaryGoal: null,
-        februaryGoal: null,
-        marchGoal: null,
-        aprilGoal: null,
-        mayGoal: null,
-        juneGoal: null,
-        julyGoal: null,
-        augustGoal: null,
-        septemberGoal: null,
-        octoberGoal: null,
-        novemberGoal: null,
-        decemberGoal: null,
-        delFlag: null
-      },
-      // 表单校验
-      rules: {
-        documentDate: [{ required: true, message: '单据日期不能为空', trigger: 'blur' }],
-        annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
-        dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
-        goalCategory: [{ required: true, message: '目标类型不能为空', trigger: 'blur' }],
-        saleZone: [],
-        oneLevelClassify: [],
-        twoLevelClassify: []
-      },
-      // 树形参照
-      referCondition: {type: '', isPage: true, title: '', index: null},
-      classOptions: [],
-      // 目标分类
-      goalCategoryList: [
-        {
-          label: '销售区域', value: '销售区域'
+        },
+        documentDateRange: null,
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        // 表单参数
+        form: {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalCategory: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          delFlag: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          annualGoalMergeDetailsList: null,
+          oldAnnualGoalMergeDetailsList: null
+        },
+        formDetails: {
+          id: null,
+          mergeCode: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          creator: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          goalSum: null,
+          januaryGoal: null,
+          februaryGoal: null,
+          marchGoal: null,
+          aprilGoal: null,
+          mayGoal: null,
+          juneGoal: null,
+          julyGoal: null,
+          augustGoal: null,
+          septemberGoal: null,
+          octoberGoal: null,
+          novemberGoal: null,
+          decemberGoal: null,
+          delFlag: null
+        },
+        // 表单校验
+        rules: {
+          documentDate: [{
+            required: true,
+            message: '单据日期不能为空',
+            trigger: 'blur'
+          }],
+          annual: [{
+            required: true,
+            message: '年度不能为空',
+            trigger: 'blur'
+          }],
+          creator: [{
+            required: true,
+            message: '制单人不能为空',
+            trigger: 'blur'
+          }],
+          dept: [{
+            required: true,
+            message: '部门不能为空',
+            trigger: 'blur'
+          }],
+          goalCategory: [{
+            required: true,
+            message: '目标类型不能为空',
+            trigger: 'blur'
+          }],
+          saleZone: [],
+          oneLevelClassify: [],
+          twoLevelClassify: []
+        },
+        // 树形参照
+        referCondition: {
+          type: '',
+          isPage: true,
+          title: '',
+          index: null
+        },
+        classOptions: [],
+        // 目标分类
+        goalCategoryList: [{
+          label: '销售区域',
+          value: '销售区域'
         }, {
-          label: '一级分类', value: '一级分类'
+          label: '一级分类',
+          value: '一级分类'
         }, {
-          label: '二级分类', value: '二级分类'
+          label: '二级分类',
+          value: '二级分类'
         }],
-      activeName: 'annualSaleGoalMergeDetails',
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询年度销售目标明细列表 */
-    getList() {
-      this.loading = true;
-      listAnnualSaleGoalMerge(this.queryParams).then(response => {
-        this.annualSaleGoalMergeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    getListDetails() {
-      this.loading = true;
-      getAnnualSaleMergeDetails(this.form.id).then(response => {
-        console.log(response);
-        this.annualSaleGoalMergeDetailsList = response.data;
-        this.computeTotal()
-        this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
-        updateAnnualSaleGoalMerge(this.form).then(response => {
-          this.$modal.msgSuccess("目标值汇总修改成功");
-        });
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalCategory: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        delFlag: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        annualGoalMergeDetailsList: null,
-        oldAnnualGoalMergeDetailsList: null
+        activeName: 'annualSaleGoalMergeDetails',
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        creatorCode: null,
-        creator: null,
-        deptId: null,
-        dept: null,
-        goalCategory: null,
-        goalTotal: null,
-        notes: null,
-        status: null,
-        delFlag: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        params: { beginTime: null, endTime: null }
-      }
-      this.documentDateRange = null
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.annualSaleGoalMergeDetailsList = []
-      this.areaDetailList = []
-      this.customerDetailList = []
-      this.activeName = 'annualSaleGoalMergeDetails'
-      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() {
-      if (this.activeName !== 'annualSaleGoalMergeDetails') {
-        return this.$message.error('当前标签不是‘年度销售目标合并明细’')
-      }
-      let list = {
-        id: null,
-        mergeCode: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        creator: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        goalSum: null,
-        januaryGoal: null,
-        februaryGoal: null,
-        marchGoal: null,
-        aprilGoal: null,
-        mayGoal: null,
-        juneGoal: null,
-        julyGoal: null,
-        augustGoal: null,
-        septemberGoal: null,
-        octoberGoal: null,
-        novemberGoal: null,
-        decemberGoal: null,
-        delFlag: null
-      }
-      this.annualSaleGoalMergeDetailsList.push(list)
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      this.activeName = 'annualSaleGoalMergeDetails'
-      this.areaDetailList = []
-      this.customerDetailList = []
-      getAnnualSaleGoalMerge(id).then(response => {
-        console.log(response);
-        this.form = response.data;
-        this.form.goalTotal = this.form.goalTotal.toFixed(2)
-        for (const element of this.form.annualGoalMergeDetailsList) {
-          element.totalGoal = element.totalGoal.toFixed(2)
+    methods: {
+      /** 查询年度销售目标明细列表 */
+      getList() {
+        this.loading = true;
+        listAnnualSaleGoalMerge(this.queryParams).then(response => {
+          this.annualSaleGoalMergeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      getListDetails() {
+        this.loading = true;
+        getAnnualSaleMergeDetails(this.form.id).then(response => {
+          console.log(response);
+          this.annualSaleGoalMergeDetailsList = response.data;
+          this.computeTotal()
+          this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
+          updateAnnualSaleGoalMerge(this.form).then(response => {
+            this.$modal.msgSuccess("目标值汇总修改成功");
+          });
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalCategory: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          delFlag: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          annualGoalMergeDetailsList: null,
+          oldAnnualGoalMergeDetailsList: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          creatorCode: null,
+          creator: null,
+          deptId: null,
+          dept: null,
+          goalCategory: null,
+          goalTotal: null,
+          notes: null,
+          status: null,
+          delFlag: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          params: {
+            beginTime: null,
+            endTime: null
+          }
         }
-        this.annualSaleGoalMergeDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetailsList))
+        this.documentDateRange = null
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.annualSaleGoalMergeDetailsList = []
+        this.areaDetailList = []
+        this.customerDetailList = []
+        this.activeName = 'annualSaleGoalMergeDetails'
         this.open = true;
-        this.title = "修改--年度销售目标合并明细";
-      });
-    },
-    // 复制按钮操作
-    handleCopy(id) {
-      this.reset()
-      this.annualSaleGoalMergeDetailsList = []
-      this.areaDetailList = []
-      this.customerDetailList = []
-      this.activeName = 'annualSaleGoalMergeDetails'
-      getAnnualSaleGoalMerge(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.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.goalTotal = 0
-        this.form.goalTotal = this.form.goalTotal.toFixed(2)
-        this.open = true
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            this.form.annualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
-            console.log(this.form);
-            updateAnnualSaleGoalMerge(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
-            this.form.status = '0'
-            console.log(this.form);
-            addAnnualSaleGoalMerge(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+        this.form.creator = this.$store.state.user.nickName
+        this.form.dept = this.$store.state.user.deptName
+      },
+      handleAddDetails() {
+        if (this.activeName !== 'annualSaleGoalMergeDetails') {
+          return this.$message.error('当前标签不是‘年度销售目标合并明细’')
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除年度销售目标单据编号为"' + row.code + '"的数据项？').then(function () {
-        return delAnnualSaleGoalMerge(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    handleDeleteDetails(index, row) {
-      if (this.form.id === null) { // 新增
-        this.annualSaleGoalMergeDetailsList.splice(index, 1)
-        this.computeTotal()
-      } else { // 修改
-        if (row.id !== null) {
-          this.$modal.confirm('是否确认删除年度销售目标明细序号为"' + (index + 1) + '"的数据项？').then(function () {
-            return delAnnualSaleMergeDetails(row.id);
-          }).then(() => {
-            this.getListDetails();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {
-          });
-        } else {
+        let list = {
+          id: null,
+          mergeCode: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          creator: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          goalSum: null,
+          januaryGoal: null,
+          februaryGoal: null,
+          marchGoal: null,
+          aprilGoal: null,
+          mayGoal: null,
+          juneGoal: null,
+          julyGoal: null,
+          augustGoal: null,
+          septemberGoal: null,
+          octoberGoal: null,
+          novemberGoal: null,
+          decemberGoal: null,
+          delFlag: null
+        }
+        this.annualSaleGoalMergeDetailsList.push(list)
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        this.activeName = 'annualSaleGoalMergeDetails'
+        this.areaDetailList = []
+        this.customerDetailList = []
+        getAnnualSaleGoalMerge(id).then(response => {
+          console.log(response);
+          this.form = response.data;
+          this.form.goalTotal = this.form.goalTotal.toFixed(2)
+          for (const element of this.form.annualGoalMergeDetailsList) {
+            element.totalGoal = element.totalGoal.toFixed(2)
+          }
+          this.annualSaleGoalMergeDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetailsList))
+          this.open = true;
+          this.title = "修改--年度销售目标合并明细";
+        });
+      },
+      // 复制按钮操作
+      handleCopy(id) {
+        this.reset()
+        this.annualSaleGoalMergeDetailsList = []
+        this.areaDetailList = []
+        this.customerDetailList = []
+        this.activeName = 'annualSaleGoalMergeDetails'
+        getAnnualSaleGoalMerge(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.goalTotal = 0
+          this.form.goalTotal = this.form.goalTotal.toFixed(2)
+          this.open = true
+        })
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              this.form.annualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
+              console.log(this.form);
+              updateAnnualSaleGoalMerge(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.form.annualGoalMergeDetailsList = this.annualSaleGoalMergeDetailsList
+              this.form.status = '0'
+              console.log(this.form);
+              addAnnualSaleGoalMerge(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除年度销售目标单据编号为"' + row.code + '"的数据项？').then(function () {
+          return delAnnualSaleGoalMerge(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      handleDeleteDetails(index, row) {
+        if (this.form.id === null) { // 新增
           this.annualSaleGoalMergeDetailsList.splice(index, 1)
-          this.$message.success('删除成功')
           this.computeTotal()
+        } else { // 修改
+          if (row.id !== null) {
+            this.$modal.confirm('是否确认删除年度销售目标明细序号为"' + (index + 1) + '"的数据项？').then(function () {
+              return delAnnualSaleMergeDetails(row.id);
+            }).then(() => {
+              this.getListDetails();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          } else {
+            this.annualSaleGoalMergeDetailsList.splice(index, 1)
+            this.$message.success('删除成功')
+            this.computeTotal()
+          }
         }
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('goal_management/annualSaleGoalMerge/export', {
-        ...this.queryParams
-      }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
-    },
-    handleExportDetails() {
-      this.download('goal_management/annualSaleMergeDetails/export', {
-        ...this.queryParams
-      }, `annualSaleMergeDetails_${new Date().getTime()}.xlsx`)
-    },
-    // 导出区域目标汇总
-    handleExportZoneSum() {
-      this.download('goal_management/annualSaleMergeDetails/exportZoneSum', {
-        ...this.queryParams
-      }, `zoneSum_${new Date().getTime()}.xlsx`)
-    },
-    // 导出客户目标汇总
-    handleExportCustomSum() {
-      this.download('goal_management/annualSaleMergeDetails/exportCustomSum', {
-        ...this.queryParams
-      }, `customSum_${new Date().getTime()}.xlsx`)
-    },
-    // 树形参照
-    chooseTreeReferForQuery(type, isPage, title) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.$refs.treeQuery.init(this.referCondition)
-    },
-    selectionsToInputForQuery(selection) {
-      this.classOptions.push(selection)
-      if (this.referCondition.title === '一级物料分类') {
-        if (selection.code.length !== 1) {
-          return this.$message.info('请在一级分类下选择')
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('goal_management/annualSaleGoalMerge/export', {
+          ...this.queryParams
+        }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
+      },
+      handleExportDetails() {
+        this.download('goal_management/annualSaleMergeDetails/export', {
+          ...this.queryParams
+        }, `annualSaleMergeDetails_${new Date().getTime()}.xlsx`)
+      },
+      // 导出区域目标汇总
+      handleExportZoneSum() {
+        this.download('goal_management/annualSaleMergeDetails/exportZoneSum', {
+          ...this.queryParams
+        }, `zoneSum_${new Date().getTime()}.xlsx`)
+      },
+      // 导出客户目标汇总
+      handleExportCustomSum() {
+        this.download('goal_management/annualSaleMergeDetails/exportCustomSum', {
+          ...this.queryParams
+        }, `customSum_${new Date().getTime()}.xlsx`)
+      },
+      // 树形参照
+      chooseTreeReferForQuery(type, isPage, title) {
+        this.referCondition.type = type
+        this.referCondition.isPage = isPage
+        this.referCondition.title = title
+        this.$refs.treeQuery.init(this.referCondition)
+      },
+      selectionsToInputForQuery(selection) {
+        this.classOptions.push(selection)
+        if (this.referCondition.title === '一级物料分类') {
+          if (selection.code.length !== 1) {
+            return this.$message.info('请在一级分类下选择')
+          }
+          this.queryParams.oneLevelClassifyCode = selection.code
+          this.queryParams.oneLevelClassify = selection.name
+        } else if (this.referCondition.title === '二级物料分类') {
+          if (selection.code.length !== 4) {
+            return this.$message.info('请在二级分类下选择')
+          }
+          this.queryParams.twoLevelClassifyCode = selection.code
+          this.queryParams.twoLevelClassify = selection.name
         }
-        this.queryParams.oneLevelClassifyCode = selection.code
-        this.queryParams.oneLevelClassify = selection.name
-      } else if (this.referCondition.title === '二级物料分类') {
-        if (selection.code.length !== 4) {
-          return this.$message.info('请在二级分类下选择')
+      },
+      chooseTreeReferForMain(type, isPage, title) {
+        this.referCondition.type = type
+        this.referCondition.isPage = isPage
+        this.referCondition.title = title
+        this.$refs.treeMain.init(this.referCondition)
+      },
+      selectionsToInputForMain(selection) {
+        this.classOptions.push(selection)
+        if (this.referCondition.title === '一级物料分类') {
+          if (selection.code.length !== 1) {
+            return this.$message.info('请在一级分类下选择')
+          }
+          this.form.oneLevelClassifyCode = selection.code
+          this.form.oneLevelClassify = selection.name
+        } else if (this.referCondition.title === '二级物料分类') {
+          if (selection.code.length !== 4) {
+            return this.$message.info('请在二级分类下选择')
+          }
+          this.form.twoLevelClassifyCode = selection.code
+          this.form.twoLevelClassify = selection.name
         }
-        this.queryParams.twoLevelClassifyCode = selection.code
-        this.queryParams.twoLevelClassify = selection.name
-      }
-    },
-    chooseTreeReferForMain(type, isPage, title) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.$refs.treeMain.init(this.referCondition)
-    },
-    selectionsToInputForMain(selection) {
-      this.classOptions.push(selection)
-      if (this.referCondition.title === '一级物料分类') {
-        if (selection.code.length !== 1) {
-          return this.$message.info('请在一级分类下选择')
+      },
+      chooseTreeReferForDetails(type, isPage, title, index) {
+        this.referCondition.type = type
+        this.referCondition.isPage = isPage
+        this.referCondition.title = title
+        this.referCondition.index = index
+        this.$refs.treeDetails.init(this.referCondition)
+      },
+      selectionsToInputForDetails(selection) {
+        this.classOptions.push(selection)
+        if (this.referCondition.title === '一级物料分类') {
+          if (selection.code.length !== 1) {
+            return this.$message.info('请在一级分类中选择')
+          }
+          if (selection.code !== this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode) {
+            this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = null
+            this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = null
+          }
+          this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode = selection.code
+          this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassify = selection.name
+        } else if (this.referCondition.title === '二级物料分类') {
+          if (selection.code.length !== 4) {
+            return this.$message.info('请在二级分类中选择')
+          } else if (selection.code[0] !== this.annualSaleGoalMergeDetailsList[this.referCondition.index]
+            .oneLevelClassifyCode) {
+            return this.$message.error('所选择的二级物料分类不属于一级分类')
+          }
+          this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = selection.code
+          this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = selection.name
         }
-        this.form.oneLevelClassifyCode = selection.code
-        this.form.oneLevelClassify = selection.name
-      } else if (this.referCondition.title === '二级物料分类') {
-        if (selection.code.length !== 4) {
-          return this.$message.info('请在二级分类下选择')
+      },
+      changeGoalCategoryForm() {
+        let condition = this.form.goalCategory
+        if (condition === '销售区域') {
+          this.form.oneLevelClassifyCode = null
+          this.form.oneLevelClassify = null
+          this.form.twoLevelClassifyCode = null
+          this.form.twoLevelClassify = null
+          this.rules.saleZone = [{
+            required: true,
+            message: '销售区域不能为空',
+            trigger: 'blur'
+          }]
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = []
+        } else if (condition === '一级分类') {
+          this.form.saleZoneCode = null
+          this.form.saleZone = null
+          this.form.twoLevelClassifyCode = null
+          this.form.twoLevelClassify = null
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = [{
+            required: true,
+            message: '一级分类不能为空',
+            trigger: 'blur'
+          }]
+          this.rules.twoLevelClassify = []
+        } else if (condition === '二级分类') {
+          this.form.saleZoneCode = null
+          this.form.saleZone = null
+          this.form.oneLevelClassifyCode = null
+          this.form.oneLevelClassify = null
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = [{
+            required: true,
+            message: '二级分类不能为空',
+            trigger: 'blur'
+          }]
+        } else {
+          this.form.saleZoneCode = null
+          this.form.saleZone = null
+          this.form.oneLevelClassifyCode = null
+          this.form.oneLevelClassify = null
+          this.form.twoLevelClassifyCode = null
+          this.form.twoLevelClassify = null
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = []
         }
-        this.form.twoLevelClassifyCode = selection.code
-        this.form.twoLevelClassify = selection.name
-      }
-    },
-    chooseTreeReferForDetails(type, isPage, title, index) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.referCondition.index = index
-      this.$refs.treeDetails.init(this.referCondition)
-    },
-    selectionsToInputForDetails(selection) {
-      this.classOptions.push(selection)
-      if (this.referCondition.title === '一级物料分类') {
-        if (selection.code.length !== 1) {
-          return this.$message.info('请在一级分类中选择')
+      },
+      // 关闭抽屉
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 复制明细
+      handleCopyDetails(row) {
+        let list = {
+          id: null,
+          mergeCode: row.mergeCode,
+          saleOrg: row.saleOrg,
+          saleZone: row.saleZone,
+          custom: row.custom,
+          creator: row.creator,
+          oneLevelClassifyCode: row.oneLevelClassifyCode,
+          oneLevelClassify: row.oneLevelClassify,
+          twoLevelClassifyCode: row.twoLevelClassifyCode,
+          twoLevelClassify: row.twoLevelClassify,
+          totalGoal: row.totalGoal,
+          januaryGoal: row.januaryGoal,
+          februaryGoal: row.februaryGoal,
+          marchGoal: row.marchGoal,
+          aprilGoal: row.aprilGoal,
+          mayGoal: row.mayGoal,
+          juneGoal: row.juneGoal,
+          julyGoal: row.julyGoal,
+          augustGoal: row.augustGoal,
+          septemberGoal: row.septemberGoal,
+          octoberGoal: row.octoberGoal,
+          novemberGoal: row.novemberGoal,
+          decemberGoal: row.decemberGoal,
+          delFlag: row.delFlag
         }
-        if (selection.code !== this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode) {
-          this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = null
-          this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = null
+        this.annualSaleGoalMergeDetailsList.push(list)
+        this.computeTotal()
+      },
+      // 计算子表合计
+      computeTotalDetails(index, row) {
+        let array = [row.januaryGoal, row.februaryGoal, row.marchGoal, row.aprilGoal, row.mayGoal, row.juneGoal, row
+          .julyGoal, row.augustGoal, row.septemberGoal, row.octoberGoal, row.novemberGoal, row.decemberGoal
+        ]
+        let sum = 0
+        for (const element of array) {
+          sum = (sum * 1000000 + element * 1000000) / 1000000
         }
-        this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode = selection.code
-        this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassify = selection.name
-      } else if (this.referCondition.title === '二级物料分类') {
-        if (selection.code.length !== 4) {
-          return this.$message.info('请在二级分类中选择')
-        } else if (selection.code[0] !== this.annualSaleGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode) {
-          return this.$message.error('所选择的二级物料分类不属于一级分类')
+        this.annualSaleGoalMergeDetailsList[index].totalGoal = sum
+        this.computeTotal()
+      },
+      // 计算主表合计
+      computeTotal() {
+        let list = this.annualSaleGoalMergeDetailsList
+        let sum = 0
+        for (const listElement of list) {
+          if (listElement.totalGoal === null) {
+            listElement.totalGoal = 0
+          }
+          sum = (sum * 1000000 + listElement.totalGoal * 1000000) / 1000000
         }
-        this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = selection.code
-        this.annualSaleGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = selection.name
-      }
-    },
-    changeGoalCategoryForm() {
-      let condition = this.form.goalCategory
-      if (condition === '销售区域') {
-        this.form.oneLevelClassifyCode = null
-        this.form.oneLevelClassify = null
-        this.form.twoLevelClassifyCode = null
-        this.form.twoLevelClassify = null
-        this.rules.saleZone = [{ required: true, message: '销售区域不能为空', trigger: 'blur' }]
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = []
-      } else if (condition === '一级分类') {
-        this.form.saleZoneCode = null
-        this.form.saleZone = null
-        this.form.twoLevelClassifyCode = null
-        this.form.twoLevelClassify = null
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = [{ required: true, message: '一级分类不能为空', trigger: 'blur' }]
-        this.rules.twoLevelClassify = []
-      } else if (condition === '二级分类') {
-        this.form.saleZoneCode = null
-        this.form.saleZone = null
-        this.form.oneLevelClassifyCode = null
-        this.form.oneLevelClassify = null
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = [{ required: true, message: '二级分类不能为空', trigger: 'blur' }]
-      } else {
-        this.form.saleZoneCode = null
-        this.form.saleZone = null
-        this.form.oneLevelClassifyCode = null
-        this.form.oneLevelClassify = null
-        this.form.twoLevelClassifyCode = null
-        this.form.twoLevelClassify = null
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = []
-      }
-    },
-    // 关闭抽屉
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
+        this.form.goalTotal = sum.toFixed(2)
+      },
+      getSummaries(param) {
+        return getSummary(param)
+      },
+      // 合并数据
+      clickMerge() {
+        if (this.form.id !== null) {
+          this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetailsList))
+        }
+        if (this.activeName !== 'annualSaleGoalMergeDetails') {
+          return this.$message.error('当前标签不是年销售目标合并明细')
+        }
+        let query = JSON.parse(JSON.stringify(this.form))
+        query.annualGoalMergeDetailsList = []
+        console.log(query);
+        if (query.goalCategory === null || query.goalCategory === '') {
+          return this.$message.error('请输入目标分类')
+        } else if (query.goalCategory === '销售区域') {
+          if (query.saleZone === null) {
+            return this.$message.error('请输入销售区域')
+          }
+        } else if (query.goalCategory === '一级分类') {
+          if (query.oneLevelClassify === null) {
+            return this.$message.error('请输入一级分类')
+          }
+        } else if (query.goalCategory === '二级分类') {
+          if (query.twoLevelClassify === null) {
+            return this.$message.error('请输入二级分类')
+          }
+        }
+        mergeAnnualSaleMergeDetails(query).then(response => {
+          console.log(response);
+          if (response.data.consolidatedDetail.length > 0) {
+            for (const consolidatedDetail of response.data.consolidatedDetail) {
+              consolidatedDetail.totalGoal = consolidatedDetail.totalGoal.toFixed(2)
+            }
+            this.annualSaleGoalMergeDetailsList = response.data.consolidatedDetail
+            this.computeTotal()
+          } else {
+            return this.$message.warning('未查到相关数据')
+          }
         })
-        .catch(_ => {});
-    },
-    // 复制明细
-    handleCopyDetails(row) {
-      let list = {
-        id: null,
-        mergeCode: row.mergeCode,
-        saleOrg: row.saleOrg,
-        saleZone: row.saleZone,
-        custom: row.custom,
-        creator: row.creator,
-        oneLevelClassifyCode: row.oneLevelClassifyCode,
-        oneLevelClassify: row.oneLevelClassify,
-        twoLevelClassifyCode: row.twoLevelClassifyCode,
-        twoLevelClassify: row.twoLevelClassify,
-        totalGoal: row.totalGoal,
-        januaryGoal: row.januaryGoal,
-        februaryGoal: row.februaryGoal,
-        marchGoal: row.marchGoal,
-        aprilGoal: row.aprilGoal,
-        mayGoal: row.mayGoal,
-        juneGoal: row.juneGoal,
-        julyGoal: row.julyGoal,
-        augustGoal: row.augustGoal,
-        septemberGoal: row.septemberGoal,
-        octoberGoal: row.octoberGoal,
-        novemberGoal: row.novemberGoal,
-        decemberGoal: row.decemberGoal,
-        delFlag: row.delFlag
-      }
-      this.annualSaleGoalMergeDetailsList.push(list)
-      this.computeTotal()
-    },
-    // 计算子表合计
-    computeTotalDetails(index, row) {
-      let array = [row.januaryGoal, row.februaryGoal, row.marchGoal, row.aprilGoal, row.mayGoal, row.juneGoal, row.julyGoal, row.augustGoal, row.septemberGoal, row.octoberGoal, row.novemberGoal, row.decemberGoal]
-      let sum = 0
-      for (const element of array) {
-        sum = (sum * 1000000 + element * 1000000) / 1000000
-      }
-      this.annualSaleGoalMergeDetailsList[index].totalGoal = sum
-      this.computeTotal()
-    },
-    // 计算主表合计
-    computeTotal() {
-      let list = this.annualSaleGoalMergeDetailsList
-      let sum = 0
-      for (const listElement of list) {
-        if (listElement.totalGoal === null) {
-          listElement.totalGoal = 0
+      },
+      // 获得区域目标汇总or客户目标汇总
+      getNewTwoArray() {
+        let arr = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
+        // 如果子表标签是annualSaleGoalMergeDetails 或者 主表的目标分类是“销售区域”
+        if (this.activeName === 'annualSaleGoalMergeDetails') {
+          this.areaDetailList = null
+          this.customerDetailList = null
+          return
         }
-        sum = (sum * 1000000 + listElement.totalGoal * 1000000) / 1000000
-      }
-      this.form.goalTotal = sum.toFixed(2)
-    },
-    getSummaries(param) {
-      return getSummary(param)
-    },
-    // 合并数据
-    clickMerge() {
-      if (this.form.id !== null) {
-        this.form.oldAnnualGoalMergeDetailsList = JSON.parse(JSON.stringify(this.form.annualGoalMergeDetailsList))
-      }
-      if (this.activeName !== 'annualSaleGoalMergeDetails') {
-        return this.$message.error('当前标签不是年销售目标合并明细')
-      }
-      let query = JSON.parse(JSON.stringify(this.form))
-      query.annualGoalMergeDetailsList = []
-      console.log(query);
-      if (query.goalCategory === null || query.goalCategory === '') {
-        return this.$message.error('请输入目标分类')
-      } else if (query.goalCategory === '销售区域') {
-        if (query.saleZone === null) {
-          return this.$message.error('请输入销售区域')
+        // 根据某三个属性进行合并并相加totalGoal的函数
+        const mergeAndSumTotalGoal = (array) => {
+          return Array.from(array.reduce((map, obj) => {
+            let key = null
+            if (this.activeName === 'zoneGoalSum(year)') {
+              key = `${obj.saleOrg}-${obj.saleZone}-${obj.creator}`
+            } else if (this.activeName === 'customerGoalSum(year)') {
+              key = `${obj.saleOrg}-${obj.saleZone}-${obj.custom}`
+            }
+            console.log(key);
+            if (map.has(key)) {
+              const existingObj = map.get(key)
+              existingObj.totalGoal += obj.totalGoal
+              existingObj.januaryGoal += obj.januaryGoal
+              existingObj.februaryGoal += obj.februaryGoal
+              existingObj.marchGoal += obj.marchGoal
+              existingObj.aprilGoal += obj.aprilGoal
+              existingObj.mayGoal += obj.mayGoal
+              existingObj.juneGoal += obj.juneGoal
+              existingObj.julyGoal += obj.julyGoal
+              existingObj.augustGoal += obj.augustGoal
+              existingObj.septemberGoal += obj.septemberGoal
+              existingObj.octoberGoal += obj.octoberGoal
+              existingObj.novemberGoal += obj.novemberGoal
+              existingObj.decemberGoal += obj.decemberGoal
+            } else {
+              map.set(key, {
+                ...obj
+              })
+            }
+            return map
+          }, new Map()).values())
         }
-      } else if (query.goalCategory === '一级分类') {
-        if (query.oneLevelClassify === null) {
-          return this.$message.error('请输入一级分类')
+        // 调用合并函数
+        const mergedArray = mergeAndSumTotalGoal(arr)
+        if (this.activeName === 'zoneGoalSum(year)') {
+          this.areaDetailList = mergedArray
+        } else if (this.activeName === 'customerGoalSum(year)') {
+          this.customerDetailList = mergedArray
         }
-      } else if (query.goalCategory === '二级分类') {
-        if (query.twoLevelClassify === null) {
-          return this.$message.error('请输入二级分类')
+      },
+      setBeginAndEnd() {
+        let array = this.documentDateRange
+        if (array !== null) {
+          this.queryParams.params.beginTime = array[0]
+          this.queryParams.params.endTime = array[1]
+        } else {
+          this.queryParams.params.beginTime = null
+          this.queryParams.params.endTime = null
         }
-      }
-      mergeAnnualSaleMergeDetails(query).then(response => {
+      },
+      handleCommand(command) {
+        // 执行对应的功能
+        if (command === 'export') {
+          console.log('导出主表');
+          this.handleExport()
+        } else if (command === 'exportDetails') {
+          console.log('导出明细');
+          this.handleExportDetails()
+        } else if (command === 'exportZoneSum') {
+          console.log('导出区域目标汇总')
+          this.handleExportZoneSum()
+        } else if (command === 'exportCustomSum') {
+          console.log('导出客户目标汇总')
+          this.handleExportCustomSum()
+        }
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.open = true;
+        this.upload.title = "年销售目标合并导入";
+        this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/annualSaleGoalMerge/importData"
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        this.download('goal_management/annualSaleGoalMerge/importTemplate', {},
+          `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
         console.log(response);
-        if (response.data.consolidatedDetail.length > 0) {
-          for (const consolidatedDetail of response.data.consolidatedDetail) {
-            consolidatedDetail.totalGoal = consolidatedDetail.totalGoal.toFixed(2)
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response
+          .msg + "</div>", "导入结果", {
+            dangerouslyUseHTMLString: true
+          });
+        this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      //提交
+      async handleSubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await submit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
           }
-          this.annualSaleGoalMergeDetailsList = response.data.consolidatedDetail
-          this.computeTotal()
-        } else {
-          return this.$message.warning('未查到相关数据')
+        } catch (err) {
+          console.error(err);
+          this.$modal.closeLoading();
         }
-      })
-    },
-    // 获得区域目标汇总or客户目标汇总
-    getNewTwoArray() {
-      let arr = JSON.parse(JSON.stringify(this.annualSaleGoalMergeDetailsList))
-      // 如果子表标签是annualSaleGoalMergeDetails 或者 主表的目标分类是“销售区域”
-      if (this.activeName === 'annualSaleGoalMergeDetails') {
-        this.areaDetailList = null
-        this.customerDetailList = null
-        return
-      }
-      // 根据某三个属性进行合并并相加totalGoal的函数
-      const mergeAndSumTotalGoal = (array) => {
-        return Array.from(array.reduce((map, obj) => {
-          let key = null
-          if (this.activeName === 'zoneGoalSum(year)') {
-            key = `${obj.saleOrg}-${obj.saleZone}-${obj.creator}`
-          } else if (this.activeName === 'customerGoalSum(year)') {
-            key = `${obj.saleOrg}-${obj.saleZone}-${obj.custom}`
-          }
-          console.log(key);
-          if (map.has(key)) {
-            const existingObj = map.get(key)
-            existingObj.totalGoal += obj.totalGoal
-            existingObj.januaryGoal += obj.januaryGoal
-            existingObj.februaryGoal += obj.februaryGoal
-            existingObj.marchGoal += obj.marchGoal
-            existingObj.aprilGoal += obj.aprilGoal
-            existingObj.mayGoal += obj.mayGoal
-            existingObj.juneGoal += obj.juneGoal
-            existingObj.julyGoal += obj.julyGoal
-            existingObj.augustGoal += obj.augustGoal
-            existingObj.septemberGoal += obj.septemberGoal
-            existingObj.octoberGoal += obj.octoberGoal
-            existingObj.novemberGoal += obj.novemberGoal
-            existingObj.decemberGoal += obj.decemberGoal
-          } else {
-            map.set(key, { ...obj })
+      },
+      //收回
+      handleReback(row) {
+        this.$modal.loading("收回中...");
+        let params = {
+          billCode: row.code,
+          fdId: row.flowId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "销售目标"
+          }).value,
+          billMaker: row.createBy,
+          type: "2"
+        }
+        rollBack(params).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("收回成功");
+            this.$modal.closeLoading();
+            this.getList(this.queryParams)
           }
-          return map
-        }, new Map()).values())
-      }
-      // 调用合并函数
-      const mergedArray = mergeAndSumTotalGoal(arr)
-      if (this.activeName === 'zoneGoalSum(year)') {
-        this.areaDetailList = mergedArray
-      } else if (this.activeName === 'customerGoalSum(year)') {
-        this.customerDetailList = mergedArray
-      }
-    },
-    setBeginAndEnd() {
-      let array = this.documentDateRange
-      if (array !== null) {
-        this.queryParams.params.beginTime = array[0]
-        this.queryParams.params.endTime = array[1]
-      } else {
-        this.queryParams.params.beginTime = null
-        this.queryParams.params.endTime = null
-      }
-    },
-    handleCommand(command) {
-      // 执行对应的功能
-      if (command === 'export') {
-        console.log('导出主表');
-        this.handleExport()
-      } else if (command === 'exportDetails') {
-        console.log('导出明细');
-        this.handleExportDetails()
-      } else if (command === 'exportZoneSum') {
-        console.log('导出区域目标汇总')
-        this.handleExportZoneSum()
-      } else if (command === 'exportCustomSum') {
-        console.log('导出客户目标汇总')
-        this.handleExportCustomSum()
-      }
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.open = true;
-      this.upload.title = "年销售目标合并导入";
-      this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/annualSaleGoalMerge/importData"
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('goal_management/annualSaleGoalMerge/importTemplate', {
-      }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      console.log(response);
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    //提交
-    async handleSubmit(row){
-      this.$modal.loading("提交中...");
-      try {
-        const {msg, code} = await submit(row.id);
-        if (code === 200) {
-          this.$modal.notifySuccess("提交成功");
+        }).catch(err => {
           this.$modal.closeLoading();
-          row.status = '1'
-          // this.getList(this.queryParams)
-        }
-      }catch (err) {
-        console.error(err);
-        this.$modal.closeLoading();
-      }
-    },
-    //收回
-    handleReback(){
+        })
+      },
+    }
+  };
 
-    },
-  }
-};
 </script>

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

@@ -4,27 +4,20 @@
       <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-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-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 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>
@@ -33,7 +26,8 @@
             <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
-              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle @click="showSearch = !showSearch"></el-button>
+              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle
+                @click="showSearch = !showSearch"></el-button>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -43,43 +37,29 @@
       <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 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 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 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 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>
@@ -87,59 +67,43 @@
       <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-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 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="请输入销售区域">
+              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">
+              @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">
+              @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-col :span="6">
           <el-form-item label="单据状态" prop="status">
-            <el-select
-              size="mini"
-              v-model="queryParams.status"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+            <el-select size="mini" v-model="queryParams.status" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -148,13 +112,7 @@
 
     <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -170,101 +128,71 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column label="编码" align="center" prop="code"/>
-      <el-table-column label="目标名称" align="center" prop="goalName"/>
+    <el-table v-loading="loading" :data="monthGoalMergeList" @selection-change="handleSelectionChange"
+      v-horizontal-scroll>
+      <el-table-column label="编码" align="center" prop="code" />
+      <el-table-column label="目标名称" align="center" prop="goalName" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="年度" align="center" prop="annual"/>
-      <el-table-column label="月份" align="center" prop="monthly"/>
-      <el-table-column label="客户" align="center" prop="custom"/>
-      <el-table-column label="制单人" align="center" prop="creator"/>
-      <el-table-column label="部门" align="center" prop="dept"/>
-      <el-table-column label="目标类型" align="center" prop="goalCategory"/>
-      <el-table-column label="目标值合计" align="center" prop="goalSum"/>
+      <el-table-column label="年度" align="center" prop="annual" />
+      <el-table-column label="月份" align="center" prop="monthly" />
+      <el-table-column label="客户" align="center" prop="custom" />
+      <el-table-column label="制单人" align="center" prop="creator" />
+      <el-table-column label="部门" align="center" prop="dept" />
+      <el-table-column label="目标类型" align="center" prop="goalCategory" />
+      <el-table-column label="目标值合计" align="center" prop="goalSum" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_status"
-            :value="scope.row.status"
-          />
+          <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' || scope.row.status == '3'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
-            >删除
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-            >提交</el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)">提交</el-button>
           </div>
           <div v-if="scope.row.status == '1'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleReback(scope.row)"
-            >收回</el-button>
+            <el-button size="mini" type="text" @click="handleReback(scope.row)">收回</el-button>
           </div>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[10, 20, 50, 100]"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]" @pagination="getList" />
 
     <!-- 添加或修改月销售目标合并抽屉 -->
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
+      v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
-              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled/>
+              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="目标名称" prop="goalName">
-              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled/>
+              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据日期" prop="documentDate">
-              <el-date-picker clearable
-                              v-model="form.documentDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择单据日期">
+              <el-date-picker clearable v-model="form.documentDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择单据日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="年度" prop="annual">
-              <el-date-picker clearable
-                              v-model="form.annual"
-                              type="year"
-                              value-format="yyyy"
-                              placeholder="请输入年度">
+              <el-date-picker clearable v-model="form.annual" type="year" value-format="yyyy" placeholder="请输入年度">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -272,40 +200,29 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="月份" prop="monthly">
-              <el-date-picker clearable
-                              v-model="form.monthly"
-                              type="month"
-                              value-format="yyyy-MM"
-                              placeholder="请输入月份">
+              <el-date-picker clearable v-model="form.monthly" type="month" value-format="yyyy-MM" 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="form.creator" title="制单人" valueKey="name"
-                                    referName="CONTACTS_PARAM"
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="form" placeholder="请输入制单人">
+              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name" referName="CONTACTS_PARAM"
+                :dataMapping="{ creatorCode: 'code', creator: 'name'}" :source.sync="form" 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="form.dept" title="部门" valueKey="name"
-                                    referName="DEPT_PARAM"
-                                    :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                    :source.sync="form" placeholder="请输入部门">
+              <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+                :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="目标类型" prop="goalCategory">
-              <el-select v-model="form.goalCategory" placeholder="请输入目标类型" @change="changeGoalCategoryForm" @keyup.enter.native="handleQuery">
-                <el-option
-                  v-for="item in goalCategoryList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+              <el-select v-model="form.goalCategory" placeholder="请输入目标类型" @change="changeGoalCategoryForm"
+                @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>
@@ -314,35 +231,29 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="目标值合计" prop="goalSum">
-              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled/>
+              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <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="{custom: 'name'}"
-                                    :source.sync="form" placeholder="请输入客户">
+              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name" referName="CUSTOMER_PARAM"
+                :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.saleZone" title="销售区域" valueKey="name"
-                                    referName="MK_SALESAREA_PARAM"
-                                    :dataMapping="{saleZone: 'name'}"
-                                    :source.sync="form" placeholder="请输入销售区域">
+              <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>
             <el-form-item v-if="form.goalCategory === '一级分类'" label="一级分类" prop="oneLevelClassify">
               <el-select v-model="form.oneLevelClassify" size="mini" clearable
-                         @focus="chooseTreeReferForMain('MATERIALCLASSIFY_PARAM', false, '一级物料分类')"
-                         style="width: 200px">
+                @focus="chooseTreeReferForMain('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="form.goalCategory === '二级分类'" label="二级分类" prop="custom">
               <el-select v-model="form.twoLevelClassify" size="mini" clearable
-                         @focus="chooseTreeReferForMain('MATERIALCLASSIFY_PARAM', false, '二级物料分类')"
-                         style="width: 200px">
+                @focus="chooseTreeReferForMain('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>
@@ -350,12 +261,8 @@
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>
-                <el-option
-                  v-for="dict in dict.type.sys_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -370,63 +277,64 @@
         </el-row>
         <el-tabs v-model="activeName" @tab-click="getNewTwoArray">
           <el-tab-pane label="月销售目标合并明细" name="monthGoalMergeDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="monthGoalMergeDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" 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 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 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 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 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 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>
+                  <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>
+                    @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>
@@ -434,30 +342,32 @@
               <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>
+                    @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 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 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="goalValue" 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>
+                  <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>
@@ -468,30 +378,30 @@
               <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="请输入销售组织">
+                    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="请输入销售区域">
+                    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 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="goalValue" 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>
+                  <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>
@@ -502,39 +412,38 @@
               <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="请输入销售组织">
+                    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="请输入销售区域">
+                    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="请输入客户">
+                    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 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="goalValue" 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>
+                  <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>
@@ -549,18 +458,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -568,7 +468,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer">
@@ -577,808 +478,910 @@
       </div>
     </el-dialog>
 
-    <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true"/>
-    <TreeRefers ref="treeMain" @doSubmit="selectionsToInputForMain" :single="true"/>
-    <TreeRefers ref="treeDetails" @doSubmit="selectionsToInputForDetails" :single="true"/>
+    <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true" />
+    <TreeRefers ref="treeMain" @doSubmit="selectionsToInputForMain" :single="true" />
+    <TreeRefers ref="treeDetails" @doSubmit="selectionsToInputForDetails" :single="true" />
   </div>
 </template>
 
 <script>
-import {
-  listMonthGoalMerge,
-  getMonthGoalMerge,
-  delMonthGoalMerge,
-  addMonthGoalMerge,
-  updateMonthGoalMerge,
-  submit
-} from "@/api/business/spd/goal_management/monthGoalMerge";
-import {
-  getMonthGoalMergeDetails,
-  delMonthGoalMergeDetails,
-  mergeMonthSaleMergeDetails
-} from "@/api/business/spd/goal_management/monthGoalMergeDetails"
-import { getToken } from "@/utils/auth";
-import { getSummary } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    listMonthGoalMerge,
+    getMonthGoalMerge,
+    delMonthGoalMerge,
+    addMonthGoalMerge,
+    updateMonthGoalMerge,
+    submit
+  } from "@/api/business/spd/goal_management/monthGoalMerge";
+  import {
+    getMonthGoalMergeDetails,
+    delMonthGoalMergeDetails,
+    mergeMonthSaleMergeDetails
+  } from "@/api/business/spd/goal_management/monthGoalMergeDetails"
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    getSummary
+  } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    rollBack
+  } from "@/api/business/spd/goal_management/publicInterface";
 
-// 树形参照
-import TreeRefers from '@/components/Refers/treeRefer.vue'
-import ElPopoverSelectV2 from "@/components/popover-select-v2"
+  // 树形参照
+  import TreeRefers from '@/components/Refers/treeRefer.vue'
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
 
-export default {
-  name: "MonthGoalMerge",
-  components: {
-    TreeRefers, ElPopoverSelectV2
-  },
-  dicts: ["sys_status"],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 月销售目标合并表格数据
-      monthGoalMergeList: [],
-      monthGoalMergeDetailsList: [],
-      zoneGoalSumList: [],
-      customGoalSumList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        params: { beginTime: null, endTime: null }
-      },
-      documentDateRange: null,
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
+  export default {
+    name: "MonthGoalMerge",
+    components: {
+      TreeRefers,
+      ElPopoverSelectV2
+    },
+    dicts: ["sys_status", "oa_templete_id"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: false,
+        // 总条数
+        total: 0,
+        // 月销售目标合并表格数据
+        monthGoalMergeList: [],
+        monthGoalMergeDetailsList: [],
+        zoneGoalSumList: [],
+        customGoalSumList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          params: {
+            beginTime: null,
+            endTime: null
           }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
+        },
+        documentDateRange: null,
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        // 表单参数
+        form: {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          monthMergeDetailsList: null,
+          oldMonthMergeDetailsList: null
+        },
+        formDetails: {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          dept: null,
+          creator: null,
+          department: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          materialCode: null,
+          material: null,
+          monthly: null,
+          goalValue: null
+        },
+        // 表单校验
+        rules: {
+          documentDate: [{
+            required: true,
+            message: '单据日期不能为空',
+            trigger: 'blur'
+          }],
+          annual: [{
+            required: true,
+            message: '年度不能为空',
+            trigger: 'blur'
+          }],
+          monthly: [{
+            required: true,
+            message: '月份不能为空',
+            trigger: 'blur'
+          }],
+          creator: [{
+            required: true,
+            message: '制单人不能为空',
+            trigger: 'blur'
+          }],
+          dept: [{
+            required: true,
+            message: '部门不能为空',
+            trigger: 'blur'
+          }],
+          goalCategory: [{
+            required: true,
+            message: '目标类型不能为空',
+            trigger: 'blur'
+          }],
+          custom: [],
+          saleZone: [],
+          oneLevelClassify: [],
+          twoLevelClassify: []
+        },
+        // 目标类型列表
+        goalCategoryList: [{
+            value: '客户维度',
+            label: '客户维度'
+          },
+          {
+            value: '销售区域',
+            label: '销售区域'
+          },
+          {
+            value: '一级分类',
+            label: '一级分类'
+          },
+          {
+            value: '二级分类',
+            label: '二级分类'
           }
-        }]
-      },
-      // 表单参数
-      form: {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        monthMergeDetailsList: null,
-        oldMonthMergeDetailsList: null
-      },
-      formDetails: {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        dept: null,
-        creator: null,
-        department: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        monthly: null,
-        goalValue: null
-      },
-      // 表单校验
-      rules: {
-        documentDate: [{ required: true, message: '单据日期不能为空', trigger: 'blur' }],
-        annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
-        monthly: [{ required: true, message: '月份不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
-        dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
-        goalCategory: [{ required: true, message: '目标类型不能为空', trigger: 'blur' }],
-        custom: [],
-        saleZone: [],
-        oneLevelClassify: [],
-        twoLevelClassify: []
-      },
-      // 目标类型列表
-      goalCategoryList: [
-        { value: '客户维度', label: '客户维度' },
-        { value: '销售区域', label: '销售区域' },
-        { value: '一级分类', label: '一级分类' },
-        { value: '二级分类', label: '二级分类' }
-      ],
-      // 树形参照
-      referCondition: { type: '', isPage: true, title: '', index: null },
-      classOptions: [],
-      activeName: 'monthGoalMergeDetails',
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询月销售目标合并列表 */
-    getList() {
-      this.loading = true;
-      listMonthGoalMerge(this.queryParams).then(response => {
-        this.monthGoalMergeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    getListDetails() {
-      this.loading = true;
-      getMonthGoalMergeDetails(this.form.id).then(response => {
-        this.monthGoalMergeDetailsList = response.data;
-        this.computeTotal()
-        this.form.monthMergeDetailsList = this.monthGoalMergeDetailsList
-        updateMonthGoalMerge(this.form).then(response => {})
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        monthMergeDetailsList: null,
-        oldMonthMergeDetailsList: null
+        ],
+        // 树形参照
+        referCondition: {
+          type: '',
+          isPage: true,
+          title: '',
+          index: null
+        },
+        classOptions: [],
+        activeName: 'monthGoalMergeDetails',
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        saleZoneCode: null,
-        saleZone: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        params: { beginTime: null, endTime: null }
-      }
-      this.documentDateRange = null
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.monthGoalMergeDetailsList = []
-      this.customGoalSumList = []
-      this.zoneGoalSumList = []
-      this.activeName = 'monthGoalMergeDetails'
-      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 = {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        dept: null,
-        creator: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        department: null,
-        num: null,
-        monthly: null,
-        goalValue: null
-      }
-      this.monthGoalMergeDetailsList.push(list)
-    },
-    /** 修改按钮操作 */
-    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.form.goalSum = this.form.goalSum.toFixed(2)
-        this.monthGoalMergeDetailsList = this.form.monthMergeDetailsList
+    methods: {
+      /** 查询月销售目标合并列表 */
+      getList() {
+        this.loading = true;
+        listMonthGoalMerge(this.queryParams).then(response => {
+          this.monthGoalMergeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      getListDetails() {
+        this.loading = true;
+        getMonthGoalMergeDetails(this.form.id).then(response => {
+          this.monthGoalMergeDetailsList = response.data;
+          this.computeTotal()
+          this.form.monthMergeDetailsList = this.monthGoalMergeDetailsList
+          updateMonthGoalMerge(this.form).then(response => {})
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          monthMergeDetailsList: null,
+          oldMonthMergeDetailsList: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          saleZoneCode: null,
+          saleZone: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          params: {
+            beginTime: null,
+            endTime: null
+          }
+        }
+        this.documentDateRange = null
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.monthGoalMergeDetailsList = []
+        this.customGoalSumList = []
+        this.zoneGoalSumList = []
+        this.activeName = 'monthGoalMergeDetails'
         this.open = true;
-        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.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.goalSum = 0
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        this.open = true
-        this.changeGoalCategoryForm()
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== null) {
-            this.form.monthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
-            console.log(this.form);
-            updateMonthGoalMerge(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.status = '0'
-            this.form.monthMergeDetailsList = this.monthGoalMergeDetailsList
-            console.log(this.form);
-            addMonthGoalMerge(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+        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 = {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          dept: null,
+          creator: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          materialCode: null,
+          material: null,
+          department: null,
+          num: null,
+          monthly: null,
+          goalValue: null
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标合并单据编号为"' + row.code + '"的数据项？').then(function () {
-        return delMonthGoalMerge(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    handleDeleteDetails(index, row) {
-      if (this.form.id === null) {
-        this.monthGoalMergeDetailsList.splice(index, 1)
-        this.computeTotal()
-      } else {
-        if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标合并明细序号为"' + (index + 1) + '"的数据项？').then(function () {
-            return delMonthGoalMergeDetails(row.id);
-          }).then(() => {
-            this.getListDetails();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {
-          });
-        } else {
+        this.monthGoalMergeDetailsList.push(list)
+      },
+      /** 修改按钮操作 */
+      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.form.goalSum = this.form.goalSum.toFixed(2)
+          this.monthGoalMergeDetailsList = this.form.monthMergeDetailsList
+          this.open = true;
+          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.form.goalSum = 0
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          this.open = true
+          this.changeGoalCategoryForm()
+        })
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id !== null) {
+              this.form.monthMergeDetailsList = JSON.parse(JSON.stringify(this.monthGoalMergeDetailsList))
+              console.log(this.form);
+              updateMonthGoalMerge(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.form.status = '0'
+              this.form.monthMergeDetailsList = this.monthGoalMergeDetailsList
+              console.log(this.form);
+              addMonthGoalMerge(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除月销售目标合并单据编号为"' + row.code + '"的数据项？').then(function () {
+          return delMonthGoalMerge(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      handleDeleteDetails(index, row) {
+        if (this.form.id === null) {
           this.monthGoalMergeDetailsList.splice(index, 1)
-          this.$message.success('删除成功')
           this.computeTotal()
+        } else {
+          if (row.id !== null) {
+            this.$modal.confirm('是否确认删除月销售目标合并明细序号为"' + (index + 1) + '"的数据项？').then(function () {
+              return delMonthGoalMergeDetails(row.id);
+            }).then(() => {
+              this.getListDetails();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          } else {
+            this.monthGoalMergeDetailsList.splice(index, 1)
+            this.$message.success('删除成功')
+            this.computeTotal()
+          }
         }
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('goal_management/monthGoalMerge/export', {
-        ...this.queryParams
-      }, `monthGoalMerge${new Date().getTime()}.xlsx`)
-    },
-    handleExportDetails() {
-      this.download('goal_management/monthGoalMergeDetails/export', {
-        ...this.queryParams
-      }, `monthSaleMergeDetails_${new Date().getTime()}.xlsx`)
-    },
-    // 树形参照
-    chooseTreeReferForQuery(type, isPage, title) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.$refs.treeQuery.init(this.referCondition)
-    },
-    chooseTreeReferForMain(type, isPage, title) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.$refs.treeMain.init(this.referCondition)
-    },
-    chooseTreeReferForDetails(type, isPage, title, index) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.referCondition.index = index
-      this.$refs.treeDetails.init(this.referCondition)
-    },
-    selectionsToInputForQuery(selection) {
-      this.classOptions.push(selection)
-      if (this.referCondition.title === '一级物料分类') {
-        if (selection.code.length !== 1) {
-          return this.$message.info('请在一级分类下选择')
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('goal_management/monthGoalMerge/export', {
+          ...this.queryParams
+        }, `monthGoalMerge${new Date().getTime()}.xlsx`)
+      },
+      handleExportDetails() {
+        this.download('goal_management/monthGoalMergeDetails/export', {
+          ...this.queryParams
+        }, `monthSaleMergeDetails_${new Date().getTime()}.xlsx`)
+      },
+      // 树形参照
+      chooseTreeReferForQuery(type, isPage, title) {
+        this.referCondition.type = type
+        this.referCondition.isPage = isPage
+        this.referCondition.title = title
+        this.$refs.treeQuery.init(this.referCondition)
+      },
+      chooseTreeReferForMain(type, isPage, title) {
+        this.referCondition.type = type
+        this.referCondition.isPage = isPage
+        this.referCondition.title = title
+        this.$refs.treeMain.init(this.referCondition)
+      },
+      chooseTreeReferForDetails(type, isPage, title, index) {
+        this.referCondition.type = type
+        this.referCondition.isPage = isPage
+        this.referCondition.title = title
+        this.referCondition.index = index
+        this.$refs.treeDetails.init(this.referCondition)
+      },
+      selectionsToInputForQuery(selection) {
+        this.classOptions.push(selection)
+        if (this.referCondition.title === '一级物料分类') {
+          if (selection.code.length !== 1) {
+            return this.$message.info('请在一级分类下选择')
+          }
+          this.queryParams.oneLevelClassifyCode = selection.code
+          this.queryParams.oneLevelClassify = selection.name
+        } else if (this.referCondition.title === '二级物料分类') {
+          if (selection.code.length !== 4) {
+            return this.$message.info('请在二级分类下选择')
+          }
+          this.queryParams.twoLevelClassifyCode = selection.code
+          this.queryParams.twoLevelClassify = selection.name
         }
-        this.queryParams.oneLevelClassifyCode = selection.code
-        this.queryParams.oneLevelClassify = selection.name
-      } else if (this.referCondition.title === '二级物料分类') {
-        if (selection.code.length !== 4) {
-          return this.$message.info('请在二级分类下选择')
+      },
+      selectionsToInputForMain(selection) {
+        this.classOptions.push(selection)
+        if (this.referCondition.title === '一级物料分类') {
+          if (selection.code.length !== 1) {
+            return this.$message.info('请在一级分类下选择')
+          }
+          this.form.oneLevelClassifyCode = selection.code
+          this.form.oneLevelClassify = selection.name
+        } else if (this.referCondition.title === '二级物料分类') {
+          if (selection.code.length !== 4) {
+            return this.$message.info('请在二级分类下选择')
+          }
+          this.form.twoLevelClassifyCode = selection.code
+          this.form.twoLevelClassify = selection.name
         }
-        this.queryParams.twoLevelClassifyCode = selection.code
-        this.queryParams.twoLevelClassify = selection.name
-      }
-    },
-    selectionsToInputForMain(selection) {
-      this.classOptions.push(selection)
-      if (this.referCondition.title === '一级物料分类') {
-        if (selection.code.length !== 1) {
-          return this.$message.info('请在一级分类下选择')
+      },
+      selectionsToInputForDetails(selection) {
+        this.classOptions.push(selection)
+        if (this.referCondition.title === '一级物料分类') {
+          if (selection.code.length !== 1) {
+            return this.$message.info('请在一级分类中选择')
+          }
+          if (selection.code !== this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode) {
+            this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = null
+            this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = null
+          }
+          this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode = selection.code
+          this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassify = selection.name
+        } else if (this.referCondition.title === '二级物料分类') {
+          if (selection.code.length !== 4) {
+            return this.$message.info('请在二级分类中选择')
+          } else if (selection.code[0] !== this.monthGoalMergeDetailsList[this.referCondition.index]
+            .oneLevelClassifyCode) {
+            return this.$message.error('所选择的二级物料分类不属于一级分类')
+          }
+          this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = selection.code
+          this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = selection.name
         }
-        this.form.oneLevelClassifyCode = selection.code
-        this.form.oneLevelClassify = selection.name
-      } else if (this.referCondition.title === '二级物料分类') {
-        if (selection.code.length !== 4) {
-          return this.$message.info('请在二级分类下选择')
+      },
+      // 改变查询表单的目标分类
+      changeGoalCategoryQuery() {
+        let condition = this.queryParams.goalCategory
+        if (condition === null) {
+          this.queryParams.custom = null
+          this.queryParams.customCode = null
+          this.queryParams.saleZone = null
+          this.queryParams.saleZoneCode = null
+          this.queryParams.oneLevelClassify = null
+          this.queryParams.oneLevelClassifyCode = null
+          this.queryParams.twoLevelClassify = null
+          this.queryParams.twoLevelClassifyCode = null
+        } else if (condition === '客户维度') {
+          this.queryParams.saleZone = null
+          this.queryParams.saleZoneCode = null
+          this.queryParams.oneLevelClassify = null
+          this.queryParams.oneLevelClassifyCode = null
+          this.queryParams.twoLevelClassify = null
+          this.queryParams.twoLevelClassifyCode = null
+        } else if (condition === '销售区域') {
+          this.queryParams.custom = null
+          this.queryParams.customCode = null
+          this.queryParams.oneLevelClassify = null
+          this.queryParams.oneLevelClassifyCode = null
+          this.queryParams.twoLevelClassify = null
+          this.queryParams.twoLevelClassifyCode = null
+        } else if (condition === '一级分类') {
+          this.queryParams.custom = null
+          this.queryParams.customCode = null
+          this.queryParams.saleZone = null
+          this.queryParams.saleZoneCode = null
+          this.queryParams.twoLevelClassify = null
+          this.queryParams.twoLevelClassifyCode = null
+        } else if (condition === '二级分类') {
+          this.queryParams.custom = null
+          this.queryParams.customCode = null
+          this.queryParams.saleZone = null
+          this.queryParams.saleZoneCode = null
+          this.queryParams.oneLevelClassify = null
+          this.queryParams.oneLevelClassifyCode = null
         }
-        this.form.twoLevelClassifyCode = selection.code
-        this.form.twoLevelClassify = selection.name
-      }
-    },
-    selectionsToInputForDetails(selection) {
-      this.classOptions.push(selection)
-      if (this.referCondition.title === '一级物料分类') {
-        if (selection.code.length !== 1) {
-          return this.$message.info('请在一级分类中选择')
+      },
+      changeGoalCategoryForm() {
+        let condition = this.form.goalCategory
+        if (condition === null) {
+          this.form.custom = null
+          this.form.customCode = null
+          this.form.saleZone = null
+          this.form.saleZoneCode = null
+          this.form.oneLevelClassify = null
+          this.form.oneLevelClassifyCode = null
+          this.form.twoLevelClassify = null
+          this.form.twoLevelClassifyCode = null
+          this.rules.custom = []
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = []
+        } else if (condition === '客户维度') {
+          this.form.saleZone = null
+          this.form.saleZoneCode = null
+          this.form.oneLevelClassify = null
+          this.form.oneLevelClassifyCode = null
+          this.form.twoLevelClassify = null
+          this.form.twoLevelClassifyCode = null
+          this.rules.custom = [{
+            required: true,
+            message: '客户不能为空',
+            trigger: 'blur'
+          }]
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = []
+        } else if (condition === '销售区域') {
+          this.form.custom = null
+          this.form.customCode = null
+          this.form.oneLevelClassify = null
+          this.form.oneLevelClassifyCode = null
+          this.form.twoLevelClassify = null
+          this.form.twoLevelClassifyCode = null
+          this.rules.custom = []
+          this.rules.saleZone = [{
+            required: true,
+            message: '销售区域不能为空',
+            trigger: 'blur'
+          }]
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = []
+        } else if (condition === '一级分类') {
+          this.form.custom = null
+          this.form.customCode = null
+          this.form.saleZone = null
+          this.form.saleZoneCode = null
+          this.form.twoLevelClassify = null
+          this.form.twoLevelClassifyCode = null
+          this.rules.custom = []
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = [{
+            required: true,
+            message: '一级分类不能为空',
+            trigger: 'blur'
+          }]
+          this.rules.twoLevelClassify = []
+        } else if (condition === '二级分类') {
+          this.form.custom = null
+          this.form.customCode = null
+          this.form.saleZone = null
+          this.form.saleZoneCode = null
+          this.form.oneLevelClassify = null
+          this.form.oneLevelClassifyCode = null
+          this.rules.custom = []
+          this.rules.saleZone = []
+          this.rules.oneLevelClassify = []
+          this.rules.twoLevelClassify = [{
+            required: true,
+            message: '二级分类不能为空',
+            trigger: 'blur'
+          }]
         }
-        if (selection.code !== this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode) {
-          this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = null
-          this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = null
+      },
+      // 关闭抽屉
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 复制明细
+      handleCopyDetails(row) {
+        let list = {
+          id: null,
+          code: row.code,
+          saleOrg: row.saleOrg,
+          saleZone: row.saleZone,
+          custom: row.custom,
+          dept: row.dept,
+          creator: row.creator,
+          oneLevelClassifyCode: row.oneLevelClassifyCode,
+          oneLevelClassify: row.oneLevelClassify,
+          twoLevelClassifyCode: row.twoLevelClassifyCode,
+          twoLevelClassify: row.twoLevelClassify,
+          materialCode: row.materialCode,
+          material: row.material,
+          department: row.department,
+          num: row.num,
+          monthly: row.monthly,
+          goalValue: row.goalValue
         }
-        this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode = selection.code
-        this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassify = selection.name
-      } else if (this.referCondition.title === '二级物料分类') {
-        if (selection.code.length !== 4) {
-          return this.$message.info('请在二级分类中选择')
-        } else if (selection.code[0] !== this.monthGoalMergeDetailsList[this.referCondition.index].oneLevelClassifyCode) {
-          return this.$message.error('所选择的二级物料分类不属于一级分类')
+        this.monthGoalMergeDetailsList.push(list)
+        this.computeTotal()
+      },
+      // 计算主表合计
+      computeTotal() {
+        let list = this.monthGoalMergeDetailsList
+        let sum = 0
+        for (const listElement of list) {
+          sum = (sum * 1000000 + listElement.goalValue * 1000000) / 1000000
         }
-        this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassifyCode = selection.code
-        this.monthGoalMergeDetailsList[this.referCondition.index].twoLevelClassify = selection.name
-      }
-    },
-    // 改变查询表单的目标分类
-    changeGoalCategoryQuery() {
-      let condition = this.queryParams.goalCategory
-      if (condition === null) {
-        this.queryParams.custom = null
-        this.queryParams.customCode = null
-        this.queryParams.saleZone = null
-        this.queryParams.saleZoneCode = null
-        this.queryParams.oneLevelClassify = null
-        this.queryParams.oneLevelClassifyCode = null
-        this.queryParams.twoLevelClassify = null
-        this.queryParams.twoLevelClassifyCode = null
-      } else if (condition === '客户维度') {
-        this.queryParams.saleZone = null
-        this.queryParams.saleZoneCode = null
-        this.queryParams.oneLevelClassify = null
-        this.queryParams.oneLevelClassifyCode = null
-        this.queryParams.twoLevelClassify = null
-        this.queryParams.twoLevelClassifyCode = null
-      } else if (condition === '销售区域') {
-        this.queryParams.custom = null
-        this.queryParams.customCode = null
-        this.queryParams.oneLevelClassify = null
-        this.queryParams.oneLevelClassifyCode = null
-        this.queryParams.twoLevelClassify = null
-        this.queryParams.twoLevelClassifyCode = null
-      } else if (condition === '一级分类') {
-        this.queryParams.custom = null
-        this.queryParams.customCode = null
-        this.queryParams.saleZone = null
-        this.queryParams.saleZoneCode = null
-        this.queryParams.twoLevelClassify = null
-        this.queryParams.twoLevelClassifyCode = null
-      } else if (condition === '二级分类') {
-        this.queryParams.custom = null
-        this.queryParams.customCode = null
-        this.queryParams.saleZone = null
-        this.queryParams.saleZoneCode = null
-        this.queryParams.oneLevelClassify = null
-        this.queryParams.oneLevelClassifyCode = null
-      }
-    },
-    changeGoalCategoryForm() {
-      let condition = this.form.goalCategory
-      if (condition === null) {
-        this.form.custom = null
-        this.form.customCode = null
-        this.form.saleZone = null
-        this.form.saleZoneCode = null
-        this.form.oneLevelClassify = null
-        this.form.oneLevelClassifyCode = null
-        this.form.twoLevelClassify = null
-        this.form.twoLevelClassifyCode = null
-        this.rules.custom = []
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = []
-      } else if (condition === '客户维度') {
-        this.form.saleZone = null
-        this.form.saleZoneCode = null
-        this.form.oneLevelClassify = null
-        this.form.oneLevelClassifyCode = null
-        this.form.twoLevelClassify = null
-        this.form.twoLevelClassifyCode = null
-        this.rules.custom = [{ required: true, message: '客户不能为空', trigger: 'blur' }]
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = []
-      } else if (condition === '销售区域') {
-        this.form.custom = null
-        this.form.customCode = null
-        this.form.oneLevelClassify = null
-        this.form.oneLevelClassifyCode = null
-        this.form.twoLevelClassify = null
-        this.form.twoLevelClassifyCode = null
-        this.rules.custom = []
-        this.rules.saleZone = [{ required: true, message: '销售区域不能为空', trigger: 'blur' }]
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = []
-      } else if (condition === '一级分类') {
-        this.form.custom = null
-        this.form.customCode = null
-        this.form.saleZone = null
-        this.form.saleZoneCode = null
-        this.form.twoLevelClassify = null
-        this.form.twoLevelClassifyCode = null
-        this.rules.custom = []
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = [{ required: true, message: '一级分类不能为空', trigger: 'blur' }]
-        this.rules.twoLevelClassify = []
-      } else if (condition === '二级分类') {
-        this.form.custom = null
-        this.form.customCode = null
-        this.form.saleZone = null
-        this.form.saleZoneCode = null
-        this.form.oneLevelClassify = null
-        this.form.oneLevelClassifyCode = null
-        this.rules.custom = []
-        this.rules.saleZone = []
-        this.rules.oneLevelClassify = []
-        this.rules.twoLevelClassify = [{ required: true, message: '二级分类不能为空', trigger: 'blur' }]
-      }
-    },
-    // 关闭抽屉
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
+        this.form.goalSum = sum.toFixed(2)
+      },
+      getSummaries(param) {
+        return getSummary(param)
+      },
+      // 合并数据
+      clickMerge() {
+        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))
+        query.monthGoalMergeDetailsList = []
+        if (query.goalCategory === null || query.goalCategory === '') {
+          return this.$message.error('请输入目标分类')
+        } else if (query.goalCategory === '销售区域') {
+          if (query.saleZone === null) {
+            return this.$message.error('请输入销售区域')
+          }
+        } else if (query.goalCategory === '一级分类') {
+          if (query.oneLevelClassify === null) {
+            return this.$message.error('请输入一级分类')
+          }
+        } else if (query.goalCategory === '二级分类') {
+          if (query.twoLevelClassify === null) {
+            return this.$message.error('请输入二级分类')
+          }
+        } else if (query.goalCategory === '客户维度') {
+          if (query.custom === null) {
+            return this.$message.error('请输入客户')
+          }
+        }
+        mergeMonthSaleMergeDetails(query).then(response => {
+          console.log(response);
+          if (response.data.monthGoalMergeDetails.length > 0) {
+            this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
+            this.computeTotal()
+          } else {
+            return this.$message.warning('未查到相关数据')
+          }
         })
-        .catch(_ => {});
-    },
-    // 复制明细
-    handleCopyDetails(row) {
-      let list = {
-        id: null,
-        code: row.code,
-        saleOrg: row.saleOrg,
-        saleZone: row.saleZone,
-        custom: row.custom,
-        dept: row.dept,
-        creator: row.creator,
-        oneLevelClassifyCode: row.oneLevelClassifyCode,
-        oneLevelClassify: row.oneLevelClassify,
-        twoLevelClassifyCode: row.twoLevelClassifyCode,
-        twoLevelClassify: row.twoLevelClassify,
-        materialCode: row.materialCode,
-        material: row.material,
-        department: row.department,
-        num: row.num,
-        monthly: row.monthly,
-        goalValue: row.goalValue
-      }
-      this.monthGoalMergeDetailsList.push(list)
-      this.computeTotal()
-    },
-    // 计算主表合计
-    computeTotal() {
-      let list = this.monthGoalMergeDetailsList
-      let sum = 0
-      for (const listElement of list) {
-        sum = (sum * 1000000 + listElement.goalValue * 1000000) / 1000000
-      }
-      this.form.goalSum = sum.toFixed(2)
-    },
-    getSummaries(param) {
-      return getSummary(param)
-    },
-    // 合并数据
-    clickMerge() {
-      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))
-      query.monthGoalMergeDetailsList = []
-      if (query.goalCategory === null || query.goalCategory === '') {
-        return this.$message.error('请输入目标分类')
-      } else if (query.goalCategory === '销售区域') {
-        if (query.saleZone === null) {
-          return this.$message.error('请输入销售区域')
+      },
+      setBeginAndEnd() {
+        let array = this.documentDateRange
+        if (array !== null) {
+          this.queryParams.params.beginTime = array[0]
+          this.queryParams.params.endTime = array[1]
+        } else {
+          this.queryParams.params.beginTime = null
+          this.queryParams.params.endTime = null
         }
-      } else if (query.goalCategory === '一级分类') {
-        if (query.oneLevelClassify === null) {
-          return this.$message.error('请输入一级分类')
+      },
+      handleCommand(command) {
+        // 执行对应的功能
+        if (command === 'importModel') {
+          // 执行选项1的功能
+          console.log('导入模板');
+        } else if (command === 'import') {
+          // 执行选项2的功能
+          console.log('导入');
+        } else if (command === 'export') {
+          console.log('导出主表');
+          this.handleExport()
+        } else if (command === 'exportDetails') {
+          console.log('导出明细');
+          this.handleExportDetails()
         }
-      } else if (query.goalCategory === '二级分类') {
-        if (query.twoLevelClassify === null) {
-          return this.$message.error('请输入二级分类')
+      },
+      // 获得区域目标汇总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
         }
-      } else if (query.goalCategory === '客户维度') {
-        if (query.custom === null) {
-          return this.$message.error('请输入客户')
+        // 根据某三个属性进行合并并相加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())
         }
-      }
-      mergeMonthSaleMergeDetails(query).then(response => {
-        console.log(response);
-        if (response.data.monthGoalMergeDetails.length > 0) {
-          this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
-          this.computeTotal()
-        } else {
-          return this.$message.warning('未查到相关数据')
+        // 调用合并函数
+        const mergedArray = mergeAndSumTotalGoal(arr)
+        if (this.activeName === 'zoneGoalSum') {
+          this.zoneGoalSumList = mergedArray
+        } else if (this.activeName === 'customGoalSum') {
+          this.customGoalSumList = mergedArray
         }
-      })
-    },
-    setBeginAndEnd() {
-      let array = this.documentDateRange
-      if (array !== null) {
-        this.queryParams.params.beginTime = array[0]
-        this.queryParams.params.endTime = array[1]
-      } else {
-        this.queryParams.params.beginTime = null
-        this.queryParams.params.endTime = null
-      }
-    },
-    handleCommand(command) {
-      // 执行对应的功能
-      if (command === 'importModel') {
-        // 执行选项1的功能
-        console.log('导入模板');
-      } else if (command === 'import') {
-        // 执行选项2的功能
-        console.log('导入');
-      } else if (command === 'export') {
-        console.log('导出主表');
-        this.handleExport()
-      } else if (command === 'exportDetails') {
-        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 })
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.open = true;
+        this.upload.title = "月销售目标合并导入";
+        this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthGoalMerge/importData"
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        this.download('goal_management/monthGoalMerge/importTemplate', {},
+          `monthGoalMerge_${new Date().getTime()}.xlsx`)
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        console.log(response);
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response
+          .msg + "</div>", "导入结果", {
+            dangerouslyUseHTMLString: true
+          });
+        this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      async handleSubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await submit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
           }
-          return map
-        }, new Map()).values())
-      }
-      // 调用合并函数
-      const mergedArray = mergeAndSumTotalGoal(arr)
-      if (this.activeName === 'zoneGoalSum') {
-        this.zoneGoalSumList = mergedArray
-      } else if (this.activeName === 'customGoalSum') {
-        this.customGoalSumList = mergedArray
-      }
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.open = true;
-      this.upload.title = "月销售目标合并导入";
-      this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthGoalMerge/importData"
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('goal_management/monthGoalMerge/importTemplate', {
-      }, `monthGoalMerge_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      console.log(response);
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    async handleSubmit(row){
-      this.$modal.loading("提交中...");
-      try {
-        const {msg, code} = await submit(row.id);
-        if (code === 200) {
-          this.$modal.notifySuccess("提交成功");
+        } catch (err) {
+          console.error(err);
           this.$modal.closeLoading();
-          row.status = '1'
-          // this.getList(this.queryParams)
         }
-      }catch (err) {
-        console.error(err);
-        this.$modal.closeLoading();
-      }
-    },
-    //收回
-    handleReback(){
+      },
+      //收回
+      handleReback(row) {
+        this.$modal.loading("收回中...");
+        let params = {
+          billCode: row.code,
+          fdId: row.flowId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "销售目标"
+          }).value,
+          billMaker: row.createBy,
+          type: "4"
+        }
+        rollBack(params).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("收回成功");
+            this.$modal.closeLoading();
+            this.getList(this.queryParams)
+          }
+        }).catch(err => {
+          this.$modal.closeLoading();
+        })
+      },
+    }
+  };
 
-    },
-  }
-};
 </script>

src/views/business/spd/target/MonthReturnGoal.vue

@@ -4,35 +4,19 @@
       <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-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-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="结束日期"
+            <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>
@@ -42,7 +26,8 @@
             <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
-              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle @click="showSearch = !showSearch"></el-button>
+              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle
+                @click="showSearch = !showSearch"></el-button>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -52,40 +37,32 @@
       <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
+            <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 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 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">
+              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>
@@ -93,26 +70,17 @@
       <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 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-col :span="6">
           <el-form-item label="单据状态" prop="status">
-            <el-select
-              size="mini"
-              v-model="queryParams.status"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+            <el-select size="mini" v-model="queryParams.status" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -120,13 +88,7 @@
     </el-form>
     <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -141,99 +103,69 @@
         </el-dropdown>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="monthReturnGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column label="编码" align="center" prop="code"/>
-      <el-table-column label="目标名称" align="center" prop="goalName"/>
+    <el-table v-loading="loading" :data="monthReturnGoalList" @selection-change="handleSelectionChange"
+      v-horizontal-scroll>
+      <el-table-column label="编码" align="center" prop="code" />
+      <el-table-column label="目标名称" align="center" prop="goalName" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="年度" align="center" prop="annual"/>
-      <el-table-column label="客户" align="center" prop="custom"/>
-      <el-table-column label="制单人" align="center" prop="creator"/>
-      <el-table-column label="销售区域" align="center" prop="saleZone"/>
-      <el-table-column label="部门" align="center" prop="dept"/>
-      <el-table-column label="目标合计" align="center" prop="goalSum"/>
-      <el-table-column label="备注" align="center" prop="notes"/>
+      <el-table-column label="年度" align="center" prop="annual" />
+      <el-table-column label="客户" align="center" prop="custom" />
+      <el-table-column label="制单人" align="center" prop="creator" />
+      <el-table-column label="销售区域" align="center" prop="saleZone" />
+      <el-table-column label="部门" align="center" prop="dept" />
+      <el-table-column label="目标合计" align="center" prop="goalSum" />
+      <el-table-column label="备注" align="center" prop="notes" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_status"
-            :value="scope.row.status"
-          />
+          <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' || scope.row.status == '3'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
-            >删除
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-            >提交</el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)">提交</el-button>
           </div>
           <div v-if="scope.row.status == '1'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleReback(scope.row)"
-            >收回</el-button>
+            <el-button size="mini" type="text" @click="handleReback(scope.row)">收回</el-button>
           </div>
         </template>
       </el-table-column>
     </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[10, 20, 50, 100]"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]" @pagination="getList" />
 
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
+      v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
-              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled/>
+              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="目标名称" prop="goalName">
-              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled/>
+              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据日期" prop="documentDate">
-              <el-date-picker clearable
-                              v-model="form.documentDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择单据日期">
+              <el-date-picker clearable v-model="form.documentDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择单据日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="年度" prop="annual">
-              <el-date-picker
-                v-model="form.annual"
-                type="year"
-                value-format="yyyy"
-                placeholder="选择年度">
+              <el-date-picker v-model="form.annual" type="year" value-format="yyyy" placeholder="选择年度">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -241,37 +173,29 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="客户" prop="custom">
-              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
-                                    :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                    :source.sync="form" placeholder="请输入客户">
+              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name" referName="CUSTOMER_PARAM"
+                :dataMapping="{ customCode: 'code', custom: 'name'}" :source.sync="form" placeholder="请输入客户">
               </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="form.creator" title="制单人" valueKey="name"
-                                    referName="CONTACTS_PARAM"
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="form" placeholder="请输入制单人">
+              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name" referName="CONTACTS_PARAM"
+                :dataMapping="{ creatorCode: 'code', creator: 'name'}" :source.sync="form" 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="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="MK_SALESAREA_PARAM"
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                    :source.sync="form" placeholder="请输入销售区域">
+              <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM"
+                :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}" :source.sync="form" 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="form.dept" title="部门" valueKey="name"
-                                    referName="DEPT_PARAM"
-                                    :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                    :source.sync="form" placeholder="请输入部门">
+              <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+                :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
           </el-col>
@@ -284,18 +208,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="备注" prop="notes">
-              <el-input v-model="form.notes" placeholder="请输入备注"/>
+              <el-input v-model="form.notes" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>
-                <el-option
-                  v-for="dict in dict.type.sys_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -304,7 +224,8 @@
       <div>
         <el-row :gutter="10" class="mb8" style="margin-left: 80%">
           <el-col :span="1.5">
-            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载</el-button>
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-upload ref="upload" action="" :http-request="handleImport">
@@ -315,83 +236,75 @@
             <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-edit-outline" size="mini" @click="dialogUpdateMore.dialogFormVisible = true">批量修改</el-button>
+            <el-button type="primary" plain icon="el-icon-edit-outline" size="mini"
+              @click="dialogUpdateMore.dialogFormVisible = true">批量修改</el-button>
           </el-col>
         </el-row>
         <el-tabs v-model="activeName">
           <el-tab-pane label="月回款目标明细" name="monthReturnGoalDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="monthReturnGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" 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 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" 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 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" 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 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" 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 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" 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 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" 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 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>
+                  <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">
+              <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>
+                  <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>
@@ -406,18 +319,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -425,7 +329,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer">
@@ -435,48 +340,38 @@
     </el-dialog>
 
     <!-- 批量修改对话框-->
-    <el-dialog title="批量修改" width="30%" :visible.sync="dialogUpdateMore.dialogFormVisible" append-to-body @closed="resetDialogUpdateMore">
+    <el-dialog title="批量修改" width="30%" :visible.sync="dialogUpdateMore.dialogFormVisible" append-to-body
+      @closed="resetDialogUpdateMore">
       <el-form>
         <el-form-item label="修改项" label-width="100px">
           <el-select @change="changeDialogData" v-model="dialogUpdateMore.updateName" placeholder="请选择需要批量修改的字段">
-            <el-option v-for="item in dialogUpdateMore.optionList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="item in dialogUpdateMore.optionList" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="修改值" label-width="100px">
-          <el-popover-select-v2 v-if="dialogUpdateMore.updateName === 1"
-                                v-model="dialogUpdateMore.updateData" title="销售组织" valueKey="name"
-                                referName="ORG_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入销售组织">
+          <el-popover-select-v2 v-if="dialogUpdateMore.updateName === 1" v-model="dialogUpdateMore.updateData"
+            title="销售组织" valueKey="name" referName="ORG_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入销售组织">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 2"
-                                v-model="dialogUpdateMore.updateData" title="销售区域" valueKey="name"
-                                referName="MK_SALESAREA_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入销售区域">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 2" v-model="dialogUpdateMore.updateData"
+            title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入销售区域">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 3"
-                                v-model="dialogUpdateMore.updateData" title="客户" valueKey="name"
-                                referName="CUSTOMER_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入客户">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 3" v-model="dialogUpdateMore.updateData"
+            title="客户" valueKey="name" referName="CUSTOMER_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入客户">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 4"
-                                v-model="dialogUpdateMore.updateData" title="部门" valueKey="name"
-                                referName="DEPT_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入部门">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 4" v-model="dialogUpdateMore.updateData"
+            title="部门" valueKey="name" referName="DEPT_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入部门">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 5"
-                                v-model="dialogUpdateMore.updateData" title="制单人" valueKey="name"
-                                referName="CONTACTS_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入制单人">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 5" v-model="dialogUpdateMore.updateData"
+            title="制单人" valueKey="name" referName="CONTACTS_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入制单人">
           </el-popover-select-v2>
-          <el-date-picker v-else-if="dialogUpdateMore.updateName === 6"
-                          v-model="dialogUpdateMore.updateData" value-format="yyyy-MM"
-                          type="month"
-                          placeholder="选择月">
+          <el-date-picker v-else-if="dialogUpdateMore.updateName === 6" v-model="dialogUpdateMore.updateData"
+            value-format="yyyy-MM" type="month" placeholder="选择月">
           </el-date-picker>
           <el-input v-else placeholder="请输入修改项" disabled></el-input>
         </el-form-item>
@@ -490,595 +385,683 @@
 </template>
 
 <script>
+  import {
+    listMonthReturnGoal,
+    getMonthReturnGoal,
+    addMonthReturnGoal,
+    updateMonthReturnGoal,
+    delMonthReturnGoal,
+    submit
+  } from "@/api/business/spd/goal_management/monthReturnGoal";
+  import {
+    getMonthReturnGoalDetails,
+    delMonthReturnGoalDetails,
+    importData
+  } from "@/api/business/spd/goal_management/monthReturnGoalDetails"
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    getSummary
+  } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    rollBack
+  } from "@/api/business/spd/goal_management/publicInterface";
 
-import {
-  listMonthReturnGoal,
-  getMonthReturnGoal,
-  addMonthReturnGoal,
-  updateMonthReturnGoal,
-  delMonthReturnGoal,
-  submit
-} from "@/api/business/spd/goal_management/monthReturnGoal";
-import {
-  getMonthReturnGoalDetails,
-  delMonthReturnGoalDetails,
-  importData
-} from "@/api/business/spd/goal_management/monthReturnGoalDetails"
-import { getToken } from "@/utils/auth";
-import { getSummary } from "../../../../api/business/spd/goal_management/commonWays";
-
-// 树形参照
-import TreeRefers from '@/components/Refers/treeRefer.vue'
-import ElPopoverSelectV2 from "@/components/popover-select-v2"
+  // 树形参照
+  import TreeRefers from '@/components/Refers/treeRefer.vue'
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
 
-export default {
-  name: "MonthReturnGoal",
-  components: {
-    TreeRefers, ElPopoverSelectV2
-  },
-  dicts: ["sys_status"],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 月回款目标填报表格数据
-      monthReturnGoalList: [],
-      monthReturnGoalDetailsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        saleZoneCode: null,
-        saleZone: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        params: { beginTime: null, endTime: null,}
+  export default {
+    name: "MonthReturnGoal",
+    components: {
+      TreeRefers,
+      ElPopoverSelectV2
+    },
+    dicts: ["sys_status", "oa_templete_id"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: false,
+        // 总条数
+        total: 0,
+        // 月回款目标填报表格数据
+        monthReturnGoalList: [],
+        monthReturnGoalDetailsList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          saleZoneCode: null,
+          saleZone: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          params: {
+            beginTime: null,
+            endTime: null,
+          }
+        },
+        // 表单参数
+        form: {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          saleZoneCode: null,
+          saleZone: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          monthReturnGoalDetailsList: null,
+        },
+        formDetails: {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          dept: null,
+          creator: null,
+          monthly: null,
+          goalSum: null
+        },
+        // 表单校验
+        rules: {
+          documentDate: [{
+            required: true,
+            message: '单据日期不能为空',
+            trigger: 'blur'
+          }],
+          annual: [{
+            required: true,
+            message: '年度不能为空',
+            trigger: 'blur'
+          }],
+          custom: [{
+            required: true,
+            message: '客户不能为空',
+            trigger: 'blur'
+          }],
+          creator: [{
+            required: true,
+            message: '制单人不能为空',
+            trigger: 'blur'
+          }],
+          saleZone: [{
+            required: true,
+            message: '销售区域不能为空',
+            trigger: 'blur'
+          }],
+          dept: [{
+            required: true,
+            message: '部门不能为空',
+            trigger: 'blur'
+          }],
+        },
+        // 子表导航名
+        activeName: 'monthReturnGoalDetails',
+        documentDateRange: null,
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/mk/monthReturnGoal/importData"
+        },
+        dialogUpdateMore: {
+          updateName: null,
+          dialogFormVisible: false,
+          updateData: null,
+          optionList: [{
+            value: 1,
+            label: '销售组织'
+          }, {
+            value: 2,
+            label: '销售区域'
+          }, {
+            value: 3,
+            label: '客户'
+          }, {
+            value: 4,
+            label: '部门'
+          }, {
+            value: 5,
+            label: '制单人'
+          }, {
+            value: 6,
+            label: '月份'
+          }]
+        }
+      }
+    },
+    created() {
+      this.getList()
+    },
+    methods: {
+      /** 查询月销售目标填报列表 */
+      getList() {
+        this.loading = true;
+        listMonthReturnGoal(this.queryParams).then(response => {
+          this.monthReturnGoalList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      getListDetails() {
+        this.loading = true
+        getMonthReturnGoalDetails(this.form.id).then(response => {
+          this.monthReturnGoalDetailsList = response.data
+          this.computeTotal()
+          this.form.monthReturnGoalDetailsList = this.monthReturnGoalDetailsList
+          updateMonthReturnGoal(this.form).then(response => {})
+          this.loading = false
+        })
       },
-      // 表单参数
-      form: {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        saleZoneCode: null,
-        saleZone: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        monthReturnGoalDetailsList: null,
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
       },
-      formDetails: {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        dept: null,
-        creator: null,
-        monthly: null,
-        goalSum: null
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          saleZoneCode: null,
+          saleZone: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          monthReturnGoalDetailsList: null,
+        };
+        this.resetForm("form");
       },
-      // 表单校验
-      rules: {
-        documentDate: [{ required: true, message: '单据日期不能为空', trigger: 'blur' }],
-        annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
-        custom: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
-        saleZone: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
-        dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
       },
-      // 子表导航名
-      activeName: 'monthReturnGoalDetails',
-      documentDateRange: null,
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          creatorCode: null,
+          creator: null,
+          saleZoneCode: null,
+          saleZone: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          params: {
+            beginTime: null,
+            endTime: null,
           }
-        }]
+        }
+        this.documentDateRange = null
+        this.resetForm("queryForm");
+        this.handleQuery();
       },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/mk/monthReturnGoal/importData"
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
       },
-      dialogUpdateMore: {
-        updateName: null,
-        dialogFormVisible: false,
-        updateData: null,
-        optionList:[{value: 1, label: '销售组织'}, {value: 2, label: '销售区域'}, {value: 3, label: '客户'}, {value: 4, label: '部门'}, {value: 5, label: '制单人'}, {value: 6, label: '月份'}]
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询月销售目标填报列表 */
-    getList() {
-      this.loading = true;
-      listMonthReturnGoal(this.queryParams).then(response => {
-        this.monthReturnGoalList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    getListDetails() {
-      this.loading = true
-      getMonthReturnGoalDetails(this.form.id).then(response => {
-        this.monthReturnGoalDetailsList = response.data
-        this.computeTotal()
-        this.form.monthReturnGoalDetailsList = this.monthReturnGoalDetailsList
-        updateMonthReturnGoal(this.form).then(response => {
-        })
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        saleZoneCode: null,
-        saleZone: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        monthReturnGoalDetailsList: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        creatorCode: null,
-        creator: null,
-        saleZoneCode: null,
-        saleZone: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        params: { beginTime: null, endTime: null,}
-      }
-      this.documentDateRange = null
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      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.$store.state.user.orgName,
-        saleZone: this.form.saleZone,
-        custom: this.form.custom,
-        dept: this.form.dept,
-        creator: this.form.creator,
-        monthly: new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0'),
-        goalSum: 0
-      }
-      this.monthReturnGoalDetailsList.push(list)
-      this.computeTotal()
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getMonthReturnGoal(id).then(response => {
-        this.form = response.data;
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        this.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthReturnGoalDetailsList))
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.monthReturnGoalDetailsList = []
         this.open = true;
-        this.title = "修改--月回款目标填报";
-      });
-    },
-    // 复制按钮操作
-    handleCopy(id) {
-      this.reset();
-      getMonthReturnGoal(id).then(response => {
-        this.form = response.data;
-        this.form.id = null
-        this.form.code = null
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        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.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthReturnGoalDetailsList))
-        for (const element of this.monthReturnGoalDetailsList) {
-          element.id = null
-          element.code = null
+        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.$store.state.user.orgName,
+          saleZone: this.form.saleZone,
+          custom: this.form.custom,
+          dept: this.form.dept,
+          creator: this.form.creator,
+          monthly: new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2,
+            '0'),
+          goalSum: 0
         }
-        this.open = true;
-        this.title = "新增--月销售目标填报";
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if (!this.justiceDetailsList()) {
-        return this.$message.error('子表中有必填字段未填，或者目标值为0')
-      }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            this.form.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
-            updateMonthReturnGoal(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.status = '0'
-            this.form.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
-            console.log(this.form);
-            addMonthReturnGoal(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        this.monthReturnGoalDetailsList.push(list)
+        this.computeTotal()
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getMonthReturnGoal(id).then(response => {
+          this.form = response.data;
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          this.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthReturnGoalDetailsList))
+          this.open = true;
+          this.title = "修改--月回款目标填报";
+        });
+      },
+      // 复制按钮操作
+      handleCopy(id) {
+        this.reset();
+        getMonthReturnGoal(id).then(response => {
+          this.form = response.data;
+          this.form.id = null
+          this.form.code = null
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          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()) {
+          return this.$message.error('子表中有必填字段未填，或者目标值为0')
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
-        return delMonthReturnGoal(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    handleDeleteDetails(index, row) {
-      if (this.form.id === null) {
-        this.monthReturnGoalDetailsList.splice(index, 1)
-        this.computeTotal()
-      } else {
-        if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标填报明细序号为"' + (index + 1) + '"的数据项？').then(function () {
-            return delMonthReturnGoalDetails(row.id);
-          }).then(() => {
-            this.getListDetails();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {
-          });
-        } else {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              this.form.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
+              updateMonthReturnGoal(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.form.status = '0'
+              this.form.monthReturnGoalDetailsList = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
+              console.log(this.form);
+              addMonthReturnGoal(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除月销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
+          return delMonthReturnGoal(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      handleDeleteDetails(index, row) {
+        if (this.form.id === null) {
           this.monthReturnGoalDetailsList.splice(index, 1)
-          this.$message.success('删除成功')
           this.computeTotal()
+        } else {
+          if (row.id !== null) {
+            this.$modal.confirm('是否确认删除月销售目标填报明细序号为"' + (index + 1) + '"的数据项？').then(function () {
+              return delMonthReturnGoalDetails(row.id);
+            }).then(() => {
+              this.getListDetails();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          } else {
+            this.monthReturnGoalDetailsList.splice(index, 1)
+            this.$message.success('删除成功')
+            this.computeTotal()
+          }
         }
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('mk/monthReturnGoal/export', {
-        ...this.queryParams
-      }, `monthReturnGoal_${new Date().getTime()}.xlsx`)
-    },
-    handleExportDetails() {
-      this.download('mk/monthReturnGoalDetails/export', {
-        ...this.queryParams
-      }, `monthReturnGoalDetails_${new Date().getTime()}.xlsx`)
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {
-        });
-    },
-    // 计算主表合计
-    computeTotal() {
-      let list = this.monthReturnGoalDetailsList
-      let sum = 0
-      for (const listElement of list) {
-        sum = (sum * 1000000 + listElement.goalSum * 1000000) / 1000000
-      }
-      this.form.goalSum = sum.toFixed(2)
-    },
-    getSummaries(param) {
-      return getSummary(param)
-    },
-    // 复制明细
-    handleCopyDetails(row) {
-      let list = {
-        id: null,
-        code: row.code,
-        saleOrg: row.saleOrg,
-        saleZone: row.saleZone,
-        custom: row.custom,
-        dept: row.dept,
-        creator: row.creator,
-        monthly: row.monthly,
-        goalSum: row.goalSum
-      }
-      this.monthReturnGoalDetailsList.push(list)
-      this.computeTotal()
-    },
-    setBeginAndEnd() {
-      let array = this.documentDateRange
-      if (array !== null) {
-        this.queryParams.params.beginTime = array[0]
-        this.queryParams.params.endTime = array[1]
-      } else {
-        this.queryParams.params.beginTime = null
-        this.queryParams.params.endTime = null
-      }
-    },
-    // 给table添加必填项
-    addRedStar(h, { column }) {
-      return [
-        h('span', { style: 'color: #F56C6C' }, '*'),
-        h('span', '' + column.label)
-      ]
-    },
-    // 判断子表的字段是否都填了
-    justiceDetailsList() {
-      const arr = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
-      for (const element of arr) {
-        const flag1 = (element.saleOrg !== null) && (element.saleZone !== null) && (element.custom !== null) && (element.dept !== null) && (element.creator !== null) && (element.monthly !== null) && (element.goalSum !== 0)
-        const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !== undefined) && (element.dept !== undefined) && (element.creator !== undefined) && (element.monthly !== undefined)
-        if (flag1 && flag2) {
-          return true
-        }
-      }
-      return false
-    },
-    handleCommand(command) {
-      // 执行对应的功能
-      if (command === 'importModel') {
-        // 执行选项1的功能
-        console.log('导入模板');
-      } else if (command === 'import') {
-        // 执行选项2的功能
-        console.log('导入');
-      } else if (command === 'export') {
-        console.log('导出主表');
-        this.handleExport()
-      } else if (command === 'exportDetails') {
-        console.log('导出明细');
-        this.handleExportDetails()
-      }
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.open = true;
-      if (this.open) {
-        this.upload.title = "月回款目标填报明细导入"
-        this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnGoalDetails/importData/" + this.form.id
-      } else {
-        this.upload.title = "月回款目标填报导入";
-        this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnGoal/importData"
-      }
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      if (this.open) {
-        this.download('mk/monthReturnGoalDetails/importTemplate', {
-        }, `monthReturnGoalDetails_${new Date().getTime()}.xlsx`)
-      } else {
-        this.download('mk/monthReturnGoal/importTemplate', {
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('mk/monthReturnGoal/export', {
+          ...this.queryParams
         }, `monthReturnGoal_${new Date().getTime()}.xlsx`)
-      }
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      if (this.open) {
-        let array = response.data
-        for (const arrayElement of array) {
-          arrayElement.id = null
-          this.monthReturnGoalDetailsList.push(arrayElement)
+      },
+      handleExportDetails() {
+        this.download('mk/monthReturnGoalDetails/export', {
+          ...this.queryParams
+        }, `monthReturnGoalDetails_${new Date().getTime()}.xlsx`)
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 计算主表合计
+      computeTotal() {
+        let list = this.monthReturnGoalDetailsList
+        let sum = 0
+        for (const listElement of list) {
+          sum = (sum * 1000000 + listElement.goalSum * 1000000) / 1000000
+        }
+        this.form.goalSum = sum.toFixed(2)
+      },
+      getSummaries(param) {
+        return getSummary(param)
+      },
+      // 复制明细
+      handleCopyDetails(row) {
+        let list = {
+          id: null,
+          code: row.code,
+          saleOrg: row.saleOrg,
+          saleZone: row.saleZone,
+          custom: row.custom,
+          dept: row.dept,
+          creator: row.creator,
+          monthly: row.monthly,
+          goalSum: row.goalSum
         }
+        this.monthReturnGoalDetailsList.push(list)
         this.computeTotal()
-      } else {
-        this.getList();
-      }
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    // 批量修改对话框的方法
-    dialogUpdateMoreSave() {
-      console.log(this.dialogUpdateMore);
-      if (this.dialogUpdateMore.updateData === null) {
-        return this.$message.error('请输入修改值')
-      }
-      const array = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
-      if (array.length !== 0) {
-        let condition = this.dialogUpdateMore.updateName
-        for (const element of array) {
-          if (condition === 1) {
-            element.saleOrg = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 2) {
-            element.saleZone = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 3) {
-            element.custom = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 4) {
-            element.dept = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 5) {
-            element.creator = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 6) {
-            element.monthly = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+      },
+      setBeginAndEnd() {
+        let array = this.documentDateRange
+        if (array !== null) {
+          this.queryParams.params.beginTime = array[0]
+          this.queryParams.params.endTime = array[1]
+        } else {
+          this.queryParams.params.beginTime = null
+          this.queryParams.params.endTime = null
+        }
+      },
+      // 给table添加必填项
+      addRedStar(h, {
+        column
+      }) {
+        return [
+          h('span', {
+            style: 'color: #F56C6C'
+          }, '*'),
+          h('span', '' + column.label)
+        ]
+      },
+      // 判断子表的字段是否都填了
+      justiceDetailsList() {
+        const arr = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
+        for (const element of arr) {
+          const flag1 = (element.saleOrg !== null) && (element.saleZone !== null) && (element.custom !== null) && (
+            element.dept !== null) && (element.creator !== null) && (element.monthly !== null) && (element.goalSum !==
+            0)
+          const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !==
+            undefined) && (element.dept !== undefined) && (element.creator !== undefined) && (element.monthly !==
+            undefined)
+          if (flag1 && flag2) {
+            return true
           }
         }
-      }
-      this.monthReturnGoalDetailsList = array
-      this.dialogUpdateMore.dialogFormVisible = !this.dialogUpdateMore.dialogFormVisible
-      this.dialogUpdateMore.updateData = null
-      this.dialogUpdateMore.updateName = null
-    },
-    changeDialogData() {
-      this.dialogUpdateMore.updateData = null
-    },
-    resetDialogUpdateMore() {
-      this.dialogUpdateMore.updateName = null
-      this.dialogUpdateMore.updateData = null
-    },
-    async handleSubmit(row){
-      this.$modal.loading("提交中...");
-      try {
-        const {msg, code} = await submit(row.id);
-        if (code === 200) {
-          this.$modal.notifySuccess("提交成功");
+        return false
+      },
+      handleCommand(command) {
+        // 执行对应的功能
+        if (command === 'importModel') {
+          // 执行选项1的功能
+          console.log('导入模板');
+        } else if (command === 'import') {
+          // 执行选项2的功能
+          console.log('导入');
+        } else if (command === 'export') {
+          console.log('导出主表');
+          this.handleExport()
+        } else if (command === 'exportDetails') {
+          console.log('导出明细');
+          this.handleExportDetails()
+        }
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.open = true;
+        if (this.open) {
+          this.upload.title = "月回款目标填报明细导入"
+          this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnGoalDetails/importData/" + this.form.id
+        } else {
+          this.upload.title = "月回款目标填报导入";
+          this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnGoal/importData"
+        }
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        if (this.open) {
+          this.download('mk/monthReturnGoalDetails/importTemplate', {},
+            `monthReturnGoalDetails_${new Date().getTime()}.xlsx`)
+        } else {
+          this.download('mk/monthReturnGoal/importTemplate', {}, `monthReturnGoal_${new Date().getTime()}.xlsx`)
+        }
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response
+          .msg + "</div>", "导入结果", {
+            dangerouslyUseHTMLString: true
+          });
+        if (this.open) {
+          let array = response.data
+          for (const arrayElement of array) {
+            arrayElement.id = null
+            this.monthReturnGoalDetailsList.push(arrayElement)
+          }
+          this.computeTotal()
+        } else {
+          this.getList();
+        }
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      // 批量修改对话框的方法
+      dialogUpdateMoreSave() {
+        console.log(this.dialogUpdateMore);
+        if (this.dialogUpdateMore.updateData === null) {
+          return this.$message.error('请输入修改值')
+        }
+        const array = JSON.parse(JSON.stringify(this.monthReturnGoalDetailsList))
+        if (array.length !== 0) {
+          let condition = this.dialogUpdateMore.updateName
+          for (const element of array) {
+            if (condition === 1) {
+              element.saleOrg = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 2) {
+              element.saleZone = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 3) {
+              element.custom = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 4) {
+              element.dept = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 5) {
+              element.creator = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 6) {
+              element.monthly = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            }
+          }
+        }
+        this.monthReturnGoalDetailsList = array
+        this.dialogUpdateMore.dialogFormVisible = !this.dialogUpdateMore.dialogFormVisible
+        this.dialogUpdateMore.updateData = null
+        this.dialogUpdateMore.updateName = null
+      },
+      changeDialogData() {
+        this.dialogUpdateMore.updateData = null
+      },
+      resetDialogUpdateMore() {
+        this.dialogUpdateMore.updateName = null
+        this.dialogUpdateMore.updateData = null
+      },
+      async handleSubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await submit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
+          }
+        } catch (err) {
+          console.error(err);
           this.$modal.closeLoading();
-          row.status = '1'
-          // this.getList(this.queryParams)
         }
-      }catch (err) {
-        console.error(err);
-        this.$modal.closeLoading();
-      }
-    },
-    //收回
-    handleReback(){
-
-    },
-    //模板下载
-    handleTemplateDownload(){
-      this.download('/mk/monthReturnGoalDetails/importTemplate', {
-      }, `MonthReturnGoal_${new Date().getTime()}.xlsx`)
-    },
-    //导入
-    handleImport(file){
-      this.loading = true;
-      let formData = new FormData()
-      formData.append('file',file.file)
-      importData(formData).then((res) => {
-        console.log('res',res);
-        if(res.code == '200'){
-          this.form.monthReturnGoalDetailsList.push.apply(this.form.monthReturnGoalDetailsList,res.data);
-          this.$message.success(res.msg);
-        }else{
-          this.$message.success(res.msg);
+      },
+      //收回
+      handleReback(row) {
+        this.$modal.loading("收回中...");
+        let params = {
+          billCode: row.code,
+          fdId: row.flowId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "销售目标"
+          }).value,
+          billMaker: row.createBy,
+          type: "5"
         }
-        this.loading = false;
-      }).catch((e) => {
-        this.$message.error(e.message)
-      }).finally((e) => {
-        this.$refs['upload'].clearFiles();
-        this.resetList();
-        this.loading = false;
-      })
-    },
+        rollBack(params).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("收回成功");
+            this.$modal.closeLoading();
+            this.getList(this.queryParams)
+          }
+        }).catch(err => {
+          this.$modal.closeLoading();
+        })
+      },
+      //模板下载
+      handleTemplateDownload() {
+        this.download('/mk/monthReturnGoalDetails/importTemplate', {}, `MonthReturnGoal_${new Date().getTime()}.xlsx`)
+      },
+      //导入
+      handleImport(file) {
+        this.loading = true;
+        let formData = new FormData()
+        formData.append('file', file.file)
+        importData(formData).then((res) => {
+          console.log('res', res);
+          if (res.code == '200') {
+            // this.form.monthReturnGoalDetailsList.push.apply(this.form.monthReturnGoalDetailsList, res.data);
+            this.monthReturnGoalDetailsList.push.apply(this.monthReturnGoalDetailsList, res.data);
+            this.$message.success(res.msg);
+          } else {
+            this.$message.success(res.msg);
+          }
+          this.loading = false;
+        }).catch((e) => {
+          this.$message.error(e.message)
+        }).finally((e) => {
+          this.$refs['upload'].clearFiles();
+          this.resetList();
+          this.loading = false;
+        })
+      },
+    }
   }
-}
+
 </script>
 
 <style scoped>

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

@@ -1,1025 +1,1010 @@
 <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
-            <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle @click="showSearch = !showSearch"></el-button>
-          </el-tooltip>
-        </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-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-col :span="6">
-        <el-form-item label="单据状态" prop="status">
-          <el-select
-            size="mini"
-            v-model="queryParams.status"
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.sys_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-  <el-row :gutter="10" class="mb8" style="float: right">
-    <el-col :span="1.5">
-      <el-button
-        type="primary"
-        plain
-        icon="el-icon-plus"
-        size="mini"
-        @click="handleAdd"
-      >新增
-      </el-button>
-    </el-col>
-    <el-col :span="1.5">
-      <el-dropdown @command="handleCommand">
-        <el-button type="warning" plain icon="el-icon-download" size="mini">
-          导出<i class="el-icon-arrow-down el-icon--right"></i>
-        </el-button>
-        <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>
-  </el-row>
-  <el-table v-loading="loading" :data="monthReturnMergeList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-    <el-table-column label="编码" align="center" prop="code" width="180"/>
-    <el-table-column label="目标名称" align="center" prop="goalName" width="180"/>
-    <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
-      <template slot-scope="scope">
-        <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
-      </template>
-    </el-table-column>
-    <el-table-column label="年度" align="center" prop="annual" width="180"/>
-    <el-table-column label="月份" align="center" prop="monthly" width="180"/>
-    <el-table-column label="客户" align="center" prop="custom" width="180"/>
-    <el-table-column label="销售区域" align="center" prop="saleZone" width="180"/>
-    <el-table-column label="制单人" align="center" prop="creator" width="180"/>
-    <el-table-column label="部门" align="center" prop="dept" width="180"/>
-    <el-table-column label="目标类型" align="center" prop="goalCategory" width="180"/>
-    <el-table-column label="目标值合计" align="center" prop="goalSum" width="180"/>
-    <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
-      <template slot-scope="scope">
-        <dict-tag
-          :options="dict.type.sys_status"
-          :value="scope.row.status"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
-      <template slot-scope="scope">
-        <div v-if="scope.row.status == '0' || scope.row.status == '3'">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleSubmit(scope.row)"
-          >提交</el-button>
-        </div>
-        <div v-if="scope.row.status == '1'">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleReback(scope.row)"
-          >收回</el-button>
-        </div>
-      </template>
-    </el-table-column>
-  </el-table>
-  <pagination
-    v-show="total>0"
-    :total="total"
-    :page.sync="queryParams.pageNum"
-    :limit.sync="queryParams.pageSize"
-    :page-sizes="[10, 20, 50, 100]"
-    @pagination="getList"
-  />
-
-  <!-- 添加或修改月销售目标合并抽屉 -->
-  <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+  <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="form.code" placeholder="编码后端自动生成" disabled/>
+            <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="form.goalName" placeholder="目标名称后端自动生成" disabled/>
+            <el-input v-model="queryParams.goalName" placeholder="请输入目标名称" clearable
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="单据日期" prop="documentDate">
-            <el-date-picker clearable
-                            v-model="form.documentDate"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="请选择单据日期">
+            <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
+              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle
+                @click="showSearch = !showSearch"></el-button>
+            </el-tooltip>
+          </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-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="年度" prop="annual">
-            <el-date-picker clearable
-                            v-model="form.annual"
-                            type="year"
-                            value-format="yyyy"
-                            placeholder="请输入年度">
+            <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-row>
-      <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="月份" prop="monthly">
-            <el-date-picker clearable
-                            v-model="form.monthly"
-                            type="month"
-                            value-format="yyyy-MM"
-                            placeholder="请输入月份">
+            <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="form.custom" title="客户" valueKey="name"
-                                  referName="CUSTOMER_PARAM"
-                                  :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                  :source.sync="form" placeholder="请输入客户">
+            <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="form.saleZoneCode" title="销售区域" valueKey="name"
-                                  referName="MK_SALESAREA_PARAM"
-                                  :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                  :source.sync="form" placeholder="请输入销售区域">
+            <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="form.creator" title="制单人" valueKey="name"
-                                  referName="CONTACTS_PARAM"
-                                  :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                  :source.sync="form" placeholder="请输入制单人">
+            <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-row>
-      <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="部门" prop="dept">
-            <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name"
-                                  referName="DEPT_PARAM"
-                                  :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                  :source.sync="form" placeholder="请输入部门">
+            <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-col :span="6">
-          <el-form-item label="目标类型" prop="goalCategory">
-            <el-input v-model="form.goalName" placeholder="客户维度" disabled/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="目标值合计" prop="goalSum">
-            <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="单据状态" prop="type">
-            <el-select v-model="form.status" placeholder="" disabled>
-              <el-option
-                v-for="dict in dict.type.sys_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+          <el-form-item label="单据状态" prop="status">
+            <el-select size="mini" v-model="queryParams.status" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <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 max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthReturnMergeDetailsList" v-horizontal-scroll>
-            <el-table-column label="序号" type="index" width="55" align="center" fixed />
-            <el-table-column label="销售组织" align="center" 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" 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" 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" 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" 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" 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="goalSum" 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 max-height="300" show-summary :summary-method="getSummaries" :data="zoneGoalSumList" v-horizontal-scroll>
-            <el-table-column label="序号" type="index" width="55" align="center" fixed />
-            <el-table-column label="销售组织" align="center" 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" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="MK_SALESAREA_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" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].dept" title="部门" valueKey="name"
-                                      referName="DEPT_PARAM" disabled
-                                      :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                      :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入客户">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="制单人" align="center" width="180">
-              <template slot-scope="scope">
-                <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].creator" title="制单人" valueKey="name"
-                                      referName="CONTACTS_PARAM" disabled
-                                      :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                      :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入制单人">
-                </el-popover-select-v2>
-              </template>
-            </el-table-column>
-            <el-table-column label="月份" align="center" 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="goalSum" width="220">
-              <template slot-scope="scope">
-                <el-input-number disabled @change="computeTotal" v-model="zoneGoalSumList[scope.$index].goalSum" :precision="2" :step="1" :min="0"></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>
+    <el-row :gutter="10" class="mb8" style="float: right">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-dropdown @command="handleCommand">
+          <el-button type="warning" plain icon="el-icon-download" size="mini">
+            导出<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <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>
+    </el-row>
+    <el-table v-loading="loading" :data="monthReturnMergeList" @selection-change="handleSelectionChange"
+      v-horizontal-scroll>
+      <el-table-column label="编码" align="center" prop="code" width="180" />
+      <el-table-column label="目标名称" align="center" prop="goalName" width="180" />
+      <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="年度" align="center" prop="annual" width="180" />
+      <el-table-column label="月份" align="center" prop="monthly" width="180" />
+      <el-table-column label="客户" align="center" prop="custom" width="180" />
+      <el-table-column label="销售区域" align="center" prop="saleZone" width="180" />
+      <el-table-column label="制单人" align="center" prop="creator" width="180" />
+      <el-table-column label="部门" align="center" prop="dept" width="180" />
+      <el-table-column label="目标类型" align="center" prop="goalCategory" width="180" />
+      <el-table-column label="目标值合计" align="center" prop="goalSum" width="180" />
+      <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+        <template slot-scope="scope">
+          <div v-if="scope.row.status == '0' || scope.row.status == '3'">
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改
+            </el-button>
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除
+            </el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)">提交</el-button>
+          </div>
+          <div v-if="scope.row.status == '1'">
+            <el-button size="mini" type="text" @click="handleReback(scope.row)">收回</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]" @pagination="getList" />
+
+    <!-- 添加或修改月销售目标合并抽屉 -->
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
+      v-horizontal-scroll>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="编码" prop="code">
+              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目标名称" prop="goalName">
+              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期" prop="documentDate">
+              <el-date-picker clearable v-model="form.documentDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择单据日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="年度" prop="annual">
+              <el-date-picker clearable v-model="form.annual" type="year" value-format="yyyy" placeholder="请输入年度">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="月份" prop="monthly">
+              <el-date-picker clearable v-model="form.monthly" type="month" value-format="yyyy-MM" 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="form.custom" title="客户" valueKey="name" referName="CUSTOMER_PARAM"
+                :dataMapping="{ customCode: 'code', custom: 'name'}" :source.sync="form" 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="form.saleZoneCode" title="销售区域" valueKey="name"
+                referName="MK_SALESAREA_PARAM" :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                :source.sync="form" placeholder="请输入销售区域">
+              </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="form.creator" title="制单人" valueKey="name" referName="CONTACTS_PARAM"
+                :dataMapping="{ creatorCode: 'code', creator: 'name'}" :source.sync="form" 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="dept">
+              <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+                :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="form" placeholder="请输入部门">
+              </el-popover-select-v2>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目标类型" prop="goalCategory">
+              <el-input v-model="form.goalName" placeholder="客户维度" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="目标值合计" prop="goalSum">
+              <el-input v-model="form.goalSum" placeholder="目标值合计自动计算" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="单据状态" prop="type">
+              <el-select v-model="form.status" placeholder="" disabled>
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <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 max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="monthReturnMergeDetailsList" v-horizontal-scroll>
+              <el-table-column label="序号" type="index" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" 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" 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" 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" 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" 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" 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="goalSum" 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 max-height="300" show-summary :summary-method="getSummaries" :data="zoneGoalSumList"
+              v-horizontal-scroll>
+              <el-table-column label="序号" type="index" width="55" align="center" fixed />
+              <el-table-column label="销售组织" align="center" 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" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                    referName="MK_SALESAREA_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" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].dept" title="部门" valueKey="name"
+                    referName="DEPT_PARAM" disabled :dataMapping="{ deptCode: 'code', dept: 'name'}"
+                    :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="制单人" align="center" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="zoneGoalSumList[scope.$index].creator" title="制单人" valueKey="name"
+                    referName="CONTACTS_PARAM" disabled :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                    :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入制单人">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="月份" align="center" 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="goalSum" width="220">
+                <template slot-scope="scope">
+                  <el-input-number disabled @change="computeTotal" v-model="zoneGoalSumList[scope.$index].goalSum"
+                    :precision="2" :step="1" :min="0"></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>
-    </div>
-  </el-drawer>
+    </el-drawer>
 
-  <!-- 用户导入对话框 -->
-  <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-    <el-upload
-      ref="upload"
-      :limit="1"
-      accept=".xlsx, .xls"
-      :headers="upload.headers"
-      :action="upload.url + '?updateSupport=' + upload.updateSupport"
-      :disabled="upload.isUploading"
-      :on-progress="handleFileUploadProgress"
-      :on-success="handleFileSuccess"
-      :auto-upload="false"
-      drag
-    >
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-      <div class="el-upload__tip text-center" slot="tip">
-        <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
-        <span>仅允许导入xls、xlsx格式文件。</span>
-        <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+      </el-upload>
+      <div slot="footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
       </div>
-    </el-upload>
-    <div slot="footer">
-      <el-button type="primary" @click="submitFileForm">确 定</el-button>
-      <el-button @click="upload.open = false">取 消</el-button>
-    </div>
-  </el-dialog>
-</div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {
-  addMonthReturnMerge,
-  delMonthReturnMerge,
-  getMonthReturnMerge,
-  listMonthReturnMerge,
-  updateMonthReturnMerge,
-  submit
-} from "@/api/business/spd/goal_management/monthReturnMerge";
-import {
-  delMonthReturnMergeDetails,
-  getMonthReturnMergeDetails,
-  mergeMonthReturnMergeDetails
-} from "@/api/business/spd/goal_management/monthReturnMergeDetails"
-import { getToken } from "@/utils/auth";
-import { getSummary } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    addMonthReturnMerge,
+    delMonthReturnMerge,
+    getMonthReturnMerge,
+    listMonthReturnMerge,
+    updateMonthReturnMerge,
+    submit
+  } from "@/api/business/spd/goal_management/monthReturnMerge";
+  import {
+    delMonthReturnMergeDetails,
+    getMonthReturnMergeDetails,
+    mergeMonthReturnMergeDetails
+  } from "@/api/business/spd/goal_management/monthReturnMergeDetails"
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    getSummary
+  } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    rollBack
+  } from "@/api/business/spd/goal_management/publicInterface";
 
-// 参照
-import TreeRefers from '@/components/Refers/treeRefer.vue'
-import ElPopoverSelectV2 from "@/components/popover-select-v2"
-import log from "../../../monitor/job/log";
+  // 参照
+  import TreeRefers from '@/components/Refers/treeRefer.vue'
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
+  import log from "../../../monitor/job/log";
 
-export default {
-  name: "MonthReturnMerge",
-  components: {
-    TreeRefers, ElPopoverSelectV2
-  },
-  dicts: ["sys_status"],
-  data () {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 月销售目标合并表格数据
-      monthReturnMergeList: [],
-      monthReturnMergeDetailsList: [],
-      zoneGoalSumList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        params: { beginTime: null, endTime: null }
+  export default {
+    name: "MonthReturnMerge",
+    components: {
+      TreeRefers,
+      ElPopoverSelectV2
+    },
+    dicts: ["sys_status", "oa_templete_id"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: false,
+        // 总条数
+        total: 0,
+        // 月销售目标合并表格数据
+        monthReturnMergeList: [],
+        monthReturnMergeDetailsList: [],
+        zoneGoalSumList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          params: {
+            beginTime: null,
+            endTime: null
+          }
+        },
+        // 表单参数
+        form: {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          delFlag: null,
+          monthReturnMergeDetailsList: null,
+          oldMonthReturnMergeDetailsList: null
+        },
+        formDetails: {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          dept: null,
+          creator: null,
+          monthly: null,
+          goalSum: null,
+          delFlag: null
+        },
+        // 表单校验
+        rules: {
+          documentDate: [{
+            required: true,
+            message: '单据日期不能为空',
+            trigger: 'blur'
+          }],
+          annual: [{
+            required: true,
+            message: '年度不能为空',
+            trigger: 'blur'
+          }],
+          monthly: [{
+            required: true,
+            message: '月份不能为空',
+            trigger: 'blur'
+          }],
+          custom: [{
+            required: true,
+            message: '客户不能为空',
+            trigger: 'blur'
+          }],
+          saleZone: [{
+            required: true,
+            message: '销售区域不能为空',
+            trigger: 'blur'
+          }],
+          creator: [{
+            required: true,
+            message: '制单人不能为空',
+            trigger: 'blur'
+          }],
+          dept: [{
+            required: true,
+            message: '部门不能为空',
+            trigger: 'blur'
+          }]
+        },
+        activeName: 'monthReturnMergeDetails',
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        documentDateRange: null,
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
+        }
+      }
+    },
+    created() {
+      this.getList()
+    },
+    methods: {
+      /** 查询月销售目标合并列表 */
+      getList() {
+        this.loading = true;
+        listMonthReturnMerge(this.queryParams).then(response => {
+          this.monthReturnMergeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
       },
-      // 表单参数
-      form: {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        delFlag: null,
-        monthReturnMergeDetailsList: null,
-        oldMonthReturnMergeDetailsList: null
+      getListDetails() {
+        this.loading = true;
+        getMonthReturnMergeDetails(this.form.id).then(response => {
+          this.monthGoalMergeDetailsList = response.data;
+          this.computeTotal()
+          this.form.monthReturnMergeDetailsList = this.monthReturnMergeDetailsList
+          updateMonthReturnMerge(this.form).then(response => {})
+          this.loading = false;
+        });
       },
-      formDetails: {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        dept: null,
-        creator: null,
-        monthly: null,
-        goalSum: null,
-        delFlag: null
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
       },
-      // 表单校验
-      rules: {
-        documentDate: [{ required: true, message: '单据日期不能为空', trigger: 'blur' }],
-        annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
-        monthly: [{ required: true, message: '月份不能为空', trigger: 'blur' }],
-        custom: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
-        saleZone: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
-        dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }]
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          delFlag: null
+        };
+        this.resetForm("form");
       },
-      activeName: 'monthReturnMergeDetails',
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          monthly: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalCategory: null,
+          goalSum: null,
+          status: null,
+          params: {
+            beginTime: null,
+            endTime: null
           }
-        }]
+        }
+        this.documentDateRange = null
+        this.resetForm("queryForm");
+        this.handleQuery();
       },
-      documentDateRange: null,
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询月销售目标合并列表 */
-    getList() {
-      this.loading = true;
-      listMonthReturnMerge(this.queryParams).then(response => {
-        this.monthReturnMergeList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    getListDetails() {
-      this.loading = true;
-      getMonthReturnMergeDetails(this.form.id).then(response => {
-        this.monthGoalMergeDetailsList = response.data;
-        this.computeTotal()
-        this.form.monthReturnMergeDetailsList = this.monthReturnMergeDetailsList
-        updateMonthReturnMerge(this.form).then(response => {})
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        delFlag: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        monthly: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalCategory: null,
-        goalSum: null,
-        status: null,
-        params: { beginTime: null, endTime: null }
-      }
-      this.documentDateRange = null
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      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 = {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        dept: null,
-        creator: null,
-        monthly: null,
-        goalSum: null
-      }
-      this.monthReturnMergeDetailsList.push(list)
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.activeName = 'monthReturnMergeDetails'
-      const id = row.id || this.ids
-      getMonthReturnMerge(id).then(response => {
-        this.form = response.data;
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        this.monthReturnMergeDetailsList = this.form.monthReturnMergeDetailsList
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.activeName = 'monthReturnMergeDetails'
+        this.monthReturnMergeDetailsList = []
+        this.zoneGoalSumList = []
         this.open = true;
-        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.form.goalSum = 0
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        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.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 = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
-            updateMonthReturnMerge(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.status = '0'
-            this.form.goalCategory = '客户维度'
-            this.form.monthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
-            console.log(this.form);
-            addMonthReturnMerge(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+        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 = {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          dept: null,
+          creator: null,
+          monthly: null,
+          goalSum: null
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标合并单据编号为"' + row.code + '"的数据项？').then(function () {
-        return delMonthReturnMerge(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    handleDeleteDetails(index, row) {
-      if (this.form.id === null) {
-        this.monthReturnMergeDetailsList.splice(index, 1)
-        this.computeTotal()
-      } else {
-        if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标合并明细序号为"' + (index + 1) + '"的数据项？').then(function () {
-            return delMonthReturnMergeDetails(row.id);
-          }).then(() => {
-            this.getListDetails();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {
-          });
-        } else {
+        this.monthReturnMergeDetailsList.push(list)
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        this.activeName = 'monthReturnMergeDetails'
+        const id = row.id || this.ids
+        getMonthReturnMerge(id).then(response => {
+          this.form = response.data;
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          this.monthReturnMergeDetailsList = this.form.monthReturnMergeDetailsList
+          this.open = true;
+          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.form.goalSum = 0
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          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 = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
+              updateMonthReturnMerge(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.form.status = '0'
+              this.form.goalCategory = '客户维度'
+              this.form.monthReturnMergeDetailsList = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
+              console.log(this.form);
+              addMonthReturnMerge(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除月销售目标合并单据编号为"' + row.code + '"的数据项？').then(function () {
+          return delMonthReturnMerge(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      handleDeleteDetails(index, row) {
+        if (this.form.id === null) {
           this.monthReturnMergeDetailsList.splice(index, 1)
-          this.$message.success('删除成功')
           this.computeTotal()
+        } else {
+          if (row.id !== null) {
+            this.$modal.confirm('是否确认删除月销售目标合并明细序号为"' + (index + 1) + '"的数据项？').then(function () {
+              return delMonthReturnMergeDetails(row.id);
+            }).then(() => {
+              this.getListDetails();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          } else {
+            this.monthReturnMergeDetailsList.splice(index, 1)
+            this.$message.success('删除成功')
+            this.computeTotal()
+          }
         }
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('mk/monthReturnMerge/export', {
-        ...this.queryParams
-      }, `monthReturnMerge_${new Date().getTime()}.xlsx`)
-    },
-    handleExportDetails() {
-      this.download('mk/monthReturnMergeDetails/export', {
-        ...this.queryParams
-      }, `monthReturnMergeDetails_${new Date().getTime()}.xlsx`)
-    },
-    handleExportZoneSum() {
-      this.download('mk/monthReturnMergeDetails/exportZoneSum', {
-        ...this.queryParams
-      }, `zoneSum_${new Date().getTime()}.xlsx`)
-    },
-    // 关闭抽屉
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('mk/monthReturnMerge/export', {
+          ...this.queryParams
+        }, `monthReturnMerge_${new Date().getTime()}.xlsx`)
+      },
+      handleExportDetails() {
+        this.download('mk/monthReturnMergeDetails/export', {
+          ...this.queryParams
+        }, `monthReturnMergeDetails_${new Date().getTime()}.xlsx`)
+      },
+      handleExportZoneSum() {
+        this.download('mk/monthReturnMergeDetails/exportZoneSum', {
+          ...this.queryParams
+        }, `zoneSum_${new Date().getTime()}.xlsx`)
+      },
+      // 关闭抽屉
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 合并数据
+      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('请输入客户')
+        }
+        mergeMonthReturnMergeDetails(this.form).then(response => {
+          console.log(response)
+          if (response.data.monthReturnMergeDetails) {
+            this.monthReturnMergeDetailsList = response.data.monthReturnMergeDetails
+            this.computeTotal()
+          } else {
+            return this.$message.warning('未查到相关数据')
+          }
         })
-        .catch(_ => {});
-    },
-    // 合并数据
-    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('请输入客户')
-      }
-      mergeMonthReturnMergeDetails(this.form).then(response => {
-        console.log(response)
-        if (response.data.monthReturnMergeDetails) {
-          this.monthReturnMergeDetailsList = response.data.monthReturnMergeDetails
-          this.computeTotal()
+      },
+      // 计算主表合计
+      computeTotal() {
+        let list = this.monthReturnMergeDetailsList
+        let sum = 0
+        for (const listElement of list) {
+          sum = (sum * 1000000 + listElement.goalSum * 1000000) / 1000000
+        }
+        this.form.goalSum = sum.toFixed(2)
+      },
+      getSummaries(param) {
+        return getSummary(param)
+      },
+      // 复制明细
+      handleCopyDetails(row) {
+        let list = {
+          id: row.id,
+          code: row.code,
+          saleOrg: row.saleOrg,
+          saleZone: row.saleZone,
+          custom: row.custom,
+          dept: row.dept,
+          creator: row.creator,
+          monthly: row.monthly,
+          goalSum: row.goalSum
+        }
+        this.monthReturnMergeDetailsList.push(list)
+        this.computeTotal()
+      },
+      // 设置查询的开始和结束时间
+      setBeginAndEnd() {
+        let array = this.documentDateRange
+        if (array !== null) {
+          this.queryParams.params.beginTime = array[0]
+          this.queryParams.params.endTime = array[1]
         } else {
-          return this.$message.warning('未查到相关数据')
+          this.queryParams.params.beginTime = null
+          this.queryParams.params.endTime = null
         }
-      })
-    },
-    // 计算主表合计
-    computeTotal() {
-      let list = this.monthReturnMergeDetailsList
-      let sum = 0
-      for (const listElement of list) {
-        sum = (sum * 1000000 + listElement.goalSum * 1000000) / 1000000
-      }
-      this.form.goalSum = sum.toFixed(2)
-    },
-    getSummaries(param) { return getSummary(param) },
-    // 复制明细
-    handleCopyDetails(row) {
-      let list = {
-        id: row.id,
-        code: row.code,
-        saleOrg: row.saleOrg,
-        saleZone: row.saleZone,
-        custom: row.custom,
-        dept: row.dept,
-        creator: row.creator,
-        monthly: row.monthly,
-        goalSum: row.goalSum
-      }
-      this.monthReturnMergeDetailsList.push(list)
-      this.computeTotal()
-    },
-    // 设置查询的开始和结束时间
-    setBeginAndEnd() {
-      let array = this.documentDateRange
-      if (array !== null) {
-        this.queryParams.params.beginTime = array[0]
-        this.queryParams.params.endTime = array[1]
-      } else {
-        this.queryParams.params.beginTime = null
-        this.queryParams.params.endTime = null
-      }
-    },
-    getNewTwoArray() {
-      let arr = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
-      console.log(arr);
-      if (this.activeName === 'monthReturnMergeDetails') {
-        return this.zoneGoalSumList = []
-      }
-      // 根据**进行合并，并相加goalSum
-      const mergeAndSumTotalGoal = (array) => {
-        return Array.from(array.reduce((map, obj) => {
-          const key = `${obj.saleOrg}-${obj.saleZone}-${obj.custom}-${obj.dept}-${obj.creator}-${obj.monthly}`
-          if (map.has(key)) {
-            const existingObj = map.get(key)
-            existingObj.goalSum += obj.goalSum
-          } else {
-            map.set(key, { ...obj })
+      },
+      getNewTwoArray() {
+        let arr = JSON.parse(JSON.stringify(this.monthReturnMergeDetailsList))
+        console.log(arr);
+        if (this.activeName === 'monthReturnMergeDetails') {
+          return this.zoneGoalSumList = []
+        }
+        // 根据**进行合并，并相加goalSum
+        const mergeAndSumTotalGoal = (array) => {
+          return Array.from(array.reduce((map, obj) => {
+            const key = `${obj.saleOrg}-${obj.saleZone}-${obj.custom}-${obj.dept}-${obj.creator}-${obj.monthly}`
+            if (map.has(key)) {
+              const existingObj = map.get(key)
+              existingObj.goalSum += obj.goalSum
+            } else {
+              map.set(key, {
+                ...obj
+              })
+            }
+            return map
+          }, new Map()).values())
+        }
+        this.zoneGoalSumList = mergeAndSumTotalGoal(arr)
+      },
+      handleCommand(command) {
+        // 执行对应的功能
+        if (command === 'importModel') {
+          // 执行选项1的功能
+          console.log('导入模板');
+        } else if (command === 'import') {
+          // 执行选项2的功能
+          console.log('导入');
+        } else if (command === 'export') {
+          console.log('导出主表');
+          this.handleExport()
+        } else if (command === 'exportDetails') {
+          console.log('导出明细');
+          this.handleExportDetails()
+        } else if (command === 'exportZoneSum') {
+          console.log('导出区域目标汇总');
+          this.handleExportZoneSum()
+        }
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.open = true;
+        this.upload.title = "月回款目标合并导入";
+        this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnMerge/importData"
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        this.download('mk/monthReturnMerge/importTemplate', {}, `monthReturnMerge_${new Date().getTime()}.xlsx`)
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        console.log(response);
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response
+          .msg + "</div>", "导入结果", {
+            dangerouslyUseHTMLString: true
+          });
+        this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      async handleSubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await submit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
           }
-          return map
-        }, new Map()).values())
-      }
-      this.zoneGoalSumList = mergeAndSumTotalGoal(arr)
-    },
-    handleCommand(command) {
-      // 执行对应的功能
-      if (command === 'importModel') {
-        // 执行选项1的功能
-        console.log('导入模板');
-      } else if (command === 'import') {
-        // 执行选项2的功能
-        console.log('导入');
-      } else if (command === 'export') {
-        console.log('导出主表');
-        this.handleExport()
-      } else if (command === 'exportDetails') {
-        console.log('导出明细');
-        this.handleExportDetails()
-      } else if (command === 'exportZoneSum') {
-        console.log('导出区域目标汇总');
-        this.handleExportZoneSum()
-      }
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.open = true;
-      this.upload.title = "月回款目标合并导入";
-      this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnMerge/importData"
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('mk/monthReturnMerge/importTemplate', {
-      }, `monthReturnMerge_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      console.log(response);
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    async handleSubmit(row){
-      this.$modal.loading("提交中...");
-      try {
-        const {msg, code} = await submit(row.id);
-        if (code === 200) {
-          this.$modal.notifySuccess("提交成功");
+        } catch (err) {
+          console.error(err);
           this.$modal.closeLoading();
-          row.status = '1'
-          // this.getList(this.queryParams)
         }
-      }catch (err) {
-        console.error(err);
-        this.$modal.closeLoading();
-      }
-    },
-    //收回
-    handleReback(){
-
-    },
+      },
+      //收回
+      handleReback(row) {
+        this.$modal.loading("收回中...");
+        let params = {
+          billCode: row.code,
+          fdId: row.flowId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "销售目标"
+          }).value,
+          billMaker: row.createBy,
+          type: "6"
+        }
+        rollBack(params).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("收回成功");
+            this.$modal.closeLoading();
+            this.getList(this.queryParams)
+          }
+        }).catch(err => {
+          this.$modal.closeLoading();
+        })
+      },
+    }
   }
-}
+
 </script>
 
 <style scoped>

src/views/business/spd/target/MonthSaleGoal.vue

@@ -4,35 +4,19 @@
       <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-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-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="结束日期"
+            <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>
@@ -42,7 +26,8 @@
             <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-tooltip class="item" effect="dark" :content="showSearch?'隐藏搜索':'显示搜索'" placement="top">
-              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle @click="showSearch = !showSearch"></el-button>
+              <el-button type="warning" :icon="showSearch?'el-icon-caret-top':'el-icon-caret-bottom'" circle
+                @click="showSearch = !showSearch"></el-button>
             </el-tooltip>
           </el-form-item>
         </el-col>
@@ -52,40 +37,32 @@
       <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
+            <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 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">
+              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 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>
@@ -93,26 +70,17 @@
       <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 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-col :span="6">
           <el-form-item label="单据状态" prop="status">
-            <el-select
-              size="mini"
-              v-model="queryParams.status"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+            <el-select size="mini" v-model="queryParams.status" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -121,13 +89,7 @@
 
     <el-row :gutter="10" class="mb8" style="float: right">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -143,100 +105,70 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="monthSaleGoalList" @selection-change="handleSelectionChange" v-horizontal-scroll>
-      <el-table-column label="编码" align="center" prop="code"/>
-      <el-table-column label="目标名称" align="center" prop="goalName"/>
+    <el-table v-loading="loading" :data="monthSaleGoalList" @selection-change="handleSelectionChange"
+      v-horizontal-scroll>
+      <el-table-column label="编码" align="center" prop="code" />
+      <el-table-column label="目标名称" align="center" prop="goalName" />
       <el-table-column label="单据日期" align="center" prop="documentDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.documentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="年度" align="center" prop="annual"/>
-      <el-table-column label="客户" align="center" prop="custom"/>
-      <el-table-column label="销售区域" align="center" prop="saleZone"/>
-      <el-table-column label="制单人" align="center" prop="creator"/>
-      <el-table-column label="部门" align="center" prop="dept"/>
-      <el-table-column label="目标合计" align="center" prop="goalSum"/>
-      <el-table-column label="备注" align="center" prop="notes"/>
+      <el-table-column label="年度" align="center" prop="annual" />
+      <el-table-column label="客户" align="center" prop="custom" />
+      <el-table-column label="销售区域" align="center" prop="saleZone" />
+      <el-table-column label="制单人" align="center" prop="creator" />
+      <el-table-column label="部门" align="center" prop="dept" />
+      <el-table-column label="目标合计" align="center" prop="goalSum" />
+      <el-table-column label="备注" align="center" prop="notes" />
       <el-table-column show-overflow-tooltip label="状态" align="center" width="200" prop="status">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_status"
-            :value="scope.row.status"
-          />
+          <dict-tag :options="dict.type.sys_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' || scope.row.status == '3'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-            >修改
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">修改
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
-            >删除
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-            >提交</el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)">提交</el-button>
           </div>
           <div v-if="scope.row.status == '1'">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleReback(scope.row)"
-            >收回</el-button>
+            <el-button size="mini" type="text" @click="handleReback(scope.row)">收回</el-button>
           </div>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[10, 20, 50, 100]"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]" @pagination="getList" />
 
-    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%" v-horizontal-scroll>
+    <el-drawer :title="title" :visible.sync="open" direction="rtl" :before-close="handleClose" size="100%"
+      v-horizontal-scroll>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="编码" prop="code">
-              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled/>
+              <el-input v-model="form.code" placeholder="编码后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="目标名称" prop="goalName">
-              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled/>
+              <el-input v-model="form.goalName" placeholder="目标名称后端自动生成" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据日期" prop="documentDate">
-              <el-date-picker clearable
-                              v-model="form.documentDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择单据日期">
+              <el-date-picker clearable v-model="form.documentDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="请选择单据日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="年度" prop="annual">
-              <el-date-picker
-                v-model="form.annual"
-                type="year"
-                value-format="yyyy"
-                placeholder="选择年度">
+              <el-date-picker v-model="form.annual" type="year" value-format="yyyy" placeholder="选择年度">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -244,36 +176,29 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="客户" prop="custom">
-              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
-                                    :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                    :source.sync="form" placeholder="请输入客户">
+              <el-popover-select-v2 v-model="form.custom" title="客户" valueKey="name" referName="CUSTOMER_PARAM"
+                :dataMapping="{ customCode: 'code', custom: 'name'}" :source.sync="form" 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="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="MK_SALESAREA_PARAM"
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                    :source.sync="form" placeholder="请输入销售区域">
+              <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM"
+                :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}" :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
-            </el-form-item></el-col>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="制单人" prop="creator">
-              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name"
-                                    referName="CONTACTS_PARAM"
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="form" placeholder="请输入制单人">
+              <el-popover-select-v2 v-model="form.creator" title="制单人" valueKey="name" referName="CONTACTS_PARAM"
+                :dataMapping="{ creatorCode: 'code', creator: 'name'}" :source.sync="form" 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="form.dept" title="部门" valueKey="name"
-                                    referName="DEPT_PARAM"
-                                    :dataMapping="{ deptCode: 'code', dept: 'name'}"
-                                    :source.sync="form" placeholder="请输入部门">
+              <el-popover-select-v2 v-model="form.dept" title="部门" valueKey="name" referName="DEPT_PARAM"
+                :dataMapping="{ deptCode: 'code', dept: 'name'}" :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
           </el-col>
@@ -286,18 +211,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="备注" prop="notes">
-              <el-input v-model="form.notes" placeholder="请输入备注"/>
+              <el-input v-model="form.notes" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态" prop="type">
               <el-select v-model="form.status" placeholder="" disabled>
-                <el-option
-                  v-for="dict in dict.type.sys_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -306,7 +227,8 @@
       <div>
         <el-row :gutter="10" class="mb8" style="margin-left: 80%">
           <el-col :span="1.5">
-            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载</el-button>
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleTemplateDownload">模板下载
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-upload ref="upload" action="" :http-request="handleImport">
@@ -317,75 +239,75 @@
             <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-edit-outline" size="mini" @click="dialogUpdateMore.dialogFormVisible = true">批量修改</el-button>
+            <el-button type="primary" plain icon="el-icon-edit-outline" size="mini"
+              @click="dialogUpdateMore.dialogFormVisible = true">批量修改</el-button>
           </el-col>
         </el-row>
         <el-tabs v-model="activeName">
           <el-tab-pane label="月销售目标明细" name="monthSaleGoalDetails">
-            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading" :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
+            <el-table max-height="300" show-summary :summary-method="getSummaries" v-loading="loading"
+              :data="monthSaleGoalDetailsList" @selection-change="handleSelectionChange" v-horizontal-scroll>
               <el-table-column label="序号" type="index" width="70" align="center" fixed />
               <el-table-column label="销售组织" align="center" 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 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" 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 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" 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 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" 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="请输入部门">
+                    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" 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 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" width="180" :render-header="addRedStar">
                 <template slot-scope="scope">
-                  <el-input v-model="monthSaleGoalDetailsList[scope.$index].oneLevelClassify" placeholder="请输入一级分类" disabled></el-input>
+                  <el-input v-model="monthSaleGoalDetailsList[scope.$index].oneLevelClassify" placeholder="请输入一级分类"
+                    disabled></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="二级分类" align="center" width="180" :render-header="addRedStar">
                 <template slot-scope="scope">
-                  <el-input v-model="monthSaleGoalDetailsList[scope.$index].twoLevelClassify" placeholder="请输入二级分类" disabled></el-input>
+                  <el-input v-model="monthSaleGoalDetailsList[scope.$index].twoLevelClassify" placeholder="请输入二级分类"
+                    disabled></el-input>
                 </template>
               </el-table-column>
               <el-table-column label="物料" align="center" width="180" :render-header="addRedStar">
                 <template slot-scope="scope">
-                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].material" title="物料" valueKey="name"
-                                        referName="MATERIAL_PARAM"
-                                        @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, monthSaleGoalDetailsList[scope.$index])"
-                                        :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass'}"
-                                        :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
+                  <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].material" title="物料"
+                    valueKey="name" referName="MATERIAL_PARAM"
+                    @change="setClassify(scope.row.oneLevelClassify, scope.row.twoLevelClassify, monthSaleGoalDetailsList[scope.$index])"
+                    :dataMapping="{ materialCode: 'code', material: 'name', oneLevelClassify: 'oneClass', twoLevelClassify: 'twoClass'}"
+                    :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
                   </el-popover-select-v2>
                 </template>
               </el-table-column>
@@ -401,29 +323,24 @@
               </el-table-column>
               <el-table-column label="月份" align="center" 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 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>
+                  <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">
+              <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>
+                  <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>
@@ -438,18 +355,9 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -457,7 +365,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer">
@@ -466,51 +375,40 @@
       </div>
     </el-dialog>
     <!-- 批量修改对话框-->
-    <el-dialog title="批量修改" width="30%" :visible.sync="dialogUpdateMore.dialogFormVisible" append-to-body @closed="resetDialogUpdateMore">
+    <el-dialog title="批量修改" width="30%" :visible.sync="dialogUpdateMore.dialogFormVisible" append-to-body
+      @closed="resetDialogUpdateMore">
       <el-form>
         <el-form-item label="修改项" label-width="100px">
           <el-select @change="changeDialogData" v-model="dialogUpdateMore.updateName" placeholder="请选择需要批量修改的字段">
-            <el-option v-for="item in dialogUpdateMore.optionList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="item in dialogUpdateMore.optionList" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="修改值" label-width="100px">
-          <el-popover-select-v2 v-if="dialogUpdateMore.updateName === 1"
-                                v-model="dialogUpdateMore.updateData" title="销售组织" valueKey="name"
-                                referName="ORG_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入销售组织">
+          <el-popover-select-v2 v-if="dialogUpdateMore.updateName === 1" v-model="dialogUpdateMore.updateData"
+            title="销售组织" valueKey="name" referName="ORG_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入销售组织">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 2"
-                                v-model="dialogUpdateMore.updateData" title="销售区域" valueKey="name"
-                                referName="MK_SALESAREA_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入销售区域">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 2" v-model="dialogUpdateMore.updateData"
+            title="销售区域" valueKey="name" referName="MK_SALESAREA_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入销售区域">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 3"
-                                v-model="dialogUpdateMore.updateData" title="客户" valueKey="name"
-                                referName="CUSTOMER_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入客户">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 3" v-model="dialogUpdateMore.updateData"
+            title="客户" valueKey="name" referName="CUSTOMER_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入客户">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 4"
-                                v-model="dialogUpdateMore.updateData" title="部门" valueKey="name"
-                                referName="DEPT_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入部门">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 4" v-model="dialogUpdateMore.updateData"
+            title="部门" valueKey="name" referName="DEPT_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入部门">
           </el-popover-select-v2>
-          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 5"
-                                v-model="dialogUpdateMore.updateData" title="制单人" valueKey="name"
-                                referName="CONTACTS_PARAM"
-                                :dataMapping="{updateData: 'name'}"
-                                :source.sync="dialogUpdateMore" placeholder="请输入制单人">
+          <el-popover-select-v2 v-else-if="dialogUpdateMore.updateName === 5" v-model="dialogUpdateMore.updateData"
+            title="制单人" valueKey="name" referName="CONTACTS_PARAM" :dataMapping="{updateData: 'name'}"
+            :source.sync="dialogUpdateMore" placeholder="请输入制单人">
           </el-popover-select-v2>
-          <el-input v-else-if="dialogUpdateMore.updateName === 6"
-                    v-model="dialogUpdateMore.updateData" placeholder="请输入科室"
-          ></el-input>
-          <el-date-picker v-else-if="dialogUpdateMore.updateName === 7"
-            v-model="dialogUpdateMore.updateData" value-format="yyyy-MM"
-            type="month"
-            placeholder="选择月">
+          <el-input v-else-if="dialogUpdateMore.updateName === 6" v-model="dialogUpdateMore.updateData"
+            placeholder="请输入科室"></el-input>
+          <el-date-picker v-else-if="dialogUpdateMore.updateName === 7" v-model="dialogUpdateMore.updateData"
+            value-format="yyyy-MM" type="month" placeholder="选择月">
           </el-date-picker>
           <el-input v-else placeholder="请输入修改项" disabled></el-input>
         </el-form-item>
@@ -523,644 +421,741 @@
 </template>
 
 <script>
-import {
-  listMonthSaleGoal,
-  getMonthSaleGoal,
-  delMonthSaleGoal,
-  addMonthSaleGoal,
-  updateMonthSaleGoal,
-  submit
-} from "@/api/business/spd/goal_management/monthSaleGoal";
-import {
-  getMonthSaleGoalDetails,
-  delMonthSaleGoalDetails,
-  importData
-} from "@/api/business/spd/goal_management/monthSaleGoalDetails"
-import { getToken } from "@/utils/auth";
-import { getSummary } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    listMonthSaleGoal,
+    getMonthSaleGoal,
+    delMonthSaleGoal,
+    addMonthSaleGoal,
+    updateMonthSaleGoal,
+    submit
+  } from "@/api/business/spd/goal_management/monthSaleGoal";
+  import {
+    getMonthSaleGoalDetails,
+    delMonthSaleGoalDetails,
+    importData
+  } from "@/api/business/spd/goal_management/monthSaleGoalDetails"
+  import {
+    getToken
+  } from "@/utils/auth";
+  import {
+    getSummary
+  } from "../../../../api/business/spd/goal_management/commonWays";
+  import {
+    rollBack
+  } from "@/api/business/spd/goal_management/publicInterface";
 
-// 树形参照
-import TreeRefers from '@/components/Refers/treeRefer.vue'
-import ElPopoverSelectV2 from "@/components/popover-select-v2"
+  // 树形参照
+  import TreeRefers from '@/components/Refers/treeRefer.vue'
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
 
-export default {
-  name: "MonthSaleGoal",
-  components: {
-    TreeRefers, ElPopoverSelectV2
-  },
-  dicts: ["sys_status"],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: false,
-      // 总条数
-      total: 0,
-      // 月销售目标填报表格数据
-      monthSaleGoalList: [],
-      monthSaleGoalDetailsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        params: { beginTime: null, endTime: null }
-      },
-      documentDateRange: null,
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
+  export default {
+    name: "MonthSaleGoal",
+    components: {
+      TreeRefers,
+      ElPopoverSelectV2
+    },
+    dicts: ["sys_status", "oa_templete_id"],
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: false,
+        // 总条数
+        total: 0,
+        // 月销售目标填报表格数据
+        monthSaleGoalList: [],
+        monthSaleGoalDetailsList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          params: {
+            beginTime: null,
+            endTime: null
           }
-        }]
+        },
+        documentDateRange: null,
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        // 表单参数
+        form: {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          monthDetailsList: null
+        },
+        formDetails: {
+          id: null,
+          code: null,
+          saleOrg: null,
+          saleZone: null,
+          custom: null,
+          dept: null,
+          creator: null,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          materialCode: null,
+          material: null,
+          department: null,
+          num: null,
+          monthly: null,
+          goalValue: null
+        },
+        // 表单校验
+        rules: {
+          documentDate: [{
+            required: true,
+            message: '单据日期不能为空',
+            trigger: 'blur'
+          }],
+          annual: [{
+            required: true,
+            message: '年度不能为空',
+            trigger: 'blur'
+          }],
+          custom: [{
+            required: true,
+            message: '客户不能为空',
+            trigger: 'blur'
+          }],
+          saleZone: [{
+            required: true,
+            message: '销售区域不能为空',
+            trigger: 'blur'
+          }],
+          creator: [{
+            required: true,
+            message: '制单人不能为空',
+            trigger: 'blur'
+          }],
+          dept: [{
+            required: true,
+            message: '部门不能为空',
+            trigger: 'blur'
+          }]
+        },
+        // 子表导航名
+        activeName: 'monthSaleGoalDetails',
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/goal_management/monthSaleGoal/importData"
+        },
+        dialogUpdateMore: {
+          updateName: null,
+          dialogFormVisible: false,
+          updateData: null,
+          optionList: [{
+            value: 1,
+            label: '销售组织'
+          }, {
+            value: 2,
+            label: '销售区域'
+          }, {
+            value: 3,
+            label: '客户'
+          }, {
+            value: 4,
+            label: '部门'
+          }, {
+            value: 5,
+            label: '制单人'
+          }, {
+            value: 6,
+            label: '科室'
+          }, {
+            value: 7,
+            label: '月份'
+          }]
+        }
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询月销售目标填报列表 */
+      getList() {
+        this.loading = true;
+        listMonthSaleGoal(this.queryParams).then(response => {
+          this.monthSaleGoalList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
       },
-      // 表单参数
-      form: {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        monthDetailsList: null
+      getListDetails() {
+        this.loading = true
+        getMonthSaleGoalDetails(this.form.id).then(response => {
+          this.monthSaleGoalDetailsList = response.data
+          this.computeTotal()
+          this.form.monthDetailsList = this.monthSaleGoalDetailsList
+          updateMonthSaleGoal(this.form).then(response => {})
+          this.loading = false
+        })
       },
-      formDetails: {
-        id: null,
-        code: null,
-        saleOrg: null,
-        saleZone: null,
-        custom: null,
-        dept: null,
-        creator: null,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        department: null,
-        num: null,
-        monthly: null,
-        goalValue: null
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
       },
-      // 表单校验
-      rules: {
-        documentDate: [{ required: true, message: '单据日期不能为空', trigger: 'blur' }],
-        annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
-        custom: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
-        saleZone: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
-        dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }]
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          monthDetailsList: null
+        };
+        this.resetForm("form");
       },
-      // 子表导航名
-      activeName: 'monthSaleGoalDetails',
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/goal_management/monthSaleGoal/importData"
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
       },
-      dialogUpdateMore: {
-        updateName: null,
-        dialogFormVisible: false,
-        updateData: null,
-        optionList:[{value: 1, label: '销售组织'}, {value: 2, label: '销售区域'}, {value: 3, label: '客户'}, {value: 4, label: '部门'}, {value: 5, label: '制单人'}, {value: 6, label: '科室'}, {value: 7, label: '月份'}]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询月销售目标填报列表 */
-    getList() {
-      this.loading = true;
-      listMonthSaleGoal(this.queryParams).then(response => {
-        this.monthSaleGoalList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    getListDetails() {
-      this.loading = true
-      getMonthSaleGoalDetails(this.form.id).then(response => {
-        this.monthSaleGoalDetailsList = response.data
-        this.computeTotal()
-        this.form.monthDetailsList = this.monthSaleGoalDetailsList
-        updateMonthSaleGoal(this.form).then(response => {
-        })
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        monthDetailsList: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        goalName: null,
-        documentDate: null,
-        annual: null,
-        customCode: null,
-        custom: null,
-        saleZoneCode: null,
-        saleZone: null,
-        creatorCode: null,
-        creator: null,
-        deptCode: null,
-        dept: null,
-        goalSum: null,
-        notes: null,
-        status: null,
-        params: { beginTime: null, endTime: null }
-      }
-      this.documentDateRange = null
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      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.$store.state.user.orgName,
-        saleZone: this.form.saleZone,
-        custom: this.form.custom,
-        dept: this.form.dept,
-        creator: this.form.creator,
-        oneLevelClassifyCode: null,
-        oneLevelClassify: null,
-        twoLevelClassifyCode: null,
-        twoLevelClassify: null,
-        materialCode: null,
-        material: null,
-        department: null,
-        num: null,
-        monthly: new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0'),
-        goalValue: 0
-      }
-      this.monthSaleGoalDetailsList.push(list)
-      this.computeTotal()
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getMonthSaleGoal(id).then(response => {
-        this.form = response.data;
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        this.monthSaleGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthDetailsList))
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          code: null,
+          goalName: null,
+          documentDate: null,
+          annual: null,
+          customCode: null,
+          custom: null,
+          saleZoneCode: null,
+          saleZone: null,
+          creatorCode: null,
+          creator: null,
+          deptCode: null,
+          dept: null,
+          goalSum: null,
+          notes: null,
+          status: null,
+          params: {
+            beginTime: null,
+            endTime: null
+          }
+        }
+        this.documentDateRange = null
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.monthSaleGoalDetailsList = []
         this.open = true;
-        this.title = "修改--月销售目标填报";
-      });
-    },
-    // 复制按钮
-    handleCopy(id) {
-      this.reset();
-      getMonthSaleGoal(id).then(response => {
-        this.form = response.data;
-        this.form.id = null
-        this.form.code = null
-        this.form.goalSum = this.form.goalSum.toFixed(2)
-        this.form.documentDate = new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') + '-' + new Date().getDate().toString().padStart(2, '0')
+        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.monthSaleGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthDetailsList))
-        for (const element of this.monthSaleGoalDetailsList) {
-          element.id = null
-          element.code = null
+        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.$store.state.user.orgName,
+          saleZone: this.form.saleZone,
+          custom: this.form.custom,
+          dept: this.form.dept,
+          creator: this.form.creator,
+          oneLevelClassifyCode: null,
+          oneLevelClassify: null,
+          twoLevelClassifyCode: null,
+          twoLevelClassify: null,
+          materialCode: null,
+          material: null,
+          department: null,
+          num: null,
+          monthly: new Date().getFullYear().toString() + '-' + (new Date().getMonth() + 1).toString().padStart(2,
+            '0'),
+          goalValue: 0
         }
-        this.open = true;
-        this.title = "新增--月销售目标填报";
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      if (!this.justiceDetailsList()) {
-        return this.$message.error('子表有必填字段未填，或者目标值为0')
-      }
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            this.form.monthDetailsList = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
-            updateMonthSaleGoal(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.status = '0'
-            this.form.monthDetailsList = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
-            console.log(this.form);
-            addMonthSaleGoal(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        this.monthSaleGoalDetailsList.push(list)
+        this.computeTotal()
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getMonthSaleGoal(id).then(response => {
+          this.form = response.data;
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          this.monthSaleGoalDetailsList = JSON.parse(JSON.stringify(this.form.monthDetailsList))
+          this.open = true;
+          this.title = "修改--月销售目标填报";
+        });
+      },
+      // 复制按钮
+      handleCopy(id) {
+        this.reset();
+        getMonthSaleGoal(id).then(response => {
+          this.form = response.data;
+          this.form.id = null
+          this.form.code = null
+          this.form.goalSum = this.form.goalSum.toFixed(2)
+          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()) {
+          return this.$message.error('子表有必填字段未填，或者目标值为0')
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除月销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
-        return delMonthSaleGoal(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
-    },
-    handleDeleteDetails(index, row) {
-      if (this.form.id === null) {
-        this.monthSaleGoalDetailsList.splice(index, 1)
-        this.computeTotal()
-      } else {
-        if (row.id !== null) {
-          this.$modal.confirm('是否确认删除月销售目标填报明细序号为"' + (index + 1) + '"的数据项？').then(function () {
-            return delMonthSaleGoalDetails(row.id);
-          }).then(() => {
-            this.getListDetails();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {
-          });
-        } else {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              this.form.monthDetailsList = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
+              updateMonthSaleGoal(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              this.form.status = '0'
+              this.form.monthDetailsList = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
+              console.log(this.form);
+              addMonthSaleGoal(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除月销售目标填报单据编号为"' + row.code + '"的数据项？').then(function () {
+          return delMonthSaleGoal(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      handleDeleteDetails(index, row) {
+        if (this.form.id === null) {
           this.monthSaleGoalDetailsList.splice(index, 1)
-          this.$message.success('删除成功')
           this.computeTotal()
+        } else {
+          if (row.id !== null) {
+            this.$modal.confirm('是否确认删除月销售目标填报明细序号为"' + (index + 1) + '"的数据项？').then(function () {
+              return delMonthSaleGoalDetails(row.id);
+            }).then(() => {
+              this.getListDetails();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          } else {
+            this.monthSaleGoalDetailsList.splice(index, 1)
+            this.$message.success('删除成功')
+            this.computeTotal()
+          }
         }
-      }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('goal_management/monthSaleGoal/export', {
-        ...this.queryParams
-      }, `monthSaleGoal_${new Date().getTime()}.xlsx`)
-    },
-    handleExportDetails() {
-      this.download('goal_management/monthSaleGoalDetails/export', {
-        ...this.queryParams
-      }, `monthSaleGoalDetails_${new Date().getTime()}.xlsx`)
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {
-        });
-    },
-    // 复制明细
-    handleCopyDetails(row) {
-      let list = {
-        id: null,
-        code: row.code,
-        saleOrg: row.saleOrg,
-        saleZone: row.saleZone,
-        custom: row.custom,
-        dept: row.dept,
-        creator: row.creator,
-        oneLevelClassifyCode: row.oneLevelClassifyCode,
-        oneLevelClassify: row.oneLevelClassify,
-        twoLevelClassifyCode: row.twoLevelClassifyCode,
-        twoLevelClassify: row.twoLevelClassify,
-        materialCode: row.materialCode,
-        material: row.material,
-        department: row.department,
-        num: row.num,
-        monthly: row.monthly,
-        goalValue: row.goalValue
-      }
-      this.monthSaleGoalDetailsList.push(list)
-      this.computeTotal()
-    },
-    // 计算主表合计
-    computeTotal() {
-      let list = this.monthSaleGoalDetailsList
-      let sum = 0
-      for (const listElement of list) {
-        sum = (sum * 1000000 + listElement.goalValue * 1000000) / 1000000
-      }
-      this.form.goalSum = sum.toFixed(2)
-    },
-    getSummaries(param) { return getSummary(param) },
-    // 子表table加必填标志
-    addRedStar(h, { column }) {
-      return [
-        h('span', { style: 'color: #F56C6C' }, '*'),
-        h('span', '' + column.label)
-      ]
-    },
-    justiceDetailsList() {
-      const arr = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
-      for (const element of arr) {
-        const flag1 = (element.saleOrg !== null) && (element.saleZone !== null) && (element.custom !== null) && (element.dept !== null) && (element.creator !== null) && (element.materialCode !== null) && (element.material !== null) && (element.monthly !== null) && (element.goalValue !== 0)
-        const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !== undefined) && (element.dept !== undefined) && (element.creator !== undefined) && (element.materialCode !== undefined) && (element.material !== undefined) && (element.monthly !== undefined)
-        if (flag1 && flag2) {
-          return true
-        }
-      }
-      return false
-    },
-    setBeginAndEnd() {
-      let array = this.documentDateRange
-      if (this.documentDateRange !== null) {
-        this.queryParams.params.beginTime = array[0]
-        this.queryParams.params.endTime = array[1]
-      } else {
-        this.queryParams.params.beginTime = null
-        this.queryParams.params.endTime = null
-      }
-    },
-    handleCommand(command) {
-      if (command === 'export') {
-        console.log('导出主表');
-        this.handleExport()
-      } else if (command === 'exportDetails') {
-        console.log('导出明细');
-        this.handleExportDetails()
-      }
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.open = true;
-      if (this.open) {
-        this.upload.title = "月销售目标填报明细导入"
-        this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthSaleGoalDetails/importData/" + this.form.id
-      } else {
-        this.upload.title = "月销售目标填报导入";
-        this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthSaleGoal/importData"
-      }
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      if (this.open) {
-        this.download('goal_management/monthSaleGoalDetails/importTemplate', {
-        }, `monthSaleGoalDetails_${new Date().getTime()}.xlsx`)
-      } else {
-        this.download('goal_management/monthSaleGoal/importTemplate', {
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('goal_management/monthSaleGoal/export', {
+          ...this.queryParams
         }, `monthSaleGoal_${new Date().getTime()}.xlsx`)
-      }
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      if (this.open) {
-        let array = response.data
-        for (const arrayElement of array) {
-          arrayElement.id = null
-          this.monthSaleGoalDetailsList.push(arrayElement)
+      },
+      handleExportDetails() {
+        this.download('goal_management/monthSaleGoalDetails/export', {
+          ...this.queryParams
+        }, `monthSaleGoalDetails_${new Date().getTime()}.xlsx`)
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
+      },
+      // 复制明细
+      handleCopyDetails(row) {
+        let list = {
+          id: null,
+          code: row.code,
+          saleOrg: row.saleOrg,
+          saleZone: row.saleZone,
+          custom: row.custom,
+          dept: row.dept,
+          creator: row.creator,
+          oneLevelClassifyCode: row.oneLevelClassifyCode,
+          oneLevelClassify: row.oneLevelClassify,
+          twoLevelClassifyCode: row.twoLevelClassifyCode,
+          twoLevelClassify: row.twoLevelClassify,
+          materialCode: row.materialCode,
+          material: row.material,
+          department: row.department,
+          num: row.num,
+          monthly: row.monthly,
+          goalValue: row.goalValue
         }
+        this.monthSaleGoalDetailsList.push(list)
         this.computeTotal()
-      } else {
-        this.getList();
-      }
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    // 选择物料后，给一级分类和二级分类复赋值
-    setClassify(one, two, obj) {
-      const oneArray = one.split("&")
-      const twoArray = two.split("&")
-      obj.oneLevelClassifyCode = oneArray[1]
-      obj.oneLevelClassify = oneArray[0]
-      obj.twoLevelClassifyCode = twoArray[1]
-      obj.twoLevelClassify = twoArray[0]
-    },
-    // 批量修改对话框的方法
-    dialogUpdateMoreSave() {
-      console.log(this.dialogUpdateMore);
-      if (this.dialogUpdateMore.updateData === null) {
-        return this.$message.error('请输入修改值')
-      }
-      const array = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
-      if (array.length !== 0) {
-        let condition = this.dialogUpdateMore.updateName
-        for (const element of array) {
-          if (condition === 1) {
-            element.saleOrg = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 2) {
-            element.saleZone = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 3) {
-            element.custom = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 4) {
-            element.dept = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 5) {
-            element.creator = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 6) {
-            element.department = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
-          } else if (condition === 7) {
-            element.monthly = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+      },
+      // 计算主表合计
+      computeTotal() {
+        let list = this.monthSaleGoalDetailsList
+        let sum = 0
+        for (const listElement of list) {
+          sum = (sum * 1000000 + listElement.goalValue * 1000000) / 1000000
+        }
+        this.form.goalSum = sum.toFixed(2)
+      },
+      getSummaries(param) {
+        return getSummary(param)
+      },
+      // 子表table加必填标志
+      addRedStar(h, {
+        column
+      }) {
+        return [
+          h('span', {
+            style: 'color: #F56C6C'
+          }, '*'),
+          h('span', '' + column.label)
+        ]
+      },
+      justiceDetailsList() {
+        const arr = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
+        for (const element of arr) {
+          const flag1 = (element.saleOrg !== null) && (element.saleZone !== null) && (element.custom !== null) && (
+            element.dept !== null) && (element.creator !== null) && (element.materialCode !== null) && (element
+            .material !== null) && (element.monthly !== null) && (element.goalValue !== 0)
+          const flag2 = (element.saleOrg !== undefined) && (element.saleZone !== undefined) && (element.custom !==
+            undefined) && (element.dept !== undefined) && (element.creator !== undefined) && (element.materialCode !==
+            undefined) && (element.material !== undefined) && (element.monthly !== undefined)
+          if (flag1 && flag2) {
+            return true
           }
         }
-      }
-      this.monthSaleGoalDetailsList = array
-      this.dialogUpdateMore.dialogFormVisible = !this.dialogUpdateMore.dialogFormVisible
-      this.dialogUpdateMore.updateData = null
-      this.dialogUpdateMore.updateName = null
-    },
-    changeDialogData() {
-      this.dialogUpdateMore.updateData = null
-    },
-    resetDialogUpdateMore() {
-      this.dialogUpdateMore.updateName = null
-      this.dialogUpdateMore.updateData = null
-    },
-    async handleSubmit(row){
-      this.$modal.loading("提交中...");
-      try {
-        const {msg, code} = await submit(row.id);
-        if (code === 200) {
-          this.$modal.notifySuccess("提交成功");
-          this.$modal.closeLoading();
-          row.status = '1'
-          // this.getList(this.queryParams)
+        return false
+      },
+      setBeginAndEnd() {
+        let array = this.documentDateRange
+        if (this.documentDateRange !== null) {
+          this.queryParams.params.beginTime = array[0]
+          this.queryParams.params.endTime = array[1]
+        } else {
+          this.queryParams.params.beginTime = null
+          this.queryParams.params.endTime = null
         }
-      }catch (err) {
-        console.error(err);
-        this.$modal.closeLoading();
-      }
-    },
-    //收回
-    handleReback(){
-
-    },
-    //模板下载
-    handleTemplateDownload(){
-      this.download('/goal_management/annualSaleGoalDetails/importTemplate', {
-      }, `AnnualSaleGoal_${new Date().getTime()}.xlsx`)
-    },
-    //导入
-    handleImport(file){
-      this.loading = true;
-      let formData = new FormData()
-      formData.append('file',file.file)
-      importData(formData).then((res) => {
-        console.log('res',res);
-        if(res.code == '200'){
-          this.form.annualGoalMergeDetails.push.apply(this.form.annualGoalMergeDetails,res.data);
-          this.$message.success(res.msg);
-        }else{
-          this.$message.success(res.msg);
+      },
+      handleCommand(command) {
+        if (command === 'export') {
+          console.log('导出主表');
+          this.handleExport()
+        } else if (command === 'exportDetails') {
+          console.log('导出明细');
+          this.handleExportDetails()
         }
-        this.loading = false;
-      }).catch((e) => {
-        this.$message.error(e.message)
-      }).finally((e) => {
-        this.$refs['upload'].clearFiles();
-        this.resetList();
-        this.loading = false;
-      })
-    },
-    //模板下载
-    handleTemplateDownload(){
-      this.download('/goal_management/monthSaleGoalDetails/importTemplate', {
-      }, `MonthSaleGoal_${new Date().getTime()}.xlsx`)
-    },
-    //导入
-    handleImport(file){
-      this.loading = true;
-      let formData = new FormData()
-      formData.append('file',file.file)
-      importData(formData).then((res) => {
-        console.log('res',res);
-        if(res.code == '200'){
-          this.form.monthDetailsList.push.apply(this.form.monthDetailsList,res.data);
-          this.$message.success(res.msg);
-        }else{
-          this.$message.success(res.msg);
+      },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.open = true;
+        if (this.open) {
+          this.upload.title = "月销售目标填报明细导入"
+          this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthSaleGoalDetails/importData/" + this
+            .form.id
+        } else {
+          this.upload.title = "月销售目标填报导入";
+          this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthSaleGoal/importData"
         }
-        this.loading = false;
-      }).catch((e) => {
-        this.$message.error(e.message)
-      }).finally((e) => {
-        this.$refs['upload'].clearFiles();
-        this.resetList();
-        this.loading = false;
-      })
-    },
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        if (this.open) {
+          this.download('goal_management/monthSaleGoalDetails/importTemplate', {},
+            `monthSaleGoalDetails_${new Date().getTime()}.xlsx`)
+        } else {
+          this.download('goal_management/monthSaleGoal/importTemplate', {},
+            `monthSaleGoal_${new Date().getTime()}.xlsx`)
+        }
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response
+          .msg + "</div>", "导入结果", {
+            dangerouslyUseHTMLString: true
+          });
+        if (this.open) {
+          let array = response.data
+          for (const arrayElement of array) {
+            arrayElement.id = null
+            this.monthSaleGoalDetailsList.push(arrayElement)
+          }
+          this.computeTotal()
+        } else {
+          this.getList();
+        }
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      },
+      // 选择物料后，给一级分类和二级分类复赋值
+      setClassify(one, two, obj) {
+        const oneArray = one.split("&")
+        const twoArray = two.split("&")
+        obj.oneLevelClassifyCode = oneArray[1]
+        obj.oneLevelClassify = oneArray[0]
+        obj.twoLevelClassifyCode = twoArray[1]
+        obj.twoLevelClassify = twoArray[0]
+      },
+      // 批量修改对话框的方法
+      dialogUpdateMoreSave() {
+        console.log(this.dialogUpdateMore);
+        if (this.dialogUpdateMore.updateData === null) {
+          return this.$message.error('请输入修改值')
+        }
+        const array = JSON.parse(JSON.stringify(this.monthSaleGoalDetailsList))
+        if (array.length !== 0) {
+          let condition = this.dialogUpdateMore.updateName
+          for (const element of array) {
+            if (condition === 1) {
+              element.saleOrg = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 2) {
+              element.saleZone = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 3) {
+              element.custom = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 4) {
+              element.dept = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 5) {
+              element.creator = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 6) {
+              element.department = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            } else if (condition === 7) {
+              element.monthly = JSON.parse(JSON.stringify(this.dialogUpdateMore.updateData))
+            }
+          }
+        }
+        this.monthSaleGoalDetailsList = array
+        this.dialogUpdateMore.dialogFormVisible = !this.dialogUpdateMore.dialogFormVisible
+        this.dialogUpdateMore.updateData = null
+        this.dialogUpdateMore.updateName = null
+      },
+      changeDialogData() {
+        this.dialogUpdateMore.updateData = null
+      },
+      resetDialogUpdateMore() {
+        this.dialogUpdateMore.updateName = null
+        this.dialogUpdateMore.updateData = null
+      },
+      async handleSubmit(row) {
+        this.$modal.loading("提交中...");
+        try {
+          const {
+            msg,
+            code
+          } = await submit(row.id);
+          if (code === 200) {
+            this.$modal.notifySuccess("提交成功");
+            this.$modal.closeLoading();
+            row.status = '1'
+            // this.getList(this.queryParams)
+          }
+        } catch (err) {
+          console.error(err);
+          this.$modal.closeLoading();
+        }
+      },
+      //收回
+      handleReback(row) {
+        this.$modal.loading("收回中...");
+        let params = {
+          billCode: row.code,
+          fdId: row.flowId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "销售目标"
+          }).value,
+          billMaker: row.createBy,
+          type: "3"
+        }
+        rollBack(params).then(res => {
+          if (res.code === 200) {
+            this.$modal.notifySuccess("收回成功");
+            this.$modal.closeLoading();
+            this.getList(this.queryParams)
+          }
+        }).catch(err => {
+          this.$modal.closeLoading();
+        })
+      },
+      //模板下载
+      handleTemplateDownload() {
+        this.download('/goal_management/annualSaleGoalDetails/importTemplate', {},
+          `AnnualSaleGoal_${new Date().getTime()}.xlsx`)
+      },
+      //导入
+      handleImport(file) {
+        this.loading = true;
+        let formData = new FormData()
+        formData.append('file', file.file)
+        importData(formData).then((res) => {
+          console.log('res', res);
+          if (res.code == '200') {
+            // this.form.annualGoalMergeDetails.push.apply(this.form.annualGoalMergeDetails, res.data);
+            this.monthSaleGoalDetailsList.push.apply(this.monthSaleGoalDetailsList, res.data);
+            this.$message.success(res.msg);
+          } else {
+            this.$message.success(res.msg);
+          }
+          this.loading = false;
+        }).catch((e) => {
+          this.$message.error(e.message)
+        }).finally((e) => {
+          this.$refs['upload'].clearFiles();
+          this.resetList();
+          this.loading = false;
+        })
+      },
+      //模板下载
+      handleTemplateDownload() {
+        this.download('/goal_management/monthSaleGoalDetails/importTemplate', {},
+          `MonthSaleGoal_${new Date().getTime()}.xlsx`)
+      },
+      //导入
+      handleImport(file) {
+        this.loading = true;
+        let formData = new FormData()
+        formData.append('file', file.file)
+        importData(formData).then((res) => {
+          console.log('res', res);
+          if (res.code == '200') {
+            this.monthSaleGoalDetailsList.push.apply(this.monthSaleGoalDetailsList, res.data);
+            this.$message.success(res.msg);
+          } else {
+            this.$message.success(res.msg);
+          }
+          this.loading = false;
+        }).catch((e) => {
+          this.$message.error(e.message)
+        }).finally((e) => {
+          this.$refs['upload'].clearFiles();
+          this.resetList();
+          this.loading = false;
+        })
+      },
+    }
   }
-}
+
 </script>