lizhuo merges Goal Management into dev at 2023-8-1 9:00

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

@@ -301,7 +301,6 @@
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
                                     referName="ORG_PARAM"
-                                    @blur="validateField(scope.row, 'saleOrg')"
                                     :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                     :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
               </el-popover-select-v2>

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

@@ -68,7 +68,7 @@
         <el-col :span="6">
           <el-form-item label="销售区域" prop="saleZone">
             <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
-                                  referName="ORG_PARAM"
+                                  referName="MK_SALESAREA_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入销售区域">
             </el-popover-select-v2>
@@ -290,7 +290,7 @@
           <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="ORG_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -344,7 +344,7 @@
             <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="ORG_PARAM" disabled
+                                      referName="MK_SALESAREA_PARAM" disabled
                                       :dataMapping="{saleZone: 'name'}"
                                       :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>
@@ -1269,6 +1269,7 @@ export default {
         return this.$message.error('当前标签不是年销售目标合并明细')
       }
       let query = JSON.parse(JSON.stringify(this.form))
+      console.log(query);
       if (query.goalCategory === null || query.goalCategory === '') {
         return this.$message.error('请输入目标分类')
       } else if (query.goalCategory === '销售区域') {

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

@@ -64,7 +64,7 @@
         <el-col :span="6">
           <el-form-item label="销售区域" prop="saleZone">
             <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
-                                  referName="ORG_PARAM"
+                                  referName="MK_SALESAREA_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
             </el-popover-select-v2>