提交

pages/outsourcedInspection/form.vue

@@ -349,15 +349,15 @@
 				})
 				return;
 			}
-			if (unf[i].checkResult == '' || unf[i].checkResult == null) {
-				uni.showToast({
-					icon: 'none',
-					title: "检查结果不能为空",
-					duration: 2000
-				})
-				return;
+			// if (unf[i].checkResult == '' || unf[i].checkResult == null) {
+			// 	uni.showToast({
+			// 		icon: 'none',
+			// 		title: "检查结果不能为空",
+			// 		duration: 2000
+			// 	})
+			// 	return;
 
-			}
+			// }
 			if (unf[i].rejectNum == null) {
 				uni.showToast({
 					icon: 'none',

pages/sorting/form.vue

@@ -232,12 +232,19 @@
 		uni.$once('addUnfitInfoEvent', (data) => {
 			addUnfitInfo(data)
 		})
+		// console.log(dayworkItem.value)
 		uni.navigateTo({
 			url: "/pages/sorting/options",
 			success: (res) => {
 				// 通过eventChannel向被打开页面传送数据
 				res.eventChannel.emit('acceptDataFromOpenerPage', {
 					data: dayworkItem.value,
+					query: {
+						productId: dayworkItem.value.daywork.productId,
+						processId: dayworkItem.value.process.id,
+						technologyVersion: dayworkItem.value.technologicalProcessDetail
+							.technologyVersion
+					},
 					index: unfitInfos.value.length
 				})
 			}