优化

pages/pda/picking/components/semiProductBom.vue

@@ -14,16 +14,17 @@
 					</view>
 				</view>
 
-			
 
 
-				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" v-if='itm.prop' :key="index">
+
+				<view class="item" v-for="(itm, index) in tableH(mate.rootCategoryLevelId)" v-if='itm.prop'
+					:key="index">
 					<view class="lable rx-cc">{{ itm.label }}</view>
 					<view class="content">{{ mate[itm.prop] }}</view>
 
 				</view>
-				
-	
+
+
 
 
 
@@ -43,24 +44,24 @@
 				<view class="item">
 					<view class="lable rx-cc">刻码</view>
 					<view class="content ">
-				     {{mate.extInfo.engrave }}
+						{{mate.extInfo.engrave }}
 					</view>
 				</view>
-				
-				
+
+
 				<view class="item">
 					<view class="lable rx-cc">物料代号</view>
 					<view class="content ">
-				     {{mate.extInfo.materielCode }}
+						{{mate.extInfo.materielCode }}
 					</view>
 				</view>
-				
-		
-				
+
+
+
 				<view class="item">
 					<view class="lable rx-cc">客户代号</view>
 					<view class="content ">
-				     {{mate.extInfo.clientCode }}
+						{{mate.extInfo.clientCode }}
 					</view>
 				</view>
 

pages/pda/workOrder/search/index.vue

@@ -460,6 +460,7 @@
 				let URL = null
 				if (this.isType == 'pick') { // 领料
 					if (this.rootCategoryLevelId == 23) {
+						 this.list = []
 						param = {}
 						param.workOrderId = this.pid
 						URL = listOutsourceInWarehouse
@@ -470,7 +471,7 @@
 				} else if (this.isType == 'feed') { // 投料
 
 					if ([4, 7, 14].includes(Number(this.rootCategoryLevelId))) {
-						
+
 						URL = assetPage
 					} else if (this.rootCategoryLevelId == 2) {
 						param.workOrderId = this.pid
@@ -478,7 +479,7 @@
 						delete param.categoryLevelId
 						URL = listInProduct
 					} else if (![2, 4, 7, 14].includes(Number(this.rootCategoryLevelId))) {
-							URL = assetPage
+						URL = assetPage
 						// if (this.formData.dimension == 3) { // 包装维度
 						// 	URL = getInventoryDetails
 						// 	param.dimension = 3
@@ -548,7 +549,6 @@
 
 			//勾选
 			selectVal(e, val, index) {
-				console.log(val)
 				if (val.rootCategoryLevelId == 11 && val.status == 1) {
 					return false
 				}
@@ -601,13 +601,15 @@
 						if (rr.confirm) {
 							let param = {
 								taskId: this.taskId,
-								workOrderId: this.pid
+								workOrderId: this.pid,
+								pickOutInList: this.list
 							}
-							uni.$emit('setSelectList', this.list, this.pid)
-							uni.navigateBack()
-							return false
-							outsourceEndPick(param).then(res => {
 
+
+							outsourceEndPick(param).then(res => {
+								console.log(11, res)
+								uni.$emit('setSelectList', this.list, this.pid)
+								uni.navigateBack()
 							})
 						}