Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/customer/edit.vue

@@ -106,7 +106,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('客户经理')" prop="customerService">
-                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(!!(customerId !== '0' && form.customerService) || isCustomerServiceConfirmed)">
+                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(customerId !== '0' || isCustomerServiceConfirmed)">
                   <el-option v-for="item in serviceUserList"
                              :key="item.id" :label="item.nickname" :value="item.id" />
                 </el-select>

src/views/ecw/customer/index.vue

@@ -117,7 +117,7 @@
           <span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
       </el-table-column>
       <el-table-column :label="$t('出货渠道')">
         <template slot-scope="{row}">
@@ -609,14 +609,6 @@ export default {
       const country = this.countryList.find((e) => e.id === cellValue)
       return country?.nameZh
     },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/customerConfirm/index.vue

@@ -98,7 +98,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -414,10 +414,6 @@ export default {
       const country = this.countryList.find((e) => e.id === cellValue)
       return country?.nameZh
     },
-    customerServiceFn(row){
-     let obj =  this.serviceStaffOptions.find(item => item.id === row.customerService)
-      return obj ? obj.nickname : '';
-    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/customerToBeAssigned/index.vue

@@ -110,7 +110,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -159,9 +159,11 @@ import {listServiceUser} from "@/api/system/user";
 import {getCountryListAll} from "@/api/ecw/country";
 import {getCreditPage} from "@/api/customer/credit";
 import transferCustomer from "@/views/ecw/customer/transferCustomer";
+import Template from "@/views/cms/template/index.vue";
 export default {
   name: "customerToBeAssigned",
   components: {
+    Template,
     upload,
     transferCustomer
   },
@@ -426,14 +428,6 @@ export default {
         this.exportLoading = false;
       }).catch(() => {});
     },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    }
   },
   watch:{
     selectCustomerList(val){

src/views/ecw/myCustomerService/index.vue

@@ -98,7 +98,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -227,14 +227,6 @@ export default {
       const country = this.countryList.find((e) => e.id === cellValue)
       return country?.nameZh
     },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/oceanCustomer/index.vue

@@ -104,7 +104,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" >
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -393,14 +393,6 @@ export default {
       this.isBatch = false;
 
     },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    },
     transferFn(val){
       if(!this.service){
         return this.$message.warning(this.$t('请选择客户经理！'));