修改检验任务

mycomponents/detail/comRequestDetailCard.vue

@@ -75,7 +75,6 @@
 		watch: {
 			dataContent(newVal) {
 				var test =this.dataContent
-				debugger
 				this.requestItem = newVal.subList[0];
 			},
 		},

mycomponents/scan/winScanPackAndLocation.vue

@@ -139,7 +139,6 @@
 				this.$refs.popup.open('bottom');  
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				debugger
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
 			},
 

pages/deliver/request/deliverRequestCreate.vue

@@ -64,7 +64,7 @@
 				detailOptions: [],
 				scanOptions: [],
 				fromType: "",
-				dataContent:{}
+				dataContent: {}
 
 			}
 		},
@@ -168,37 +168,36 @@
 
 			},
 
-			setRequestParams(){
+			setRequestParams() {
 				var subList = []
 				this.detailSource.subList.forEach(detail => {
-					debugger
+					detail.soNumber = detail.package.soNumber;
-							detail.soNumber = detail.package.soNumber;
+					detail.soLine = detail.package.soLine;
-							detail.soLine = detail.package.soLine;
+					detail.remark = ""
-							detail.remark =""
+					// soNumber: 926926926,
-							// soNumber: 926926926,
+					// soLine: 926,
-							// soLine: 926,
+					// itemCode: THILDD0A691AG,
-							// itemCode: THILDD0A691AG,
+					// remark: ,
-							// remark: ,
+					// qty: 2,
-							// qty: 2,
+					// uom: EA
-							// uom: EA
+					subList.push(detail)
-							subList.push(detail)
 				})
 
-					this.detailSource.subList = subList
+				this.detailSource.subList = subList
-				    this.detailSource.deliverPlanNumber = "DP20231130-0001"
+				this.detailSource.deliverPlanNumber = "DP20231130-0001"
-					this.detailSource.customerCode = this.detailSource.customerCode
+				this.detailSource.customerCode = this.detailSource.customerCode
-					this.detailSource.customerDockCode = ""
+				this.detailSource.customerDockCode = ""
-					this.detailSource.carrierCode = ""
+				this.detailSource.carrierCode = ""
-					this.detailSource.transferMode = ""
+				this.detailSource.transferMode = ""
-					this.detailSource.vehiclePlateNumber = ""
+				this.detailSource.vehiclePlateNumber = ""
-					this.detailSource.remark = ""
+				this.detailSource.remark = ""
-					this.detailSource.dueTime = ""
+				this.detailSource.dueTime = ""
-					this.detailSource.departmentCode = "研发部门"
+				this.detailSource.departmentCode = "研发部门"
-					this.detailSource.status = 1
+				this.detailSource.status = 1
-					this.detailSource.autoCommit = "FALSE"
+				this.detailSource.autoCommit = "FALSE"
-					this.detailSource.autoAgree = "FALSE"
+				this.detailSource.autoAgree = "FALSE"
-					this.detailSource.autoExecute = "FALSE"
+				this.detailSource.autoExecute = "FALSE"
-					this.detailSource.directCreateRecord = "FALSE"
+				this.detailSource.directCreateRecord = "FALSE"
 
 				return this.detailSource;
 			},

pages/inspect/job/inspectFullDetail.vue

@@ -330,23 +330,23 @@
 
 			commit() {
 				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
+				// if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
+				// 	this.showErrorMessage("扫描数为0,请先扫描")
-					return;
+				// 	return;
+				// }
+				//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
+				if (this.jobContent.allowPartialComplete == "TRUE") {
+					this.submitJob();
+				} else {
+					//不允许部分提交，提示
+					this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+						"]箱总共[" + this
+						.subList.length + "]箱", res => {
+							if (res) {
+								this.openScanPopup();
+							}
+						});
 				}
-				//如果是全检，必须全部扫描
-					if (this.scanCount == this.subList.length) {
-						this.submitJob();
-					} else {
-						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
-					}
 			},
 
 			submitJob() {
@@ -455,7 +455,7 @@
 						list.push(detail)
 					})
 				})
-				this.jobContent.notPassedQty = Number(this.jobContent.failedQty)+ Number(this.jobContent.crackQty)
+				this.jobContent.notPassedQty = Number(this.jobContent.failedQty) + Number(this.jobContent.crackQty)
 				this.jobContent.subList = list
 				this.jobContent.nextAction = "PARTIAL_OK";
 				return this.jobContent;

pages/issue/job/issueDetail.vue

@@ -140,7 +140,6 @@
 		methods: {
 			resizeCollapse() {
 				this.$nextTick(r => {
-					// debugger;
 					this.$refs.comIssueDetailCard.forEach(r => {
 						r.resizeCollapse();
 					})

pages/issue/request/issueRequest.vue

@@ -373,18 +373,10 @@
 		},
 		
 		requestConfirmsss(action, item) {
-			debugger;
 			uni.navigateTo({
 				url: './issueRequestDetail?type=add&item=' + item.id
 			});
 		}
-
-		// requestConfirm(action, item) {
-		// 	debugger;
-		// 	uni.navigateTo({
-		// 		url: './issueRequestDetail?type=add&item=' + item.id
-		// 	});
-		// }
 	}
 </script>