feature/oms:获取销售工程师列表时，添加销售总监角色

src/views/base/agent/components/AgentEdit.vue

@@ -36,7 +36,7 @@
         <el-col :span="12">
           <select-user
             ref="selectUser"
-            :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+            :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
             @save="selectUser" />
           <el-form-item label="销售人员" prop="belongSale">
             <el-input v-model="form.belongSale" readonly suffix-icon="el-icon-search" @focus="choose" />

src/views/base/distributor/components/DistrEdit.vue

@@ -36,7 +36,7 @@
         <el-col :span="12">
           <select-user
             ref="selectUser"
-            :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+            :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
             @save="selectUser" />
           <el-form-item label="销售人员" prop="belongSale">
             <el-input v-model="form.belongSale" readonly suffix-icon="el-icon-search" @focus="choose" />

src/views/base/distributor/components/Transfer.vue

@@ -26,7 +26,7 @@
     <!-- 选择负责人弹窗 -->
     <select-user
       ref="selectUser"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
       @save="selectUser" />
   </el-dialog>
 </template>

src/views/consult/components/Edit.vue

@@ -95,7 +95,7 @@
       </span>
     </el-dialog>
     <!-- 选择销售工程师弹窗 -->
-    <select-user ref="selectSales" :query-params="{ roles: ['SalesEngineer'] }" @save="selectSales" />
+    <select-user ref="selectSales" :query-params="{ roles: ['SalesEngineer', 'SalesDirector'] }" @save="selectSales" />
     <!-- 地区搜索 -->
     <selectCity ref="selectCity" @submit="submitCity" />
   </div>

src/views/consult/components/FollowUp.vue

@@ -145,7 +145,7 @@
       </span>
     </el-dialog>
     <!-- 选择销售工程师弹窗 -->
-    <select-user ref="selectSales" :query-params="{ roles: ['SalesEngineer'] }" @save="selectSales" />
+    <select-user ref="selectSales" :query-params="{ roles: ['SalesEngineer', 'SalesDirector'] }" @save="selectSales" />
     <!-- 客户 -->
     <select-customer ref="selectCustomer" @save="selectCustomer" />
     <!-- 选择项目 -->

src/views/contract/components/ApplyContract.vue

@@ -89,14 +89,12 @@
     <!-- 选择销售工程师弹窗 -->
     <select-user
       ref="selectSales"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
       @save="selectSales" />
   </div>
 </template>
 
 <script>
-  import axios from 'axios'
-  import { getToken } from '@/utils/token'
   import to from 'await-to-js'
   import contractApi from '@/api/contract'
   import SelectUser from '@/components/select/SelectUser'
@@ -170,12 +168,12 @@
         }
       },
       // 上传图片
