优化

pages/pda/picking/components/instanceBom.vue

@@ -10,13 +10,13 @@
 				<view class="item">
 					<view class="lable rx-cc">编码</view>
 					<view class="content">
-						{{mate.assetCode}}
+						{{mate.code}}
 					</view>
 				</view>
 
 				<view class="item">
 					<view class="lable rx-cc">名称</view>
-					<view class="content">{{mate.assetName}}</view>
+					<view class="content">{{mate.name}}</view>
 				</view>
 				 
 				
@@ -30,9 +30,9 @@
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
 				<view class="content content_num">
-					<input  class="uni-input"  v-model="mate.demandQuantity"  @blur='mate.demandQuantity > mate.number ?  mate.demandQuantity = mate.number : mate.needNum' type="digit"></input>
+					<input  class="uni-input"  v-model="mate.demandQuantity"  @blur='mate.demandQuantity > mate.availableCountBase ?  mate.demandQuantity = mate.availableCountBase : mate.demandQuantity' type="digit"></input>
 					<view class="unit">/{{mate.unit}}</view>
-					<view>&nbsp;&nbsp; (库存:{{ mate.number }})</view>
+					<view>&nbsp;&nbsp; (库存:{{ mate.availableCountBase }})</view>
 				</view>
 				</view>
 
@@ -41,7 +41,7 @@
 				<view class="item">
 					<view class="lable rx-cc">领料仓库</view>
 					<view class="content ">
-						
+						 {{ mate.pathName }}
 					</view>
 				</view>
 

pages/pda/picking/components/pickCard.vue

@@ -3,7 +3,7 @@
 
 		<checkbox-group v-for="(item, index) in list" :key="index" @change="e => selectVal(e, item, index)">
 		     <label>
-			<view class="card_box">
+			<view class="card_box" @click="openDetails(item.pickStatus, item.id)">
 				<view class="item_box rx-bc">
 					<view class="rx-sc">
 						<checkbox  v-if='item.pickStatus == 0' :checked="item.checked" />
@@ -91,6 +91,15 @@
 		methods: {
 			selectVal(e, val, index) {
 				this.list[index].checked = !this.list[index].checked
+			},
+			
+			openDetails(pickStatus, id) {
+				if(pickStatus == 1) {
+					 let url =  `/pages/pda/picking/bill/index?id=${id}`
+					uni.navigateTo({
+						url
+					})
+				}
 			}
 		}
 

pages/pda/picking/details.vue

@@ -161,7 +161,7 @@
 				batchSave(_arr).then(res => {
 					
 					uni.navigateTo({
-						url: `/pages/pda/picking/index/index?tabType`,
+						url: `/pages/pda/picking/index/index?pickStatus=1`,
 					});
 					
 				})

pages/pda/picking/index/index.vue

@@ -61,7 +61,7 @@
 		data() {
 			return {
 				tabType: 1,
-				pickStatus: 1,
+				pickStatus: 0,
 
                 navObj: {
 					unclaimedQuantity: 0,
@@ -86,11 +86,16 @@
 			}
 
 		},
+		
+		onLoad(option) {
+			this.pickStatus = option.pickStatus || 0
+		},
 
 		onShow() {
 			this.getList()
 			this.getpickTics()
 		},
+		
 
 		methods: {
 

pages/pda/workOrder/search/index.vue

@@ -47,7 +47,7 @@
 								</view>
 
 								<view class="items">
-									可用库存：{{ item.number }} {{item.unit}}
+									可用库存：{{ item.availableCountBase }} {{item.unit}}
 								</view>
 
 							</view>
@@ -208,7 +208,8 @@
 					categoryLevelId: this.categoryLevelId,
 					keyWord: this.keyWord,
 					pageNum: 1,
-					size: -1
+					size: -1,
+					dimension: 1 
 				}
 				this.list = []
 				pageeLedgerMain(param).then(res => {
@@ -216,12 +217,16 @@
 						...res.list.map(i => {
 							const checked =
 								this.memoList.findIndex(itm => itm.id === i.id) > -1
-                           
+                             
+							 const warehouseId = i.pathIds && i.pathIds.split(',')[0]
+						   
 							return {
 								checked,
+								warehouseId,
 								...i,
 								instanceId: i.id,
-								categoryId: i.assetId
+								categoryId: i.assetId,
+								
 							}
 						})
 					)