修改到货检验 盘点提交错误

pages/count/job/countDetail.vue

@@ -514,17 +514,17 @@
 				});
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-				// countJobSubmit(params).then(res => {
+				countJobSubmit(params).then(res => {
-				// 	uni.hideLoading()
+					uni.hideLoading()
-				// 	if (res.data) {
+					if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data)
-				// 	} else {
+					} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+						this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 	}
+					}
-				// }).catch(error => {
+				}).catch(error => {
-				// 	uni.hideLoading()
+					uni.hideLoading()
-				// 	this.showErrorMessage(error)
+					this.showErrorMessage(error)
-				// })
+				})
 
 			},
 

pages/inspect/job/inspectResult.vue

@@ -338,7 +338,7 @@
 			},
 
 			commit() {
-
+				
 				if (this.jobContent.failedQty == null) {
 					this.showMessage("请输入不合格数量")
 					return
@@ -362,23 +362,41 @@
 				//不合格数量==0、(全部合格)、明细全部合格
 				if (failedQty == 0) {
 					if (crackQty == 0) {
-						//报废数==0，直接提交
+						if (this.nextAction == "ALL_NOK") {
-						this.jobContent.subList.forEach(res => {
+							this.jobContent.subList.forEach(res => {
-							res.handleQty = res.qty
+								res.handleQty = res.qty
-							res.failedQty = 0;
+								res.failedQty = res.qty;
-							res.notPassedQty = res.failedQty;
+								res.notPassedQty = res.failedQty;
-							res.crackQty = 0;
+								res.crackQty = 0;
-							res.goodQty = res.qty;
+								res.goodQty = 0;
-							res.failedReason = "";
+								res.failedReason = "";
-							res.photos = ""
+								res.photos = ""
-							res.inspectResult = ""
+								res.inspectResult = ""
-							res.toInventoryStatus = "OK"
+								res.toInventoryStatus = "NOK"
-							res.inspectUser = this.$store.state.user.id
+								res.inspectUser = this.$store.state.user.id
-						})
+							})
-
+							this.jobContent.nextAction = this.nextAction;
-						this.jobContent.nextAction = "";
+							this.jobContent.goodQty = 0
-						this.jobContent.goodQty = this.jobContent.receiveQty
+							this.submitJob(this.jobContent)
-						this.submitJob(this.jobContent)
+						}else {
+							//报废数==0，直接提交
+							this.jobContent.subList.forEach(res => {
+								res.handleQty = res.qty
+								res.failedQty = 0;
+								res.notPassedQty = res.failedQty;
+								res.crackQty = 0;
+								res.goodQty = res.qty;
+								res.failedReason = "";
+								res.photos = ""
+								res.inspectResult = ""
+								res.toInventoryStatus = "OK"
+								res.inspectUser = this.$store.state.user.id
+							})
+							
+							this.jobContent.nextAction = "";
+							this.jobContent.goodQty = this.jobContent.receiveQty
+							this.submitJob(this.jobContent)
+						}
 
 					} else {
 						//报废数大于0，进入详情
@@ -399,6 +417,7 @@
 						this.showMessage("请选择下一步动作")
 						return
 					}
+					
 					//全不合格
 					if (this.nextAction == "ALL_NOK") {
 						//提交