lilei 1 年之前
父節點
當前提交
369c3db82a

+ 3 - 1
pages/stockQuery/stockQuery.vue

@@ -22,7 +22,9 @@
 					 		</view>
 					 		</view>
 							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'" style="padding-top: 5px;">
 							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'" style="padding-top: 5px;">
 								<text style="width: 4.5rem;color: #999;">原厂编码:</text>
 								<text style="width: 4.5rem;color: #999;">原厂编码:</text>
-								<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+								<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>{{item.productName}}</view>
 					 		<view>{{item.productName}}</view>
 					 	</view>
 					 	</view>

+ 9 - 3
pagesA/digitalShelf/choosePart.vue

@@ -50,7 +50,9 @@
 									<view class="item-detail-info">
 									<view class="item-detail-info">
 										<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
 										<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
 											<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
 											<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
-											<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+											<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 class="flex justify_between">
 										<view class="flex justify_between">
 											<view>
 											<view>
@@ -110,7 +112,9 @@
 								<view class="item-detail-info">
 								<view class="item-detail-info">
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'">
 										<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
 										<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
-										<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+										<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 class="flex justify_between">
 									<view class="flex justify_between">
 										<text class="item-detail-text flex_1">{{item.code}}</text>
 										<text class="item-detail-text flex_1">{{item.code}}</text>
@@ -186,7 +190,9 @@
 								<view class="item-detail-info">
 								<view class="item-detail-info">
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'" style="padding-bottom: 5px;">
 									<view class="flex" v-if="item.productTypeSn=='543766811373752320'" style="padding-bottom: 5px;">
 										<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
 										<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
-										<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+										<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 class="flex justify_between">
 									<view class="flex justify_between">
 										<text class="item-detail-text flex_1">{{item.code}}</text>
 										<text class="item-detail-text flex_1">{{item.code}}</text>

+ 13 - 0
pagesA/digitalShelf/choosePartResult.vue

@@ -41,6 +41,12 @@
 							<view class="item-name">
 							<view class="item-name">
 							  <text>{{item.productName}}</text>
 							  <text>{{item.productName}}</text>
 							</view>
 							</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">
 							<view class="item-nums">
 								X <text>{{item.totalQty}}{{item.unit||''}}</text>
 								X <text>{{item.totalQty}}{{item.unit||''}}</text>
 							</view>
 							</view>
@@ -69,6 +75,12 @@
 							<view class="item-name">
 							<view class="item-name">
 							  <text>{{item.productName}}</text>
 							  <text>{{item.productName}}</text>
 							</view>
 							</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">
 							<view class="item-nums">
 								X <text>{{item.qty}}{{item.unit||''}}</text>
 								X <text>{{item.qty}}{{item.unit||''}}</text>
 							</view>
 							</view>
@@ -378,6 +390,7 @@
 					color: #333;
 					color: #333;
 					font-weight: bold;
 					font-weight: bold;
 					margin-top: 10rpx;
 					margin-top: 10rpx;
