Merge remote-tracking branch 'origin/release2.2new' into release2.2new

src/views/ecw/customer/index.vue

@@ -137,7 +137,7 @@
         <template v-slot="{row}">
           +{{row.defaultContactPhone}} <br/>
           <contacts :id="row.id" >
-            <el-button v-if="$route.path === '/customer/customer'" type="text">更多</el-button>
+            <el-button  type="text">更多</el-button>
           </contacts>
         </template>
       </el-table-column>

src/views/ecw/customer/transferCustomer.vue

@@ -66,7 +66,7 @@ export default {
       }).then(r=>{
         if(r.code === 0){
           if(r.data){
-            this.$message.error(r.data)
+            this.$message.warning(r.data)
             this.$emit('update:show',false)
             this.$emit('update:customerIds',[])
             this. service = '';

src/views/ecw/customerConfirm/index.vue

@@ -103,7 +103,12 @@
       </el-table-column>
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
       <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
-         <template v-slot="{row}">{{row.defaultContactPhone}}</template>
+        <template v-slot="{row}">
+          +{{row.defaultContactPhone}} <br/>
+          <contacts :id="row.id" >
+            <el-button  type="text">更多</el-button>
+          </contacts>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -364,6 +369,8 @@ import {handOverCustomer} from "../../../api/ecw/customer";
 import {getCountryListAll} from "@/api/ecw/country";
 import {getCreditPage} from "@/api/customer/credit";
 import transferCustomer from "@/views/ecw/customer/transferCustomer.vue";
+import Template from "@/views/cms/template/index.vue";
+import Contacts from "@/views/ecw/customer/components/contacts.vue";
 
 
 
@@ -381,6 +388,7 @@ export default {
     },
   },
   components: {
+    Contacts, Template,
     transferCustomer
   },
   data() {

src/views/ecw/customerToBeAssigned/index.vue

@@ -115,7 +115,10 @@
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
       <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
         <template v-slot="{row}">
-          +{{row.defaultContactPhone}}
+          +{{row.defaultContactPhone}} <br/>
+          <contacts :id="row.id" >
+            <el-button  type="text">更多</el-button>
+          </contacts>
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -175,12 +178,14 @@ 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";
+import Contacts from "@/views/ecw/customer/components/contacts.vue";
 export default {
   name: "EcwCustomertobeassignedIndex",
   activated() {
      this.getList()
     },
   components: {
+    Contacts,
     Template,
     upload,
     transferCustomer

src/views/ecw/myCustomerService/index.vue

@@ -104,7 +104,10 @@
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
       <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
         <template v-slot="{row}">
-          +{{row.defaultContactPhone}}
+          +{{row.defaultContactPhone}} <br/>
+          <contacts :id="row.id" >
+            <el-button  type="text">更多</el-button>
+          </contacts>
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -161,9 +164,12 @@ 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";
+import Contacts from "@/views/ecw/customer/components/contacts.vue";
 export default {
     name: "EcwMycustomerserviceIndex",
   components: {
+    Contacts, Template,
     upload,
     customerFollowList,
     customerComplaints,

src/views/ecw/oceanCustomer/index.vue

@@ -108,8 +108,11 @@
       </el-table-column>
       <el-table-column :label="$t('主联系人')" prop="defaultContactName"></el-table-column>
       <el-table-column :label="$t('主联系方式')" prop="defaultContactPhone">
-        <template v-slot="{row}" >
-          +{{row.defaultContactPhone}}
+        <template v-slot="{row}">
+          +{{row.defaultContactPhone}} <br/>
+          <contacts :id="row.id" >
+            <el-button  type="text">更多</el-button>
+          </contacts>
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -173,12 +176,15 @@ import upload from '@/components/ImageUpload'
 import {listServiceUser} from "@/api/system/user";
 import {getCountryListAll} from "@/api/ecw/country";
 import {getCreditPage} from "@/api/customer/credit";
+import Template from "@/views/cms/template/index.vue";
+import Contacts from "@/views/ecw/customer/components/contacts.vue";
 export default {
   name: "EcwOceancustomerIndex",
   activated() {
     this.getList()
   },
   components: {
+    Contacts, Template,
     upload
   },
   data() {