Merge remote-tracking branch 'origin/master'

pages/outsourcedInspection/form.vue

@@ -333,18 +333,35 @@
 		let unf = unfitInfos.value;
 		for (var i = 0; i < unfitInfos.value.length; i++) {
 			console.log("废品信息");
-			if (!unf[i].checkStandard && !unf[i].checkResult && !unf[i].rejectNum) {
+			// if (!unf[i].checkStandard && !unf[i].checkResult && !unf[i].rejectNum) {
+			// 	uni.showToast({
+			// 		icon: 'none',
+			// 		title: "废品信息不能为空",
+			// 		duration: 2000
+			// 	})
+			// 	return;
+			// }
+			if (unf[i].checkStandard == '' || unf[i].checkStandard == null) {
 				uni.showToast({
 					icon: 'none',
-					title: "废品信息不能为空",
+					title: "检查标准不能为空",
 					duration: 2000
 				})
 				return;
 			}
-			if (unf[i].checkStandard == '' || unf[i].checkResult == '') {
+			if (unf[i].checkResult == '' || unf[i].checkResult == null) {
 				uni.showToast({
 					icon: 'none',
-					title: "废品信息不能为空",
+					title: "检查结果不能为空",
+					duration: 2000
+				})
+				return;
+
+			}
+			if (unf[i].rejectNum == null) {
+				uni.showToast({
+					icon: 'none',
+					title: "废品量不能为空",
 					duration: 2000
 				})
 				return;