装配收货目标库位校验

src/pages/productReceipt/job/ccProductReceiptDetail.vue

@@ -228,9 +228,6 @@
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
-							if (that.jobContent.allowModifyLocation == 'FALSE') {
-								that.toLocationCode = that.subList[0].toLocationCode
-							}
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
 							if (that.scanMessage) {
@@ -269,7 +266,7 @@
 						} else {
 							itemDetail.scaned = true;
 							itemDetail.handleQty = Number(result.label.qty);
-							itemDetail.toLocationCode = this.toLocationCode;
+							itemDetail.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode;
 							itemDetail.labelQty = Number(result.label.qty);
 							calcHandleQty(this.detailSource);
 							this.continueScan()
@@ -347,7 +344,7 @@
 						return
 					}
 				}else{
-					this.toLocationCode = this.jobToLocationCode
+					this.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode
 				}
 
 

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -52,7 +52,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
+					<locationCompare  ref ="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
 						:recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' :locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
@@ -230,15 +230,9 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
+							that.jobContent.allowModifyLocation = 'TRUE'
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.productionLineCode = that.subList[0].productionLineCode;
-							var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
-							if(valiDate){
-								that.jobContent.allowModifyLocation = 'TRUE'
-								
-							}else{
-								that.jobContent.allowModifyLocation = 'FALSE'
-							}
 							// if (that.jobContent.allowModifyLocation == 'FALSE') {
 							// 	that.toLocationCode = that.subList[0].toLocationCode
 							// }
@@ -455,7 +449,7 @@
 						return
 					}
 				}else{
-					this.toLocationCode = this.jobToLocationCode
+					this.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode
 				}
 				this.detailSource.forEach(item => {
 					item.subList.forEach(subitem => {