kevin_zhangl 3 лет назад
Родитель
Сommit
80e64d888a
1 измененных файлов с 37 добавлено и 17 удалено
  1. 37 17
      src/views/shop/order-list.vue

+ 37 - 17
src/views/shop/order-list.vue

@@ -9,37 +9,49 @@
     >
 			<el-table-column type="expand">
 				<template slot-scope="props">
-					<el-col :xs="24" :sm="24" :lg="24">
+					<el-col :xs="18" :sm="18" :lg="18">
 						<el-card class="box-card" shadow="hover">
 							<el-table v-loading="listLoading" fit lazy highlight-current-row :data="props.row.hasChildren">
-								<el-table-column align="center" :label="$t('shop.productCode')" prop="SKU_CODE"></el-table-column >
-								<el-table-column align="center" :label="$t('shop.productName')" prop="GOODS_TITLE"></el-table-column >
-								<el-table-column align="center" :label="$t('shop.qty')" prop="BUY_NUMS"></el-table-column >
-								<el-table-column align="center" :label="$t('shop.productPrice')">
+								<el-table-column align="center" :label="$t('shop.productCode')" prop="SKU_CODE">
+									<template slot-scope="{row}">
+										<span style="white-space: nowrap;">{{ row.SKU_CODE }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column min-width="200px" align="center" :label="$t('shop.productName')" prop="GOODS_TITLE">
 									<template slot-scope="{row}">
-										{{ $t('currency.sign') }} {{ row.REAL_PRICE | amountFilter }}
+										<span>{{ row.GOODS_TITLE }}</span>
 									</template>
 								</el-table-column >
+								<el-table-column align="center" :label="$t('shop.qty')" prop="BUY_NUMS">
+									<template slot-scope="{row}">
+										<span style="white-space: nowrap;">{{ row.BUY_NUMS }}</span>
+									</template>
+								</el-table-column>
+								<el-table-column align="center" :label="$t('shop.productPrice')">
+									<template slot-scope="{row}">
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | amountFilter }}</span>
+									</template>
+								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalPrice')">
 									<template slot-scope="{row}">
-										{{ $t('currency.sign') }} {{ row | priceAmountFilter | amountFilter }}
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | amountFilter }}</span>
 									</template>
-								</el-table-column >
+								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
 									<template slot-scope="{row}">
-										{{ row | bvFilter | amountFilter }}
+										<span style="white-space: nowrap;">{{ row | bvFilter | amountFilter }}</span>
 									</template>
-								</el-table-column >
+								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.taxRate')">
 									<template slot-scope="{row}">
-										{{ row.TAX_RATE / 100 }}
+										<span style="white-space: nowrap;">{{ row.TAX_RATE / 100 }}</span>
 									</template>
-								</el-table-column >
+								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.taxAmount')">
 									<template slot-scope="{row}">
-										{{ $t('currency.sign') }} {{ row | taxAmountFilter | amountFilter }}
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | amountFilter }}</span>
 									</template>
-								</el-table-column >
+								</el-table-column>
 							</el-table>
 						</el-card>
 					</el-col>
@@ -51,8 +63,16 @@
 				</template>
 			</el-table-column>
       <el-table-column align="center" :label="$t('shop.memberCode')" prop="USER_NAME" min-width="150px"></el-table-column>
-      <el-table-column align="center" :label="$t('shop.memberName')" prop="REAL_NAME" min-width="150px"></el-table-column>
-      <el-table-column align="center" :label="$t('shop.recipientName')" prop="CONSIGNEE" min-width="140px"></el-table-column>
+      <el-table-column align="center" :label="$t('shop.memberName')" prop="REAL_NAME" min-width="150px">
+				<template slot-scope="{row}">
+					<span style="white-space: pre-wrap; display: inline-block; min-width: 120px; word-break: break-all;">{{ row.REAL_NAME }}</span>
+				</template>
+			</el-table-column>
+      <el-table-column align="center" :label="$t('shop.recipientName')" prop="CONSIGNEE" min-width="150px">
+				<template slot-scope="{row}">
+					<span style="white-space: pre-wrap; display: inline-block; min-width: 120px; word-break: break-all;">{{ row.CONSIGNEE }}</span>
+				</template>
+			</el-table-column>
       <el-table-column align="center" :label="$t('shop.phoneNumber')" prop="MOBILE" min-width="130px"></el-table-column>
       <el-table-column align="center" :label="$t('shop.shippingAddress')" prop="FULL_ADDRESS" min-width="140px">
 				<template slot-scope="{row}">
@@ -129,6 +149,7 @@ export default {
       listLoading: true,
       downloadLoading: false,
       listQuery: {
+				v: 2,
         page: 1,
         pageSize: 20
       },
@@ -171,7 +192,6 @@ export default {
 
 <style>
 .el-table th.el-table__cell > .cell {
-	/*word-break: keep-all;*/
 	white-space: nowrap;
 }