lilei 8 months ago
parent
commit
5fd4d7146f

+ 12 - 15
pagesA/digitalShelf/stockPutDetail.vue

@@ -40,17 +40,8 @@
 						<view class="item-name">
 						  <text>{{item.productName||'--'}}</text>
 						</view>
-						<view class="item-nums flex align-center justify_between">
+						<view class="item-nums">
 							<text>{{item.productCode||'--'}}</text>
-							<!-- <view>
-								<u-number-box :min="0" :max="999999"></u-number-box>
-							</view> -->
-							<view v-if="pageInfo&&pageInfo.billState=='FINISH'">
-								<text>入库数量:{{item.putQty||item.putQty==0?item.putQty:'--'}}</text>
-							</view>
-							<view v-else>
-								<text>待入库数量:{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}</text>
-							</view>
 						</view>
 						<view class="flex align_center" v-if="item.productTypeSn3=='543766811373752320'" style="margin-top: 5px;">
 							<text class="item-detail-text">原厂编码:</text>
@@ -58,6 +49,14 @@
 								<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 							</view>
 						</view>
+						<view class="item-nums flex align-center justify_end">
+							<view v-if="pageInfo&&pageInfo.billState=='FINISH'">
+								<text>入库数量:{{item.putQty||item.putQty==0?item.putQty:'--'}}</text>
+							</view>
+							<view v-else>
+								<text>待入库数量:{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}</text>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -200,17 +199,15 @@
 				}
 				.item-name{
 					word-wrap: break-word;
-					font-size: 32rpx;
+					font-size: 28rpx;
 					color: #333;
 					font-weight: bold;
 					margin-top: 10rpx;
 				}
 				.item-nums{
-					margin-top: 10rpx;
-					padding: 10rpx 0;
 					text{
-						font-size: 32rpx;
-						color: #222222;
+						font-size: 28rpx;
+						color: #666;
 					}
 				}
 			}

+ 2 - 1
pagesA/queryByCode/confirmQh.vue

@@ -99,9 +99,10 @@
 			},
 			toDetail(data){
 				uni.$emit("updateQueryByCodeList")
+				this.$store.state.vuex_tempData = {shelfOrder:data}
 				// 提交成功
 				uni.redirectTo({
-					url:"/pagesA/digitalShelf/choosePartResult?data="+encodeURIComponent(JSON.stringify({shelfOrder:data}))+"&state=1"
+					url:"/pagesA/digitalShelf/choosePartResult?state=1"
 				})
 			},
 			// 确认拿货

+ 5 - 1
pagesA/queryByCode/queryByCode.vue

@@ -153,9 +153,13 @@
 			},
 			clearSearch(){
 				this.queryWord = ''
-				this.search()
+				this.pageNo = 1
+				this.partList = []
 			},
 			search(){
+				if(this.queryWord == ''){
+					return
+				}
 				this.pageNo = 1
 				this.partList = []
 				this.getpartList()

+ 12 - 7
pagesB/stockQuery/stockQuery.vue

@@ -8,16 +8,13 @@
 				<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
 					 <view class="list-item flex align_center justify_between" v-for="item in list" :key="item.id">
 					 	<view>
-					 		<u-image :src="item.images||'@/static/def_imgs.png'" width='120' height="120"></u-image>
+					 		<u-image :src="item.images||'/static/def_imgs.png'" width='120' height="120"></u-image>
 					 	</view>
 					 	<view>
-					 		<view class="flex align_center justify_between">
+					 		<view class="flex justify_between">
 					 			<view class="vin-text">
 					 				<text class="hj-no">{{item.shelfPlaceCode}}</text>
-					 				<text>{{item.code}}</text>
-					 			</view>
-					 			<view class="time-text">
-					 				库存:<text>{{item.qty}}个</text>
+									{{item.productName}}
 					 			</view>
 					 		</view>
 							<view class="flex" v-if="item.productTypeSn3=='543766811373752320'" style="padding-top: 5px;">
@@ -26,7 +23,12 @@
 									<u-tag :text="item.origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 								</view>
 							</view>
-					 		<view>{{item.productName}}</view>
+							<view class="flex align_center justify_between">
+								<view>{{item.code}}</view>
+								<view class="time-text">
+									库存:<text>{{item.qty}}个</text>
+								</view>
+							</view>
 					 	</view>
 					 </view>
 					 <view style="padding: 20upx;">
@@ -143,13 +145,16 @@
 			}
 		}
 		.vin-text{
+			font-weight: bold;
 			.hj-no{
 				background: #2196F3;
 				color: #ffffff;
 				display: inline-block;
 				border-radius: 10rpx;
 				padding: 0 10rpx;
+				font-weight: normal;
 				margin-right: 10rpx;
+				font-size: 12px;
 			}
 		}
 		&:first-child{