|
|
@@ -198,9 +198,9 @@
|
|
|
<p>品牌：{{ scope.row.productBrand }}</p>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="价格/货号" width="120" align="center">
|
|
|
+ <el-table-column label="货号" width="120" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <p>价格：￥{{ scope.row.productPrice }}</p>
|
|
|
+ <!-- <p>价格：￥{{ scope.row.productPrice }}</p> -->
|
|
|
<p>货号：{{ scope.row.productSn }}</p>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -214,11 +214,11 @@
|
|
|
{{ scope.row.productQuantity }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="小计" width="120" align="center">
|
|
|
+ <!-- <el-table-column label="小计" width="120" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
￥{{ scope.row.productPrice * scope.row.productQuantity }}
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
</el-table>
|
|
|
<div style="float: right; margin: 20px">
|
|
|
合计：<span class="color-danger">￥{{ order.totalAmount }}</span>
|
|
|
@@ -646,13 +646,12 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
formatAddresss(order) {
|
|
|
- let str = order.receiverProvince;
|
|
|
+ let str = order.receiverProvince || '';
|
|
|
if (order.receiverCity != null) {
|
|
|
- str += " " + order.receiverCity;
|
|
|
+ str += " " + (order.receiverCity || '');
|
|
|
}
|
|
|
- str += " " + order.receiverRegion;
|
|
|
- str += " " + order.receiverDetailAddress;
|
|
|
- console.log('str',str)
|
|
|
+ str += " " + (order.receiverRegion || '');
|
|
|
+ str += " " + (order.receiverDetailAddress || '');
|
|
|
return str;
|
|
|
},
|
|
|
onSelectRegion(data) {
|
