Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into pre-release

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

@@ -364,7 +364,7 @@ export default {
     getProductTypeNames() {
       return (ids) => {
         if (ids) {
-          const idsArr = ids.split(',')
+          const idsArr = ids.toString().split(',')
           const strArr = []
           this.productTypeList.forEach(item => {
             if (idsArr.includes(item.id.toString())) {
@@ -491,8 +491,8 @@ export default {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
-      });  
+      });
     }
   }
 }
-</script>
+</script>
\ No newline at end of file

src/views/ecw/customer/index.vue

@@ -273,7 +273,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      -->    
+      -->
       <el-form-item :label="$t('入公海时间')" v-show="showSearch">
         <el-date-picker
           type="datetimerange"
@@ -630,7 +630,7 @@
       </el-table-column>
       <el-table-column :label="$t('信用等级')" :prop="isChinese ? 'creditLevelNameZh' : 'creditLevelNameEn'"></el-table-column>
       -->
-      
+
       <el-table-column
         :label="$t('主联系人')"
         prop="defaultContactName"
@@ -2134,7 +2134,7 @@ export default {
     },
     getProductTypeNames(ids) {
       if (ids) {
-        const idsArr = ids.split(',')
+        const idsArr = ids.toString().split(',')
         const strArr = []
         this.productTypeList.forEach(item => {
           if (idsArr.includes(item.id.toString())) {

src/views/ecw/customerConfirm/index.vue

@@ -1292,7 +1292,7 @@ export default {
     },
     getProductTypeNames(ids) {
       if (ids) {
-        const idsArr = ids.split(',')
+        const idsArr = ids.toString().split(',')
         const strArr = []
         this.productTypeList.forEach(item => {
           if (idsArr.includes(item.id.toString())) {

src/views/ecw/customerToBeAssigned/index.vue

@@ -1003,7 +1003,7 @@ export default {
     },
     getProductTypeNames(ids) {
       if (ids) {
-        const idsArr = ids.split(',')
+        const idsArr = ids.toString().split(',')
         const strArr = []
         this.productTypeList.forEach(item => {
           if (idsArr.includes(item.id.toString())) {

src/views/ecw/myCustomerService/index.vue

@@ -1274,7 +1274,7 @@ export default {
     },
     getProductTypeNames(ids) {
       if (ids) {
-        const idsArr = ids.split(',')
+        const idsArr = ids.toString().split(',')
         const strArr = []
         this.productTypeList.forEach(item => {
           if (idsArr.includes(item.id.toString())) {

src/views/ecw/oceanCustomer/index.vue

@@ -1244,7 +1244,7 @@ export default {
     },
     getProductTypeNames(ids) {
       if (ids) {
-        const idsArr = ids.split(',')
+        const idsArr = ids.toString().split(',')
         const strArr = []
         this.productTypeList.forEach(item => {
           if (idsArr.includes(item.id.toString())) {