分配货位测试

ghsApp/src/pagesPurchase/info.vue

@@ -87,36 +87,44 @@
 			</view>
 			<view style="text-align: right;">
 				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="">获取货位</button>
+				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="margin-left:20upx;">锁定货位</button>
 				<button @tap="assignOrder()" class="admin-button-com mini-btn blue" style="margin-left:20upx;">隐藏货位</button>
 			</view>
 			<view class="module-com content-box">
 				<view class="commodity-view">
 					<view class="commodity-list">
-						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx" class="commodity-item" @click="pageTo({ url: '/admin/item/detail?id='+s.productId })" >
-							<image class="item-icon" :src="s.cover" alt="" />
-							<view class="item-info">
-								<view class="info-line">
-									<text class="item-name">
-										<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" v-if="s.presell == 1">预售</text>
-										{{ s.name }}
-									</text>
-									<text class="item-price">
-										<text class="price">¥{{s.totalPrice ? parseFloat(s.totalPrice) : 0}}</text>
-									</text>
+						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx" @click="pageTo({ url: '/admin/item/detail?id='+s.productId })" >
+							<view class="commodity-item">
+								<image class="item-icon" :src="s.cover" alt="" />
+								<view class="item-info">
+									<view class="info-line">
+										<text class="item-name">
+											<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" v-if="s.presell == 1">预售</text>
+											{{ s.name }}
+										</text>
+										<text class="item-price">
+											<text class="price">¥{{s.totalPrice ? parseFloat(s.totalPrice) : 0}}</text>
+										</text>
+									</view>
+									<view class="info-line" style="position:relative;">
+										<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s,0)">打标签</text>
+										<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s,1)">打价码</text>
+										<text class="item-count">
+										{{ parseFloat(s.itemNum) }}扎 × 
+										<text style="font-weight:bold;margin-left:5upx;" v-if="s.aboutPrice==1">约</text>
+										<text v-else style="margin-left:5upx;"></text>
+										¥{{ s.bigPrice ? parseFloat(s.bigPrice) : 0 }}
+										</text>
+										<text style="font-weight:bold;color:red;position:absolute;top:45upx;font-size:20upx;">
+											<text style="font-weight:bold;color:#CCCCCC;margin-right:20upx;">{{s.ratio}}{{s.smallUnit}}装</text>
+											<text v-if="s.refundNum>0">已退{{s.refundNum}}</text>
+										</text>
+									</view>
 								</view>
-								<view class="info-line" style="position:relative;">
-									<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s,0)">打标签</text>
-									<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s,1)">打价码</text>
-									<text class="item-count">
-									{{ parseFloat(s.itemNum) }}扎 × 
-									<text style="font-weight:bold;margin-left:5upx;" v-if="s.aboutPrice==1">约</text>
-									<text v-else style="margin-left:5upx;"></text>
-									¥{{ s.bigPrice ? parseFloat(s.bigPrice) : 0 }}
-									</text>
-									<text style="font-weight:bold;color:red;position:absolute;top:45upx;font-size:20upx;">
-										<text style="font-weight:bold;color:#CCCCCC;margin-right:20upx;">{{s.ratio}}{{s.smallUnit}}装</text>
-										<text v-if="s.refundNum>0">已退{{s.refundNum}}</text>
-									</text>
+							</view>
+							<view v-if="!$util.isEmpty(s.sendList)" style="margin-bottom:10upx;">
+								<view v-for="(send, sendIndex) in s.sendList">
+									{{ send.customName }} 货位:{{ send.seatSn }} 数量:{{ send.num }}
 								</view>
 							</view>
 						</view>
@@ -535,7 +543,7 @@ export default {
 			padding: 20upx;
 			.commodity-item {
 				display: flex;
-				margin-bottom: 20upx;
+				margin-bottom:5upx;
 				.item-icon {
 					flex-shrink: 0;
 					width: 140upx;