lilei 2 éve
szülő
commit
ea71cafdf8

+ 2 - 2
pages/stockCheck/editModal.vue

@@ -14,7 +14,7 @@
 				 <view class="p-info flex align_center">
 				 	<text>可用库存</text> {{infoData.currQty}}
 				 </view>
-				 <!-- <view class="p-info flex align_center">
+				 <view class="p-info flex align_center">
 				 	<text>冻结库存</text>
 					<view class="flex align_center">
 						{{infoData.freezeQty}}
@@ -23,7 +23,7 @@
 							<u-icon name="arrow-right"></u-icon>
 						</view>
 					</view>
-				 </view> -->
+				 </view>
 				 <view class="p-info flex align_center">
 				 	<text>结算价格</text>
 					<view>

+ 8 - 11
pages/stockCheck/shelfList.vue

@@ -46,10 +46,10 @@
 								可用库存:
 								<text class="item-detail-text">{{item.totalStockQty}}</text>
 							</view>
-							<!-- <view>
+							<view>
 								冻结库存:
 								<text class="item-detail-text">{{item.totalFreezeQty}}</text>
-							</view> -->
+							</view>
 						</view>
 					</view>
 					<view class="item-info button-box justify_between align_center" v-if="item.checkState=='WAIT'">
@@ -155,16 +155,13 @@
 			},
 			viewDetail(item){
 				this.tempData = item
-				// 去库存盘点
-				this.toCheck()
-				
 				// 如果有冻结库存
-				// if(item.totalFreezeQty>0){
-				// 	 this.showModal = true
-				// }else{
-				// 	// 去库存盘点
-				// 	this.toCheck()
-				// }
+				if(item.totalFreezeQty>0){
+					 this.showModal = true
+				}else{
+					// 去库存盘点
+					this.toCheck()
+				}
 			},
 			toCheck(){
 				uni.navigateTo({

+ 5 - 5
pages/stockCheck/startCheck.vue

@@ -49,11 +49,11 @@
 										<text class="item-detail-text">{{item.currQty}}</text>
 										{{item.productEntity&&item.productEntity.unit}}
 									</view>
-									<!-- <view>
+									<view>
 										冻结库存:
 										<text class="item-detail-text">{{item.freezeQty}}</text>
 										{{item.productEntity&&item.productEntity.unit}}
-									</view> -->
+									</view>
 								</view>
 							</view>
 						</view>
@@ -133,9 +133,9 @@
 										<text class="item-detail-text">
 											可用:{{item.stockQty?item.stockQty:0}} {{item.product&&item.product.unit}}
 										</text>
-										<!-- <text class="item-detail-text">
+										<text class="item-detail-text">
 											冻结:{{item.freezeQty?item.freezeQty:0}} {{item.product&&item.product.unit}}
-										</text> -->
+										</text>
 									</view>
 								</view>
 							</view>
@@ -170,7 +170,7 @@
 				<view class="tabs">
 					<view>
 						<view :class="'available'==curType?'active':''" @click="curType=curType=='available'?'':'available'">有可用库存的产品</view>
-						<!-- <view :class="'blocked'==curType?'active':''" @click="curType=curType=='blocked'?'':'blocked'">有冻结库存的产品</view> -->
+						<view :class="'blocked'==curType?'active':''" @click="curType=curType=='blocked'?'':'blocked'">有冻结库存的产品</view>
 					</view>
 					<view class="flex">
 						<view :class="item==curTab?'active':''" v-for="item in placeTab" :key="item" @click="curTab=curTab==item?'':item">{{item}}层</view>

+ 2 - 2
pages/stockCheck/submitStockCheck.vue

@@ -46,12 +46,12 @@
 										</text>
 										{{item.stockQty||0}}
 									</view>
-									<!-- <view>
+									<view>
 										<text class="item-detail-text">
 											冻结:
 										</text>
 										{{item.freezeQty||0}}
-									</view> -->
+									</view>
 									<view>
 										<text class="item-detail-text">
 											实际可用: