shish 2 лет назад
Родитель
Сommit
2b173fed60
1 измененных файлов с 9 добавлено и 6 удалено
  1. 9 6
      ghs/src/views/order/components/order-detail.vue

+ 9 - 6
ghs/src/views/order/components/order-detail.vue

@@ -29,9 +29,9 @@
 								</template>
 								</template>
 							</el-table-column>
 							</el-table-column>
 							<el-table-column property="name" label="花材名称"></el-table-column>
 							<el-table-column property="name" label="花材名称"></el-table-column>
-							<el-table-column property="property" label="属性"></el-table-column>
 							<el-table-column property="num" label="数量"></el-table-column>
 							<el-table-column property="num" label="数量"></el-table-column>
-							<el-table-column property="unitPrice" label="小计"></el-table-column>
+							<el-table-column property="xhUnitPrice" label="单价"></el-table-column>
+							<el-table-column property="xhPrice" label="小计"></el-table-column>
 						</el-table>
 						</el-table>
 					</div>
 					</div>
 				</div>
 				</div>
@@ -50,13 +50,16 @@
 					<div class="card-tit">基本信息</div>
 					<div class="card-tit">基本信息</div>
 					<div class="card-body">
 					<div class="card-body">
 						<el-table :data="data">
 						<el-table :data="data">
-							<el-table-column property="orderSn" label="订单编号" width="280px"></el-table-column>
+							<el-table-column property="orderSn" label="单号" width="180px"></el-table-column>
+							<el-table-column property="sendNum" label="编号"></el-table-column>
 							<el-table-column property="sendCost" label="运费"></el-table-column>
 							<el-table-column property="sendCost" label="运费"></el-table-column>
-							<el-table-column property="prePrice" label="合计"></el-table-column>
-							<el-table-column property="actPrice" label="实付款"></el-table-column>
+							<el-table-column property="packCost" label="打包费"></el-table-column>
+							<el-table-column property="prePrice" label="原价"></el-table-column>
+							<el-table-column property="tkPrice" label="退款"></el-table-column>
+							<el-table-column property="actPrice" label="实际金额"></el-table-column>
 							<el-table-column property="debt" label="欠款">
 							<el-table-column property="debt" label="欠款">
 								<template slot-scope="scope">
 								<template slot-scope="scope">
-									<span v-if="scope.row.debt == 1">是</span><span v-else></span>
+									<div v-if="scope.row.debt == 1">是</div><div v-else>-</div>
 								</template>
 								</template>
 							</el-table-column>
 							</el-table-column>
 							<el-table-column property="status" label="状态">
 							<el-table-column property="status" label="状态">