-      setFile(res, file, index) {
+      setFile(res, file) {
         this.form.fileName = file.name
         this.form.fileUrl = res.Data
         return true
       },
-      removeFile(file, list, index) {
+      removeFile() {
         this.form.fileName = ''
         this.form.fileUrl = ''
       },

src/views/customer/components/Allocate.vue

@@ -20,7 +20,7 @@
     <!--    <Transfer ref="transfer" />-->
     <select-user
       ref="selectUser"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
       @save="selectUser" />
   </el-dialog>
 </template>

src/views/customer/components/Shift.vue

@@ -10,7 +10,7 @@
   <el-dialog title="转移客户" :visible.sync="visible" width="30%" @close="handleClose">
     <select-user
       ref="selectUser"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
       @save="selectUser" />
     <el-form ref="form" label-width="80px" :model="form" :rules="rules">
       <el-form-item label="接收对象" prop="SalesName">

src/views/customer/list.vue

@@ -343,7 +343,7 @@
           this.getDicts('cust_idy'),
           userApi.getList({
             orderBy: 'userName',
-            roles: ['SalesEngineer', 'ProductLineManager'],
+            roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'],
             pageNum: 1,
             pageSize: 50,
           }),

src/views/proj/business/components/BusinessAdd.vue

@@ -108,7 +108,7 @@
     <!-- 选择销售工程师弹窗 -->
     <select-user
       ref="selectSales"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
       @save="selectSales" />
     <!-- 选择经销商弹窗 -->
     <select-distributor ref="selectDistributor" @save="selectDistributor" />

src/views/proj/business/components/BusinessEdit.vue

@@ -7,27 +7,27 @@
     width="60%"
     @close="close">
     <el-steps :active="activeSteps" align-center style="margin: -15px 0 15px 0">
-      <el-step title="修改项目"/>
-      <el-step title="添加产品"/>
+      <el-step title="修改项目" />
+      <el-step title="添加产品" />
     </el-steps>
 
     <el-form ref="form" :model="form" :rules="rules">
       <el-row v-if="activeSteps === 1" :gutter="20">
         <el-col :span="8">
           <el-form-item label="关联客户" prop="custName">
-            <el-input v-model="form.custName" disabled readonly/>
+            <el-input v-model="form.custName" disabled readonly />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="产品线" prop="productLine">
             <el-select v-model="form.productLine" placeholder="请选择" style="width: 100%" @change="changeProductLine">
-              <el-option v-for="item in productLineOptions" :key="item.key" :label="item.value" :value="item.key"/>
+              <el-option v-for="item in productLineOptions" :key="item.key" :label="item.value" :value="item.key" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="项目名称" prop="nboName">
-            <el-input v-model="form.nboName"/>
+            <el-input v-model="form.nboName" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -37,19 +37,19 @@
               :disabled="form.id > 0"
               readonly
               suffix-icon="el-icon-search"
-              @focus="handleSelectSale"/>
+              @focus="handleSelectSale" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="是否大项目" prop="isBig">
             <el-select v-model="form.isBig" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in yesOrNoOptions" :key="item.key" :label="item.value" :value="item.key"/>
+              <el-option v-for="item in yesOrNoOptions" :key="item.key" :label="item.value" :value="item.key" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="项目预算" prop="nboBudget">
-            <amount-input v-model.trim="form.nboBudget" placeholder="请输入金额"/>
+            <amount-input v-model.trim="form.nboBudget" placeholder="请输入金额" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -63,21 +63,18 @@
               placeholder="销售模式"
               style="width: 100%"
               @change="changeSalesModel">
-              <el-option v-for="dict in salesModelOptions" :key="dict.key" :label="dict.value" :value="dict.key"/>
+              <el-option v-for="dict in salesModelOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="渠道名称"
-            prop="distributorName"
-            :required="form.salesModel && form.salesModel !== '10'">
+          <el-form-item label="渠道名称" prop="distributorName" :required="form.salesModel && form.salesModel !== '10'">
             <el-input
               v-model="form.distributorName"
               :disabled="form.salesModel === '10'"
               readonly
               suffix-icon="el-icon-search"
-              @focus="handleSelectDistributor"/>
+              @focus="handleSelectDistributor" />
           </el-form-item>
         </el-col>
         <div v-if="form.salesModel !== '10'">
@@ -87,12 +84,12 @@
                 v-model="form.dealerSalesName"
                 readonly
                 suffix-icon="el-icon-search"
-                @focus="handleSelectDistributorContact"/>
+                @focus="handleSelectDistributorContact" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="渠道销售电话/微信" prop="dealerSalesContact">
-              <el-input v-model="form.dealerSalesContact"/>
+              <el-input v-model="form.dealerSalesContact" />
             </el-form-item>
           </el-col>
         </div>
@@ -102,7 +99,7 @@
         <el-col :span="8">
           <el-form-item label="项目来源" prop="nboSource">
             <el-select v-model="form.nboSource" clearable placeholder="项目来源" style="width: 100%">
-              <el-option v-for="dict in nboSourceOptions" :key="dict.key" :label="dict.value" :value="dict.key"/>
+              <el-option v-for="dict in nboSourceOptions" :key="dict.key" :label="dict.value" :value="dict.key" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -113,13 +110,13 @@
               :disabled="!isBid"
               readonly
               suffix-icon="el-icon-search"
-              @focus="handleSelectCustomerBid"/>
+              @focus="handleSelectCustomerBid" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="采购方式" prop="purchasingWay">
             <el-select v-model="form.purchasingWay" placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in purchasingWayOptions" :key="item.key" :label="item.value" :value="item.key"/>
+              <el-option v-for="item in purchasingWayOptions" :key="item.key" :label="item.value" :value="item.key" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -140,7 +137,7 @@
         <!--   B => A     -->
         <el-col :span="8">
           <el-form-item label="资金来源" prop="capitalSource">
-            <el-input v-model="form.capitalSource"/>
+            <el-input v-model="form.capitalSource" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -150,17 +147,17 @@
               placeholder="选择日期"
               style="width: 100%"
               type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"/>
+              value-format="yyyy-MM-dd HH:mm:ss" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户决策人" prop="makerName">
-            <el-input v-model="form.makerName"/>
+            <el-input v-model="form.makerName" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户决策部门" prop="makerDept">
-            <el-input v-model="form.makerDept"/>
+            <el-input v-model="form.makerDept" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -169,22 +166,22 @@
               v-model="form.contactName"
               readonly
               suffix-icon="el-icon-search"
-              @focus="handleSelectCustomerContact"/>
+              @focus="handleSelectCustomerContact" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户联系人电话/微信" prop="contactTelephone">
-            <el-input v-model="form.contactTelephone"/>
+            <el-input v-model="form.contactTelephone" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="竞争公司" prop="competitor">
-            <el-input v-model="form.competitor"/>
+            <el-input v-model="form.competitor" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="客户倾向厂家" prop="customerIntentionFactory">
-            <el-input v-model="form.customerIntentionFactory"/>
+            <el-input v-model="form.customerIntentionFactory" />
           </el-form-item>
         </el-col>
         <!--        <el-col :span="8">-->
@@ -214,7 +211,7 @@
       <el-row v-if="activeSteps === 1" :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注信息" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注信息" rows="3" show-word-limit type="textarea"/>
+            <el-input v-model="form.remark" placeholder="请输入备注信息" rows="3" show-word-limit type="textarea" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -225,7 +222,7 @@
             ref="productTable"
             :product-data="productData"
             @changeProductData="changeProductData"
-            @delProductData="delProductData"/>
+            @delProductData="delProductData" />
         </el-col>
       </el-row>
     </el-form>
@@ -235,30 +232,30 @@
       <el-button v-if="activeSteps === 2" :loading="loading" type="primary" @click="save">提 交</el-button>
     </div>
     <!-- 选择客户弹窗 -->
-    <select-customer ref="selectCustomer" @save="selectCustomer"/>
+    <select-customer ref="selectCustomer" @save="selectCustomer" />
     <!-- 选择客户联系人弹窗 -->
     <select-customer-contact
       ref="selectCustomerContact"
       :default-customer="customerInfo"
       :query-params="queryCustomerContact"
-      @save="selectCustomerContact"/>
+      @save="selectCustomerContact" />
     <!-- 选择客户招标信息弹窗 -->
-    <select-customer-bid ref="selectCustomerBid" :query-params="queryCustomerContact" @save="selectCustomerBid"/>
+    <select-customer-bid ref="selectCustomerBid" :query-params="queryCustomerContact" @save="selectCustomerBid" />
     <!-- 选择销售工程师弹窗 -->
     <select-user
       ref="selectSales"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
-      @save="selectSales"/>
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
+      @save="selectSales" />
     <!-- 选择经销商弹窗 -->
-    <select-distributor ref="selectDistributor" @save="selectDistributor"/>
+    <select-distributor ref="selectDistributor" @save="selectDistributor" />
     <!-- 选择渠道销售人员弹窗 -->
     <select-distributor-contact
       ref="selectDistributorContact"
       :default-dist="distInfo"
       :query-params="queryDistContact"
-      @save="selectDistributorContact"/>
+      @save="selectDistributorContact" />
     <!-- 选择产品弹窗 -->
-    <select-product ref="selectProduct" multiple @save="selectProduct"/>
+    <select-product ref="selectProduct" multiple @save="selectProduct" />
   </el-dialog>
 </template>
 
@@ -299,10 +296,10 @@
       },
     },
     data() {
-      const validateDistributor = (rule, value, callback) => {
-        if (!value && this.form.salesModel && this.form.salesModel !== '10') callback(new Error('请选择经销商/代理商'))
-        else callback()
-      }
+      // const validateDistributor = (rule, value, callback) => {
+      //   if (!value && this.form.salesModel && this.form.salesModel !== '10') callback(new Error('请选择经销商/代理商'))
+      //   else callback()
+      // }
       return {
         canSelectBid: true,
         activeSteps: 1,
@@ -379,7 +376,6 @@
           // makerDept: [{ required: true, trigger: ['blur', 'change'], message: '请选择客户决策部门' }],
           // customerIntentionFactory: [{ required: true, trigger: ['blur', 'change'], message: '请输入客户倾向厂家' }],
           // competitor: [{ required: true, trigger: ['blur', 'change'], message: '请输入竞争公司' }],
-
           // isAdoptDashoo: [{ required: true, trigger: ['blur', 'change'], message: '请选择是或否' }],
           // dashooParamFile: [{ validator: validateAdoptDashoo, trigger: ['blur', 'change'], message: '请选择上传文件' }],
         },
@@ -413,8 +409,7 @@
         this.customerInfo = val
       },
     },