+					margin-bottom: 10rpx;
 				}
 				}
 				.item-nums{
 				.item-nums{
 					padding: 10rpx 0;
 					padding: 10rpx 0;

+ 9 - 0
pagesA/digitalShelf/orderDetail.vue

@@ -57,6 +57,12 @@
 						<view class="item-name">
 						<view class="item-name">
 						  <text>{{item.productName}}</text>
 						  <text>{{item.productName}}</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 class="item-nums">
 						<view class="item-nums">
 							<text>{{item.productCode}}</text>
 							<text>{{item.productCode}}</text>
 						</view>
 						</view>
@@ -386,6 +392,9 @@
 				&:last-child{
 				&:last-child{
 					border: none;
 					border: none;
 				}
 				}
+				/deep/ .u-tag{
+					word-break: break-all;
+				}
 				> view{
 				> view{
 					padding: 20rpx 0;
 					padding: 20rpx 0;
 					&:first-child{
 					&:first-child{

+ 9 - 0
pagesA/digitalShelf/orderList.vue

@@ -39,6 +39,12 @@
 										  </view>
 										  </view>
 									 </view>
 									 </view>
 									 <view v-else>
 									 <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">
 										  <view class="pcode flex">
 											 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
 											 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
 										  </view>
 										  </view>
@@ -309,6 +315,9 @@
 					display: flex;
 					display: flex;
 					padding: 20upx 10upx;
 					padding: 20upx 10upx;
 					font-size: 28upx;
 					font-size: 28upx;
+					/deep/ .u-tag{
+						word-break: break-all;
+					}
 					&:first-child{
 					&:first-child{
 						color: #666E75;
 						color: #666E75;
 						font-size: 24upx;
 						font-size: 24upx;

+ 10 - 0
pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -47,6 +47,12 @@
 						<view class="item-name">
 						<view class="item-name">
 						  <text>{{item.productName}}</text>
 						  <text>{{item.productName}}</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 class="item-head">
 						<view class="item-head">
 							<text>{{item.productCode}}</text>
 							<text>{{item.productCode}}</text>
 							<view>
 							<view>
@@ -317,6 +323,9 @@
 				&:last-child{
 				&:last-child{
 					border: none;
 					border: none;
 				}
 				}
+				/deep/ .u-tag{
+					word-break: break-all;
+				}
 				> view{
 				> view{
 					padding: 20rpx 0;
 					padding: 20rpx 0;
 					&:first-child{
 					&:first-child{
@@ -346,6 +355,7 @@
 					align-items: center;
 					align-items: center;
 					justify-content: space-between;
 					justify-content: space-between;
 					color: #666;
 					color: #666;
+					margin-top: 5px;
 					> view{
 					> view{
 						&:first-child{
 						&:first-child{
 							font-size: 28rpx;
 							font-size: 28rpx;

+ 4 - 2
pagesA/queryByCode/confirmQh.vue

@@ -4,8 +4,10 @@
 			 <view><u-image :src="nowData.images" border-radius="16" width="160" height="160" bg-color="#EBEBEB"></u-image></view>
 			 <view><u-image :src="nowData.images" border-radius="16" width="160" height="160" bg-color="#EBEBEB"></u-image></view>
 			 <view style="display: block;"><text class="item-no">{{ nowData.shelfPlaceCode }}</text><text>{{ nowData.code }}</text></view>
 			 <view style="display: block;"><text class="item-no">{{ nowData.shelfPlaceCode }}</text><text>{{ nowData.code }}</text></view>
 			 <view class="flex align_center" v-if="nowData.productTypeSn=='543766811373752320'" style="padding-top: 5px;">
 			 <view class="flex align_center" v-if="nowData.productTypeSn=='543766811373752320'" style="padding-top: 5px;">
-			 	<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
-			 	<u-tag :text="nowData.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+			 	<text class="item-detail-text" style="width: 5rem;">原厂编码:</text>
+			 	<view>
+					<u-tag :text="nowData.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+				</view>
 			 </view>
 			 </view>
 			 <view class="item-name">
 			 <view class="item-name">
 			 	<text>{{ nowData.name }}</text>
 			 	<text>{{ nowData.name }}</text>

+ 4 - 2
pagesA/queryByCode/queryByCode.vue

@@ -30,8 +30,10 @@
 									<view class="code"><text>{{item.shelfPlaceCode}}</text>{{item.code}}</view>
 									<view class="code"><text>{{item.shelfPlaceCode}}</text>{{item.code}}</view>
 								</view>
 								</view>
 								<view class="flex align_center" v-if="item.productTypeSn=='543766811373752320'" style="padding-top: 5px;">
 								<view class="flex align_center" v-if="item.productTypeSn=='543766811373752320'" style="padding-top: 5px;">
-									<text class="item-detail-text" style="width: 4.5rem;">原厂编码:</text>
-									<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
+									<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 class="ptxt">
 								<view class="ptxt">
 									<view>
 									<view>