|
@@ -124,6 +124,7 @@
|
|
|
</el-descriptions-item>
|
|
|
|
|
|
</el-descriptions>
|
|
|
+
|
|
|
<div style="margin-top: 20px">
|
|
|
<span class="font-small">商品信息</span>
|
|
|
</div>
|
|
@@ -167,6 +168,8 @@
|
|
|
<div style="float: right;margin: 20px" v-if="order!=null">
|
|
|
合计:<span class="color-danger">¥{{order.totalPrice.toFixed(2)}}</span>
|
|
|
</div>
|
|
|
+
|
|
|
+
|
|
|
<div style="margin: 60px 0px 20px 0px">
|
|
|
<span class="font-small">费用信息</span>
|
|
|
</div>
|
|
@@ -207,21 +210,25 @@
|
|
|
</span>
|
|
|
</el-descriptions-item>
|
|
|
</el-descriptions>
|
|
|
- <!-- <div style="margin-top: 20px">
|
|
|
+
|
|
|
+ <div style="margin-top: 20px">
|
|
|
<svg-icon icon-class="marker" style="color: #606266"></svg-icon>
|
|
|
- <span class="font-small">收款信息</span>
|
|
|
+ <span class="font-small">支付信息</span>
|
|
|
</div>
|
|
|
<el-table
|
|
|
border
|
|
|
:data="payments"
|
|
|
size="small"
|
|
|
style="width: 100%;margin-top: 20px" >
|
|
|
- <el-table-column label="支付订单号" align="center" prop="payCode" width="120px" />
|
|
|
- <el-table-column label="支付类型" align="center" prop="payTypeCode" />
|
|
|
+ <el-table-column label="支付单号" align="center" prop="payCode" width="120px" />
|
|
|
<el-table-column label="支付金额" align="center" prop="payMoney" />
|
|
|
+ <el-table-column label="类型" align="center" prop="payTypeCode" />
|
|
|
<el-table-column label="交易单号" align="center" prop="bankTransactionId" />
|
|
|
<el-table-column label="银行单号" align="center" prop="bankSerialNo" />
|
|
|
- </el-table> -->
|
|
|
+ <el-table-column label="创建时间" align="center" prop="createTime" />
|
|
|
+ <el-table-column label="支付时间" align="center" prop="payTime" />
|
|
|
+ </el-table>
|
|
|
+
|
|
|
<div style="margin-top: 20px">
|
|
|
<span class="font-small">操作信息</span>
|
|
|
</div>
|
|
@@ -365,7 +372,6 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
-
|
|
|
</el-form-item>
|
|
|
<el-form-item label="客户选择" prop="customerIds">
|
|
|
<el-table @selection-change="handleSelectionChange"
|
|
@@ -489,7 +495,8 @@ export default {
|
|
|
logs:[],
|
|
|
items:[],
|
|
|
express:[],
|
|
|
- traces:[]
|
|
|
+ traces:[],
|
|
|
+ payments:[],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -691,6 +698,7 @@ export default {
|
|
|
this.user = response.user;
|
|
|
this.logs = response.logs;
|
|
|
this.items = response.items;
|
|
|
+ this.payments=response.payments;
|
|
|
this.customerInfo=response.customer;
|
|
|
|
|
|
});
|