Browse Source

bug 修复

lilei 2 years ago
parent
commit
b5aa4f7732
2 changed files with 15 additions and 3 deletions
  1. 3 2
      pages/shelfSetting/editShelfHw.vue
  2. 12 1
      pages/stockCheck/shelfList.vue

+ 3 - 2
pages/shelfSetting/editShelfHw.vue

@@ -26,7 +26,7 @@
 									{{productEntity.name}}
 								</view>
 								<view>
-									当前库存:{{productEntity.currQty}}
+									当前库存:{{productEntity.currQty}} {{productEntity.unit}}
 								</view>
 							</view>
 						</view>
@@ -163,7 +163,8 @@
 					  code: res.data.productCode,
 					  name: res.data.productName,
 					  productMsg: res.data.productImageUrl,
-					  currQty: res.data.currQty
+					  currQty: res.data.currQty,
+					  unit: res.data.productEntity.unit
 				  }
 			      this.form.productSn = res.data.productSn
 				  this.bakProductSn = res.data.productSn

+ 12 - 1
pages/stockCheck/shelfList.vue

@@ -26,7 +26,18 @@
 						<view class="item-name">
 							<text>{{item.shelfName}}</text>
 						</view>
-						<view class="item-detail">
+						<view class="item-detail" v-if="item.checkState=='WAIT'">
+							<view>
+								盈亏总数量:
+								<text class="item-detail-text">{{item.totalProfitLossQty}}</text>
+							</view>
+							<view>
+								盈亏总金额:
+								<text class="item-detail-text">{{item.totalProfitLossCost}}</text>
+							</view>
+							<view></view>
+						</view>
+						<view class="item-detail" v-else>
 							<view>
 								产品款数:
 								<text class="item-detail-text">{{item.totalCategory}}</text>