lilei 1 anno fa
parent
commit
42fa9e2350

+ 14 - 14
pagesA/digitalShelf/choosePart.vue

@@ -48,12 +48,6 @@
 						 		</view>
 						 		<view class="item-detail">
 									<view class="item-detail-info">
-										<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
-											<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
-											<view style="width: 50%;flex-grow: 1;">
-												<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
-											</view>
-										</view>
 										<view class="flex justify_between">
 											<view>
 												<text class="item-detail-text flex_1">{{item.code}}</text>
@@ -61,6 +55,12 @@
 											</view>
 											<text class="item-detail-text" v-if="item.affiliation=='SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
 										</view>
+										<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
+											<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
+											<view style="width: 50%;flex-grow: 1;">
+												<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+											</view>
+										</view>
 										<view class="flex justify_between">
 											<view class="item-detail-text flex_1">
 												<view @click="openPriceModal(item,1)">
@@ -110,16 +110,16 @@
 							</view>
 							<view class="item-detail">
 								<view class="item-detail-info">
+									<view class="flex justify_between">
+										<text class="item-detail-text flex_1">{{item.code}}</text>
+										<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+									</view>
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
 										<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
 										<view style="width: 50%;flex-grow: 1;">
 											<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 										</view>
 									</view>
-									<view class="flex justify_between">
-										<text class="item-detail-text flex_1">{{item.code}}</text>
-										<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
-									</view>
 									<view class="flex justify_between">
 										<view class="item-detail-text flex_1" @click="openPriceModal(item,0)">
 											<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice">{{item.price?'¥'+item.price:'暂无价格'}}</text>
@@ -188,16 +188,16 @@
 							</view>
 							<view class="item-detail">
 								<view class="item-detail-info">
+									<view class="flex justify_between">
+										<text class="item-detail-text flex_1">{{item.code}}</text>
+										<text class="item-detail-text" v-if="item.affiliation!='SUPER_CATALOGUE'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
+									</view>
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'" style="padding-bottom: 5px;">
 										<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
 										<view style="width: 50%;flex-grow: 1;">
 											<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 										</view>
 									</view>
-									<view class="flex justify_between">
-										<text class="item-detail-text flex_1">{{item.code}}</text>
-										<text class="item-detail-text" v-if="item.affiliation!='SUPER_CATALOGUE'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
-									</view>
 									<view class="flex justify_between">
 										<view class="item-detail-text flex_1">
 											<text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice">{{item.price?'¥'+item.price:'暂无价格'}}</text>

+ 13 - 13
pagesA/digitalShelf/choosePartResult.vue

@@ -41,12 +41,6 @@
 							<view class="item-name">
 							  <text>{{item.productName}}</text>
 							</view>
-							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'">
-								<text style="width: 5rem;color:#999;">原厂编码:</text>
-								<view style="width: 70%;flex-grow: 1;">
-									<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
-								</view>
-							</view>
 							<view class="item-nums">
 								X <text>{{item.totalQty}}{{item.unit||''}}</text>
 							</view>
@@ -54,6 +48,12 @@
 								<text>{{item.productCode}}</text>
 								<text class="item-no">{{item.shelfPlaceCode}}</text>
 							</view>
+							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'">
+								<text style="width: 5rem;color:#999;">原厂编码:</text>
+								<view style="width: 70%;flex-grow: 1;">
+									<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -75,12 +75,6 @@
 							<view class="item-name">
 							  <text>{{item.productName}}</text>
 							</view>
-							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'">
-								<text style="width: 5rem;color:#999;">原厂编码:</text>
-								<view style="width: 70%;flex-grow: 1;">
-									<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
-								</view>
-							</view>
 							<view class="item-nums">
 								X <text>{{item.qty}}{{item.unit||''}}</text>
 							</view>
@@ -91,6 +85,12 @@
 								<span class="item-no" v-if="item.billState == 'WAIT_OUT_WAREHOUSE'">待收货</span>
 								<span class="item-no" v-if="item.billState == 'FINISH'">已完结</span>
 							</view>
+							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'">
+								<text style="width: 5rem;color:#999;">原厂编码:</text>
+								<view style="width: 70%;flex-grow: 1;">
+									<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -390,7 +390,6 @@
 					color: #333;
 					font-weight: bold;
 					margin-top: 10rpx;
-					margin-bottom: 10rpx;
 				}
 				.item-nums{
 					padding: 10rpx 0;
@@ -408,6 +407,7 @@
 					justify-content: space-between;
 					font-size: 32rpx;
 					color: #666;
+					margin-bottom: 10rpx;
 					.item-no{
 						background: rgba(3, 54, 146, 0.15);
 						color: #033692;

+ 4 - 4
pagesA/digitalShelf/orderDetail.vue

@@ -57,15 +57,15 @@
 						<view class="item-name">
 						  <text>{{item.productName}}</text>
 						</view>
-						<view class="flex align_center" v-if="item.productTypeSn3=='543766811373752320'" style="padding: 5px 0;">
+						<view class="item-nums">
+							<text>{{item.productCode}}</text>
+						</view>
+						<view class="flex align_center" v-if="item.productTypeSn3=='543766811373752320'" style="margin-bottom: 5px;">
 							<text class="item-detail-text">原厂编码:</text>
 							<view style="width: 50%;flex-grow: 1;">
 								<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 							</view>
 						</view>
-						<view class="item-nums">
-							<text>{{item.productCode}}</text>
-						</view>
 						<view class="item-head">
 							<view>
 								数量:<text class="redText">{{item.totalQty}}</text>

+ 6 - 6
pagesA/digitalShelf/orderList.vue

@@ -39,15 +39,15 @@
 										  </view>
 									 </view>
 									 <view v-else>
-										 <view class="flex align_center" v-if="item.shelfOrderDetailList[0].productTypeSn3=='543766811373752320'" style="padding-bottom: 5px;">
-										 	<text class="item-detail-text">原厂编码:</text>
-										 	<view style="width: 50%;flex-grow: 1;">
-										 		<u-tag :text="item.shelfOrderDetailList[0].origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
-										 	</view>
-										 </view>
 										  <view class="pcode flex">
 											 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
 										  </view>
+										  <view class="flex align_center" v-if="item.shelfOrderDetailList[0].productTypeSn3=='543766811373752320'" style="padding-bottom: 5px;">
+										  	<text class="item-detail-text">原厂编码:</text>
+										  	<view style="width: 50%;flex-grow: 1;">
+										  		<u-tag :text="item.shelfOrderDetailList[0].origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+										  	</view>
+										  </view>
 										  <view class="carModel flex">
 											  <text>{{item.shelfOrderDetailList[0].productName}}</text>
 										  </view>

+ 6 - 6
pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -47,18 +47,18 @@
 						<view class="item-name">
 						  <text>{{item.productName}}</text>
 						</view>
-						<view class="flex align_center" v-if="item.productTypeSn3=='543766811373752320'" style="padding: 5px 0;">
-							<text class="item-detail-text">原厂编码:</text>
-							<view style="width: 50%;flex-grow: 1;">
-								<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
-							</view>
-						</view>
 						<view class="item-head">
 							<text>{{item.productCode}}</text>
 							<view>
 								数量:<text class="redText">{{item.qty}}</text>
 							</view>
 						</view>
+						<view class="flex align_center" v-if="item.productTypeSn3=='543766811373752320'" style="padding: 5px 0;">
+							<text class="item-detail-text">原厂编码:</text>
+							<view style="width: 50%;flex-grow: 1;">
+								<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>