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

src/views/ecw/customer/components/quickCreate.vue

@@ -77,7 +77,7 @@ export default {
         type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
         createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
         source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
-        customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
+        customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
         status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
         founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
       },

src/views/ecw/customer/edit.vue

@@ -102,8 +102,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="跟进客服" prop="customerService">
-                <el-select v-model="form.customerService" placeholder="请选择跟进客服">
+              <el-form-item label="客户经理" prop="customerService">
+                <el-select v-model="form.customerService" placeholder="请选择客户经理">
                   <el-option v-for="item in serviceUserList"
                              :key="item.id" :label="item.nickname" :value="item.id" />
                 </el-select>
@@ -459,7 +459,7 @@ export default {
         type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
         createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
         source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
-        customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
+        customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
         status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
         founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
       },

src/views/ecw/customer/index.vue

@@ -21,8 +21,8 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="跟进客服" prop="customerService">
-        <el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
+      <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-select>
@@ -73,7 +73,7 @@
           <dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
         </template>
       </el-table-column>
-      <el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
       <el-table-column label="客户状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -211,8 +211,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跟进客服" prop="customerService">
-              <el-select v-model="form.customerService" placeholder="请选择跟进客服">
+            <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-select>
@@ -519,7 +519,7 @@ export default {
         type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
         // createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
         source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
-        customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
+        customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
         status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
         founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
       },

src/views/ecw/customer/query.vue

@@ -26,7 +26,7 @@
             <el-descriptions-item label="客户类别">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_TYPE, customer.type) }}</el-descriptions-item>
 <!--            <el-descriptions-item label="联系方式">{{ customer }}</el-descriptions-item>-->
             <el-descriptions-item label="推介人">{{ promoter  }}</el-descriptions-item>
-            <el-descriptions-item label="跟进客服">{{ customerService }}</el-descriptions-item>
+            <el-descriptions-item label="客户经理">{{ customerService }}</el-descriptions-item>
             <el-descriptions-item label="公司名称">{{ customer.company }}</el-descriptions-item>
             <el-descriptions-item label="联系地址">{{ customer.address }}</el-descriptions-item>
             <el-descriptions-item label="创建时间">{{ parseTime(customer.createTime) }}</el-descriptions-item>

src/views/ecw/customerConfirm/index.vue

@@ -21,8 +21,8 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="跟进客服" prop="customerService">
-        <el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
+      <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-select>
@@ -70,7 +70,7 @@
           <dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
         </template>
       </el-table-column>
-      <el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
       <el-table-column label="客户状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -193,8 +193,8 @@
         </el-col>
         <el-col :span="12">
 
-          <el-form-item label="跟进客服" prop="customerService">
-            <el-select v-model="form.customerService" placeholder="请选择跟进客服">
+          <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-select>
@@ -291,8 +291,8 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="openHandOver" width="500px" append-to-body>
       <el-form ref="handOverForm" :model="handOverForm" :rules="rules" label-width="80px">
-        <el-form-item label="跟进客服" prop="customerServiceId">
-          <el-select v-model="handOverForm.customerServiceId" placeholder="请选择跟进客服" clearable filterable>
+        <el-form-item label="客户经理" prop="customerServiceId">
+          <el-select v-model="handOverForm.customerServiceId" placeholder="请选择客户经理" clearable filterable>
             <el-option v-for="user in serviceStaffOptions"
                        :key="user.id" :value="user.id"
                        :label="user.nickname" />

src/views/ecw/customerToBeAssigned/index.vue

@@ -22,8 +22,8 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="跟进客服" prop="customerService">
-        <el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
+      <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-select>
@@ -74,7 +74,7 @@
           <dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
         </template>
       </el-table-column>
-      <el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
       <el-table-column label="客户状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -176,7 +176,7 @@ export default {
         type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
         // createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
         source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
-        customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
+        customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
         status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
         founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
       },
@@ -332,7 +332,7 @@ export default {
     },
     transferFn(){
       if(!this.service){
-        return this.$message.warning('请选择跟进客服！');
+        return this.$message.warning('请选择客户经理！');
       }
       handOverCustomer({
         customerServiceId:this.service,

src/views/ecw/oceanCustomer/index.vue

@@ -22,8 +22,8 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="跟进客服" prop="customerService">
-        <el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
+      <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-select>
@@ -83,7 +83,7 @@
           <dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
         </template>
       </el-table-column>
-      <el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
       <el-table-column label="客户状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -181,7 +181,7 @@ export default {
         type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
         // createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
         source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
-        customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
+        customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
         status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
         founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
       },
@@ -365,7 +365,7 @@ export default {
     },
     transferFn(val){
       if(!this.service){
-        return this.$message.warning('请选择跟进客服！');
+        return this.$message.warning('请选择客户经理！');
       }
       handOverCustomer({
         customerServiceId:this.service,