优化

pages/pda/common.js

@@ -15,7 +15,7 @@ export const tableHeader = selectEquiType => {
 					label: '包装库存',
 					prop: '',
 					formatter(row) {
-						return `${row.availableCountBase || '0'}/${row.minUnit || ''}`
+						return `${row.packingCountBase || '0'}/${row.minUnit || ''}`
 					}
 				},
 
@@ -23,7 +23,7 @@ export const tableHeader = selectEquiType => {
 					label: '计量库存数量',
 					prop: '',
 					formatter(row) {
-						return `${row.packingCountBase || '0'}/${row.measuringUnit || ''}`
+						return `${row.availableCountBase || '0'}/${row.measuringUnit || ''}`
 					}
 				}
 			]

pages/pda/components/bottomOperate.vue

@@ -76,7 +76,7 @@
 						{
 							name: '更换周转车',
 							type: 'turnover'
-						}
+						},
 
 
 					],

pages/pda/feeding/components/instanceBom.vue

@@ -27,7 +27,7 @@
 					<view class="content content_num">
 						<input class="uni-input" v-model="mate.feedQuantity"
 							type="digit"></input>
-						<view class="unit">/{{mate.packingCountBase}}</view>
+						<view class="unit">/{{mate.unit}}</view>
 					
 					</view>
 				</view>

pages/pda/picking/components/instanceBom.vue

@@ -36,10 +36,10 @@
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
 						<input class="uni-input" v-model="mate.demandQuantity"
-							@blur='mate.demandQuantity > mate.packingCountBase ?  mate.demandQuantity = mate.packingCountBase : mate.demandQuantity'
+							@blur='mate.demandQuantity > mate.availableCountBase ?  mate.demandQuantity = mate.availableCountBase : mate.demandQuantity'
 							type="digit"></input>
 						<view class="unit">/{{mate.measuringUnit}}</view>
-						<view>&nbsp;&nbsp; (库存:{{ mate.packingCountBase }} {{mate.measuringUnit}})</view>
+						<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }} {{mate.measuringUnit}})</view>
 					</view>
 				</view>
 

pages/pda/picking/details.vue

@@ -52,7 +52,7 @@
 									<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.measuringUnit}}</view>
+										<view class="unit">{{mate.unit}}</view>
 
 									</view>
 								</view>
@@ -440,7 +440,8 @@
 						}
 
 						.unit {
-							padding: 0 4rpx;
+							width: 90rpx;
+							text-align: center;
 							font-size: 24rpx;
 							color: #404446;
 						}

pages/pda/workOrder/search/index.vue

@@ -52,8 +52,13 @@
 
 
 								<view class="items"
-									v-if='item.rootCategoryLevelId != 11 && item.rootCategoryLevelId != 1'>
-									可用库存：{{ item.packingCountBase }} {{item.unit}}
+									v-if='item.rootCategoryLevelId != 11 '>
+									可用库存：{{ item.availableCountBase }} {{item.unit}}
+								</view>
+								
+								<view class="items"
+									v-if='item.rootCategoryLevelId == 1 '>
+									包装库存：{{ item.packingCountBase }} {{item.minUnit}}
 								</view>
 
 								<view class="items" v-if='item.rootCategoryLevelId == 11'>