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

src/views/ecw/customer/query.vue

@@ -5,7 +5,7 @@
         <div style="display: flex;justify-content: space-between;align-items: flex-end;">
           <h2>{{$t('查看')}}</h2>
           <div>
-            <el-button type="primary" size="small" v-has-permi="['ecw:customer:query-edit']" @click="$router.push('/customer/edit/' + id)">{{$t('编辑')}}</el-button>
+            <el-button type="primary" size="small" v-has-permi="['ecw:customer:query-edit']" @click="$router.push('/customer/add-edit/' + id)">{{$t('编辑')}}</el-button>
             <el-button v-has-permi="['ecw:customer:query-quoted-price']" @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
             <el-button v-has-permi="['ecw:customer:query-follow-up']" type="primary" size="small" @click="customerFollowFn('follow')">{{$t('跟进')}}</el-button>
             <el-button v-has-permi="['ecw:customer:query-customer-complaint']" type="primary" size="small" @click="customerFollowFn('complain')">{{$t('客诉')}}</el-button>

src/views/ecw/myCustomerService/index.vue

@@ -363,7 +363,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push('/customer/edit/' + row.id)
+      this.$router.push('/customer/add-edit/' + row.id)
       // this.reset();
       // const id = row.id;
       // getCustomer(id).then(response => {

src/views/ecw/oceanCustomer/index.vue

@@ -368,7 +368,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push('/customer/edit/' + row.id)
+      this.$router.push('/customer/add-edit/' + row.id)
       // this.reset();
       // const id = row.id;
       // getCustomer(id).then(response => {

src/views/ecw/productBrank/Empower/components/showContacts.vue

@@ -7,28 +7,41 @@ export default {
   data(){
     return {
       phoneList:[],
+      show:false
     }
   },
   mounted() {
     let phone = this.phoneString
     this.phoneList = phone.split('(;)');
-    console.log(this.phoneList)
   }
 }
 </script>
 
 <template>
 <div>
- <div v-for="(item, index) in phoneList" :key="index" >
-     <div>
-         <span>联系人{{index + 1}}：</span>
-         <span>{{item.split('(@)')[1]}}</span>
+  <el-dialog :modal-append-to-body="false" :append-to-body="true" :visible.sync="show">
+    <div v-for="(item, index) in phoneList" :key="index" >
+      <div>
+        <span>联系人{{index + 1}}：</span>
+        <span>{{item.split('(@)')[1]}}</span>
+      </div>
+      <div>
+        <span>联系电话{{index + 1}}：</span>
+        <span>+{{item.split('(@)')[0]}}</span>
+      </div>
+    </div>
+  </el-dialog>
+   <div>
+    <div>
+      <span>联系人：</span>
+      <span>{{phoneList[0] ? phoneList[0].split('(@)')[1] : ''}}</span>
+    </div>
+     <div style="white-space: normal;">
+       <span>联系电话：</span>
+       <span>+{{phoneList[0] ? phoneList[0].split('(@)')[0] : ''}}</span>
+        <el-button v-if="phoneList.length > 1" @click="show = true;" style="margin-left: 10px;" size="mini" type="text" >更多</el-button>
      </div>
-     <div>
-         <span>联系电话{{index + 1}}：</span>
-         <span>+{{item.split('(@)')[0]}}</span>
-     </div>
- </div>
+   </div>
 </div>
 </template>
 

src/views/ecw/productBrank/Empower/index.vue

@@ -45,7 +45,7 @@
             <el-table-column
               :label="$t('客户号码')">
                 <template v-slot="{row}">
-            <show-contacts :phone-string="row.phone" ></show-contacts>
+               <show-contacts :phone-string="row.phone" ></show-contacts>
                 </template>
             </el-table-column>
             <el-table-column
@@ -79,7 +79,7 @@
               :label="$t('客户名称')">
             </el-table-column>
             <el-table-column
-                    width="210"
+                    width="260"
               :label="$t('客户号码')">
                 <template v-slot="{row}">
                     <show-contacts :phone-string="row.phone" ></show-contacts>