Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/customer/edit.vue

@@ -412,7 +412,7 @@ import {getTradeCityList} from "@/api/ecw/region"
 import {getWarehouseList} from "@/api/ecw/warehouse"
 import CustomerLineTable from '@/components/CustomerLineTable'
 import {getCustomerSelect} from "@/api/ecw/customer"
-import {listServiceUser} from "@/api/system/user"
+import {listServiceUser, listSimpleUsers} from "@/api/system/user"
 import { getZhongPaoBest, getZhongPaoPage } from '@/api/ecw/zhongPao'
 import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
 import { getCountryListAll } from '@/api/ecw/country'
@@ -456,7 +456,7 @@ export default {
     getCustomerSelect().then(r => {
       this.customerSelect = r.data
     })
-    listServiceUser().then(r => {
+    listSimpleUsers().then(r => {
       this.serviceUserList = r.data
     })
     getCountryListAll().then(r => {

src/views/ecw/customer/index.vue

@@ -23,8 +23,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in customerServiceList"
+                       :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
@@ -209,8 +209,8 @@
           <el-col :span="12">
             <el-form-item label="客户经理" prop="customerService">
               <el-select v-model="form.customerService" placeholder="请选择客户经理">
-                <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                           :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                <el-option v-for="dict in customerServiceList"
+                           :key="dict.id" :label="dict.nickname" :value="dict.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -535,7 +535,6 @@ export default {
     //   this.nodeList = r.data
     // })
     listServiceUser().then(r=>{
-      console.log(r,'客服');
       this.customerServiceList = r.data;
     })
     getCountryListAll().then(r => {

src/views/ecw/customerConfirm/index.vue

@@ -23,8 +23,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in serviceStaffOptions"
+                       :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
@@ -195,8 +195,8 @@
 
           <el-form-item label="客户经理" prop="customerService">
             <el-select v-model="form.customerService" placeholder="请选择客户经理">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                         :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              <el-option v-for="dict in serviceStaffOptions"
+                         :key="dict.id" :label="dict.nickname" :value="dict.id" />
             </el-select>
           </el-form-item>
         </el-col>

src/views/ecw/customerToBeAssigned/index.vue

@@ -24,8 +24,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in customerServiceList"
+                     :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">

src/views/ecw/oceanCustomer/index.vue

@@ -24,8 +24,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in customerServiceList"
+                     :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">