Merge branch 'historical_route' into 'dev'

Historical route

See merge request new-business/drp-web!438

src/views/business/spd/bo/plan/index.vue

@@ -294,7 +294,6 @@ export default {
         isPage: true,
         title: ''
       },
-      customerOptions: [],
       personOptions: [],
       deptOptions: [],
       tableList: [],
@@ -549,12 +548,6 @@ export default {
       this.$refs.refer.init(this.referCondition)
     },
     selectionsToInput(selection) {
-      // 搜索区选择客户
-      if (this.referCondition.type == 'CUSTOMER_PARAM') {
-        this.customerOptions = selection
-        this.queryParams.customer = selection[0].id
-        this.queryParams.customerName = selection[0].name
-      }
       if (this.referCondition.type == 'CONTACTS_PARAM') {
         this.personOptions = selection
         this.queryParams.charger = selection[0].id
@@ -571,13 +564,6 @@ export default {
         this.queryParams.marketingAreaName = selection[0].name
       }
     },
-    // 搜索区树形选择
-    chooseTreeRefer(type, isPage, title) {
-      this.referCondition.type = type
-      this.referCondition.isPage = isPage
-      this.referCondition.title = title
-      this.$refs.tree.init(this.referCondition)
-    },
     selectionsToInput2(selection) {
       this.classOptions.push(selection)
       this.download.category = selection.code

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

@@ -96,7 +96,7 @@
           <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'}"
+                                  :dataMapping="{ deptId: 'id', dept: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
           </el-form-item>
@@ -279,7 +279,7 @@
             <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'}"
+                                    :dataMapping="{ deptId: 'id', dept: 'name'}"
                                     :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
@@ -596,7 +596,7 @@ export default {
         saleZone: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalTotal: null,
         notes: null,
@@ -644,7 +644,7 @@ export default {
         saleZone: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalTotal: null,
         notes: null,
@@ -715,6 +715,7 @@ export default {
     };
   },
   created() {
+    console.log(this.$store.state.user, 'this.$store.state.user')
     this.getList();
   },
   methods: {
@@ -757,7 +758,7 @@ export default {
         saleZone: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalTotal: null,
         notes: null,
@@ -786,7 +787,7 @@ export default {
         saleZone: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalTotal: null,
         notes: null,
@@ -811,7 +812,9 @@ export default {
       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() {

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

@@ -57,7 +57,7 @@
           <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'}"
+                                  :dataMapping="{ deptId: 'id', dept: 'name'}"
                                   :source.sync="queryParams" placeholder="请输入部门" @keyup.enter.native="handleQuery">
             </el-popover-select-v2>
           </el-form-item>
@@ -277,7 +277,7 @@
             <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'}"
+                                    :dataMapping="{ deptId: 'id', dept: 'name'}"
                                     :source.sync="form" placeholder="请输入部门">
               </el-popover-select-v2>
             </el-form-item>
@@ -764,7 +764,7 @@ export default {
         annual: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalCategory: null,
         goalTotal: null,
@@ -816,7 +816,7 @@ export default {
         annual: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalCategory: null,
         goalTotal: null,
@@ -940,7 +940,7 @@ export default {
         annual: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalCategory: null,
         goalTotal: null,
@@ -974,7 +974,7 @@ export default {
         annual: null,
         creatorCode: null,
         creator: null,
-        deptCode: null,
+        deptId: null,
         dept: null,
         goalCategory: null,
         goalTotal: null,

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

@@ -469,7 +469,7 @@
               </el-table-column>
             </el-table>
           </el-tab-pane>
-          <el-tab-pane label="区域目标汇总(月)" name="zoneGoalSum">
+          <el-tab-pane label="区域目标汇总(月)" name="zoneGoalSum" v-if="this.form.goalCategory == '销售区域'">
             <el-table max-height="300" :data="zoneGoalSumList">
               <el-table-column label="序号" type="index" width="55" align="center" fixed />
               <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">
@@ -503,7 +503,7 @@
               </el-table-column>
             </el-table>
           </el-tab-pane>
-          <el-tab-pane label="客户目标汇总(月)" name="customGoalSum">
+          <el-tab-pane label="客户目标汇总(月)" name="customGoalSum" v-if="this.form.goalCategory == '销售区域'">
             <el-table max-height="300" :data="customGoalSumList">
               <el-table-column label="序号" type="index" width="55" align="center" fixed />
               <el-table-column label="销售组织" align="center" prop="saleOrg" width="180">