开单与订单列表

ghs/src/views/order/components/order-detail.vue

@@ -18,92 +18,64 @@
 			</template>
 			<div class="order-manage-wrap">
 
-				<!-- 信息 -->
+				<!-- 花材信息 -->
 				<div class="card-wrap">
-					<div class="card-tit">基本信息</div>
+					<div class="card-tit">花材信息</div>
 					<div class="card-body">
-						<el-table :data="data">
-							<el-table-column property="orderSn" label="订单编号" width="280px"></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="debt" label="欠款"></el-table-column>
-							<el-table-column property="status" label="状态"></el-table-column>
+						<el-table :data="data[0].product" show-summary>
+							<el-table-column label="花材图片">
+								<template slot-scope="scope">
+									<cl-avatar
+										shape="square"
+										:size="30"
+										:src="scope.row.cover"
+									></cl-avatar>
+								</template>
+							</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="unitPrice" label="小计"></el-table-column>
 						</el-table>
 					</div>
 				</div>
 
-				<!-- 收花人信息 -->
+				<!-- 客户信息 -->
 				<div class="card-wrap">
-					<div class="card-tit">收花人</div>
+					<div class="card-tit">客户</div>
 					<div class="card-body">
 						<el-table :data="data">
-							<el-table-column property="receiveUserName" label="昵称"></el-table-column>
-							<el-table-column property="receiveMobile" label="手机号"></el-table-column>
-							<el-table-column property="deadline" label="收花时间">
-								<template slot-scope="scope">
-									<span>{{ scope.row.deadline | formatTime }}</span>
-								</template>
-							</el-table-column>
-							<el-table-column property="receiveFullAddress" label="地址" width="280px">
-								<template slot-scope="scope">
-									<span>{{scope.row.receiveAddress}}{{scope.row.receiveFloor}}（{{ scope.row.receiveFullAddress }}）</span>
-								</template>
-							</el-table-column>
-							<el-table-column property="print" label="操作" width="110px">
-								<!-- <el-button type="primary" icon="el-icon-printer"></el-button> -->
-							</el-table-column>
+							<el-table-column property="customName" label="名称"></el-table-column>
+							<el-table-column property="customMobile" label="手机号"></el-table-column>
+							<el-table-column property="customAddress" label="地址" width="280px"></el-table-column>
 						</el-table>
 					</div>
 				</div>
 
-				<!-- 订花人信息 -->
+				<!-- 信息 -->
 				<div class="card-wrap">
-					<div class="card-tit">订花人</div>
+					<div class="card-tit">基本信息</div>
 					<div class="card-body">
 						<el-table :data="data">
-							<el-table-column property="bookName" label="昵称"></el-table-column>
-							<el-table-column property="bookMobile" label="手机号"></el-table-column>
-							<el-table-column label="要求送达时间">
+							<el-table-column property="orderSn" label="订单编号" width="280px"></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="debt" label="欠款">
 								<template slot-scope="scope">
-									<template v-if="scope.row.reachDate != '0000-00-00'">
-									<span>{{ scope.row.reachDate}}</span>&nbsp;&nbsp;
-									<span v-if="scope.row.reachPeriod == 0">上午</span>
-									<span v-else-if="scope.row.reachPeriod == 1">下午</span>
-									<span v-else>晚上</span>
-									<span v-if="scope.row.anonymity == 1">（客户要求匿名）</span>
-									</template>
+									<span v-if="scope.row.debt == 1">是</span><span v-else></span>
 								</template>
 							</el-table-column>
-							<el-table-column property="cardInfo" label="祝福语"></el-table-column>
-						</el-table>
-					</div>
-				</div>
-
-				<!-- 花材信息 -->
-				<div class="card-wrap">
-					<div class="card-tit">花材信息</div>
-					<div class="card-body">
-						<el-table :data="data.goodsInfoList" show-summary>
-							<el-table-column label="花材图片">
+							<el-table-column property="status" label="状态">
 								<template slot-scope="scope">
-									<cl-avatar
-										shape="square"
-										:size="40"
-										:src="scope.row.smallCoverUrl | default_avatar"
-										:style="{ margin: 'auto' }"
-									></cl-avatar>
+									<span>{{ scope.row.status | constantfilter('ORDER_STATUS') }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column property="title" label="花材名称"></el-table-column>
-							<el-table-column property="goodsId" label="ID"></el-table-column>
-							<el-table-column property="goodsStyleName" label="属性"></el-table-column>
-							<el-table-column property="num" label="数量"></el-table-column>
-							<el-table-column property="unitPrice" label="小计"></el-table-column>
 						</el-table>
 					</div>
 				</div>
 
+
 			</div>
 		</el-drawer>
 	</div>
@@ -181,4 +153,4 @@ export default {
 		border: 1px solid $borderColor;
 	}
 }
-</style>
+</style>

ghs/src/views/order/list.vue

@@ -253,8 +253,8 @@ export default {
 							width: 110
 						},
 						{
-							prop: 'shopAdminId',
-							label: '开单',
+							prop: 'shopAdminName',
+							label: '开单人',
 							align: 'center',
 							width: 110
 						}
@@ -366,4 +366,4 @@ export default {
 		top: 9px;
 	}
 }
-</style>
+</style>