-    created() {
-    },
+    created() {},
     mounted() {
       this.getOptions()
     },
@@ -605,7 +600,7 @@
         this.productData = this.productData.filter((item) => item.prodId !== data.prodId)
       },
       async getProductData(busId) {
-        const {data} = await businessApi.getProductByBusinessId({id: busId})
+        const { data } = await businessApi.getProductByBusinessId({ id: busId })
         if (data) {
           this.productData = data
         }
@@ -616,7 +611,7 @@
         if (bid) {
           this.canSelectBid = false
           this.isBid = true
-          this.selectCustomer([{id: bid.custId, custName: bid.cuctName}])
+          this.selectCustomer([{ id: bid.custId, custName: bid.cuctName }])
           this.selectCustomerBid([bid])
         } else {
           this.canSelectBid = true
@@ -635,9 +630,9 @@
             this.isBid = true
           }
           this.queryCustomerContact.custId = this.form.custId
-          this.customerInfo = {custId: this.form.custId, custName: this.form.custName}
-          this.queryDistContact = {distId: this.form.distributorId}
-          this.distInfo = {distId: this.form.distributorId, distName: this.form.distributorName}
+          this.customerInfo = { custId: this.form.custId, custName: this.form.custName }
+          this.queryDistContact = { distId: this.form.distributorId }
+          this.distInfo = { distId: this.form.distributorId, distName: this.form.distributorName }
           this.getProductData(row.id)
         }
         this.$nextTick(() => this.$refs['form'].clearValidate())

src/views/proj/business/components/Transfer.vue

@@ -26,7 +26,7 @@
     <!-- 选择负责人弹窗 -->
     <select-user
       ref="selectUser"
-      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager'] }"
+      :query-params="{ roles: ['SalesEngineer', 'ProductLineManager', 'SalesDirector'] }"
       @save="selectUser" />
   </el-dialog>
 </template>