ysy 2 роки тому
батько
коміт
ac7713cd0a

+ 8 - 3
pages/pda/picking/components/instanceBom.vue

@@ -20,11 +20,16 @@
 				</view>
 
 
-				<view class="item" v-for="(itm, index) in tableH(4)" :key="index">
+				<view class="item" v-for="(itm, index) in tableH(1)" v-if='itm.prop' :key="index">
 					<view class="lable rx-cc">{{ itm.label }}</view>
 					<view class="content">{{ mate[itm.prop] }}</view>
 
 				</view>
+				
+				<view class="item">
+					<view class="lable rx-cc">包装库存</view>
+					<view class="content">{{mate.availableCountBase}}/ {{mate.minUnit}}</view>
+				</view>
 
 
 				<view class="item">
@@ -33,8 +38,8 @@
 						<input class="uni-input" v-model="mate.demandQuantity"
 							@blur='mate.demandQuantity > mate.packingCountBase ?  mate.demandQuantity = mate.packingCountBase : mate.demandQuantity'
 							type="digit"></input>
-						<view class="unit">/{{mate.unit}}</view>
-						<view>&nbsp;&nbsp; (库存:{{ mate.packingCountBase }})</view>
+						<view class="unit">/{{mate.measuringUnit}}</view>
+						<view>&nbsp;&nbsp; (库存:{{ mate.packingCountBase }} {{mate.measuringUnit}})</view>
 					</view>
 				</view>
 

+ 2 - 2
pages/pda/picking/details.vue

@@ -48,11 +48,11 @@
 									<view class="content ">{{mate.brandNum}}</view>
 								</view>
 
-								<view class="rx ww45">
+								<view class="rx ww45" >
 									<view class="lable rx-cc ww80">数量</view>
 									<view class="content content_num">
 										<input class="uni-input" v-model="mate.demandQuantity" type="digit"></input>
-										<view class="unit">{{mate.unit}}</view>
+										<view class="unit">{{mate.measuringUnit}}</view>
 
 									</view>
 								</view>