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

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

@@ -65,7 +65,7 @@
         <el-col :span="6">
           <el-form-item label="销售区域" prop="saleZone">
             <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
-                                  referName="CUSTOMER_PARAM"
+                                  referName="MK_SALESAREA_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
@@ -240,7 +240,7 @@
           <el-col :span="6">
             <el-form-item label="销售区域" prop="saleZone">
               <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -290,7 +290,7 @@
         </el-row>
       </el-form>
       <div id="addDetails">
-        <el-row :gutter="10" class="mb8" style="float: right; margin-right: 30px">
+        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
           </el-col>
@@ -300,7 +300,7 @@
           <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="ORG_PARAM"
                                     @blur="validateField(scope.row, 'saleOrg')"
                                     :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                     :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
@@ -310,7 +310,7 @@
           <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="MK_SALESAREA_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
               </el-popover-select-v2>

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="CUSTOMER_PARAM"
+                                  referName="ORG_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="CUSTOMER_PARAM"
+                                    referName="ORG_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -323,7 +323,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-row :gutter="10" class="mb8" style="float: right; margin-right: 30px">
+      <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>
@@ -335,7 +335,7 @@
             <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="annualSaleGoalMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{saleOrg: 'name'}"
                                       :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" 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="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{saleZone: 'name'}"
                                       :source.sync="annualSaleGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>

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

@@ -97,7 +97,7 @@
           </el-form-item>
           <el-form-item v-if="queryParams.goalCategory === '销售区域'" label="销售区域" prop="saleZone">
             <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
-                                  referName="DEPT_PARAM"
+                                  referName="ORG_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入销售区域">
             </el-popover-select-v2>
@@ -350,7 +350,7 @@
         </el-row>
       </el-form>
 
-      <el-row :gutter="10" class="mb8" style="float: right; margin-right: 30px">
+      <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>
@@ -362,7 +362,7 @@
             <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                       :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
                 </el-popover-select-v2>
@@ -371,7 +371,7 @@
             <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="monthGoalMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                       :source.sync="monthGoalMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>
@@ -471,7 +471,7 @@
             <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="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                       :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入销售组织">
                 </el-popover-select-v2>
@@ -480,7 +480,7 @@
             <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="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                       :source.sync="zoneGoalSumList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>
@@ -505,7 +505,7 @@
             <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="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                       :source.sync="customGoalSumList[scope.$index]" placeholder="请输入销售组织">
                 </el-popover-select-v2>
@@ -514,7 +514,7 @@
             <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="CUSTOMER_PARAM" disabled
+                                      referName="ORG_PARAM" disabled
                                       :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                       :source.sync="customGoalSumList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>

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

@@ -61,7 +61,7 @@
       </el-form-item>
       <el-form-item label="销售区域" prop="saleZone">
         <el-popover-select-v2 v-model="queryParams.saleZone" title="销售区域" valueKey="name"
-                              referName="CUSTOMER_PARAM"
+                              referName="ORG_PARAM"
                               :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                               :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
         </el-popover-select-v2>
@@ -230,7 +230,7 @@
           <el-col :span="6">
             <el-form-item label="销售区域" prop="saleZone">
               <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="ORG_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -270,7 +270,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-row :gutter="10" class="mb8">
+      <el-row :gutter="10" class="mb8" style="margin-left: 94%">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
         </el-col>
@@ -282,7 +282,7 @@
             <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
+                                      referName="ORG_PARAM"
                                       :dataMapping="{saleOrg: 'name'}"
                                       :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
                 </el-popover-select-v2>
@@ -291,7 +291,7 @@
             <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="monthReturnGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
+                                      referName="ORG_PARAM"
                                       :dataMapping="{saleZone: 'name'}"
                                       :source.sync="monthReturnGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>

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

@@ -55,7 +55,7 @@
     </el-form-item>
     <el-form-item label="销售区域" prop="saleZone">
       <el-popover-select-v2 v-model="queryParams.saleZoneCode" title="销售区域" valueKey="name"
-                            referName="DEPT_PARAM"
+                            referName="ORG_PARAM"
                             :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                             :source.sync="queryParams" placeholder="请输入销售区域">
       </el-popover-select-v2>
@@ -235,7 +235,7 @@
         <el-col :span="6">
           <el-form-item label="销售区域" prop="saleZone">
             <el-popover-select-v2 v-model="form.saleZoneCode" title="销售区域" valueKey="name"
-                                  referName="DEPT_PARAM"
+                                  referName="ORG_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="form" placeholder="请输入销售区域">
             </el-popover-select-v2>
@@ -286,10 +286,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增 行</el-button>
-      </el-col>-->
+    <el-row :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>
@@ -301,7 +298,7 @@
           <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                    referName="CUSTOMER_PARAM" disabled
+                                    referName="ORG_PARAM" disabled
                                     :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                     :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入销售组织">
               </el-popover-select-v2>
@@ -310,7 +307,7 @@
           <el-table-column label="销售区域" align="center" prop="saleZone" width="180">
             <template slot-scope="scope">
               <el-popover-select-v2 v-model="monthReturnMergeDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM" disabled
+                                    referName="ORG_PARAM" disabled
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="monthReturnMergeDetailsList[scope.$index]" placeholder="请输入销售区域">
               </el-popover-select-v2>

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="CUSTOMER_PARAM"
+                                  referName="ORG_PARAM"
                                   :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入销售区域" @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
@@ -248,7 +248,7 @@
           <el-col :span="6">
             <el-form-item label="销售区域" prop="saleZone">
               <el-popover-select-v2 v-model="form.saleZone" title="销售区域" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
+                                    referName="ORG_PARAM"
                                     :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                     :source.sync="form" placeholder="请输入销售区域">
               </el-popover-select-v2>
@@ -296,7 +296,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-row :gutter="10" class="mb8" style="float: right; margin-right: 30px">
+      <el-row :gutter="10" class="mb8" style="margin-left: 94%">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
         </el-col>
@@ -308,7 +308,7 @@
             <el-table-column label="销售组织" align="center" prop="saleOrg" width="180" :render-header="addRedStar">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
+                                      referName="ORG_PARAM"
                                       :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
                                       :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
                 </el-popover-select-v2>
@@ -317,7 +317,7 @@
             <el-table-column label="销售区域" align="center" prop="saleZone" width="180" :render-header="addRedStar">
               <template slot-scope="scope">
                 <el-popover-select-v2 v-model="monthSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                      referName="CUSTOMER_PARAM"
+                                      referName="ORG_PARAM"
                                       :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
                                       :source.sync="monthSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
                 </el-popover-select-v2>
@@ -561,7 +561,7 @@ export default {
         annual: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
         custom: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
         saleZone: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
-        creator: [{ required: true, message: '销售区域不能为空', trigger: 'blur' }],
+        creator: [{ required: true, message: '制单人不能为空', trigger: 'blur' }],
         dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }]
       },
       // 参照条件