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

src/views/ecw/customer/index.vue

@@ -105,7 +105,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
         <template slot-scope="{row}">
-          <p style="display:inline-block;white-space: pre;">{{$l(row, 'name')}}</p>
+          <p style="display:inline-block;white-space:pre-wrap;">{{$l(row, 'name')}}</p>
           <el-tag v-if="row.isInOpenSea" size="mini">{{ $t('公') }}</el-tag>
         </template>
       </el-table-column>

src/views/ecw/customer/query.vue

@@ -15,7 +15,7 @@
         <el-card style="margin-top: 15px;">
           <el-descriptions :column="4" border>
             <el-descriptions-item :label="$t('客户编号')">{{ customer.number }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('客户名称')">{{ customer.name}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('客户名称')"><span style="white-space: pre-wrap;">{{ customer.name}}</span></el-descriptions-item>
             <el-descriptions-item :label="$t('客户英文名称')">{{customer.nameEn }}</el-descriptions-item>
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>

src/views/ecw/customerConfirm/index.vue

@@ -87,7 +87,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          <p style="display:inline-block;white-space: pre;">{{$l(row, 'name')}}</p>
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/customerToBeAssigned/index.vue

@@ -98,7 +98,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          <p style="display:inline-block;white-space: pre;">{{$l(row, 'name')}}</p>
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/myCustomerService/index.vue

@@ -87,7 +87,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          <p style="display:inline-block;white-space: pre;">{{$l(row, 'name')}}</p>
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">

src/views/ecw/oceanCustomer/index.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name" >
         <template v-slot="{row}">
-          <p style="display:inline-block;white-space: pre;">{{$l(row, 'name')}}</p>
+          <p style="display:inline-block;white-space: pre-wrap;">{{$l(row, 'name')}}</p>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">