计划外入库任务提交

pages/unPlanned/job/receiptJobDetail.vue

@@ -104,15 +104,14 @@
 			this.id = option.id;
 			if (this.id != undefined) {
 				// 	//新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
+				if (option.status == "1") {
-				// 	this.receive((callback => {
+					this.receive((callback => {
-				// 		this.received = true;
+						this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-				// }
 						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
 			}
 		},
 		//返回首页
@@ -278,7 +277,7 @@
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
-					this.showMessageHint('请扫描收货库位', callback => {
+					this.showMessageHint('请扫描目标库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
 			
@@ -311,17 +310,18 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-						// unPlannedReceiptJobSubmit(params).then(res => {
+						unPlannedReceiptJobSubmit(params).then(res => {
-						// 	if (res.data) {
+							uni.hideLoading()
-						// 		this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
+							if (res.data) {
-						// 	} else {
+								this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+							} else {
-						// 	}
+								this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	uni.hideLoading()
+							}
-						// }).catch(error => {
+							
-						// 	uni.hideLoading()
+						}).catch(error => {
-						// 	this.showErrorMessage(error)
+							uni.hideLoading()
-						// })
+							this.showErrorMessage(error)
+						})
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);
@@ -340,6 +340,7 @@
 								detail.packingNumber, detail.batch);
 							detail.toPackingNumber = info.packingNumber;
 							detail.toBatch = info.batch;
+							detail.toLocationCode = this.toLocationCode
 							detail.toContainerNumber = '';
 							subList.push(detail)
 						}