扫码新规则

pages/changeBox/index.vue

@@ -143,6 +143,8 @@
 			if (res.code == 200) {
 				bindList.value = [...res.rows];
 				newBindList.value = res.rows;
+				console.log("newBindList开始", newBindList);
+				console.log("res开始", res.rows);
 			}
 		})
 		getDictInfoByType('reason_for_abandonment').then((res) => {
@@ -197,134 +199,163 @@
 		newBindList.value.push(item)
 		item.inpShow = false;
 	}
-/*
-	function handleScanCode() {
-		// 引入原生插件
-		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+	/*
+		function handleScanCode() {
+			// 引入原生插件
+			const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
 
-		// 调用插件的 mpaasScan 方法
-		mpaasScanModule.mpaasScan({
-				// 扫码识别类型，参数可多选，qrCode、barCode，
-				// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
-				scanType: ["qrCode", "barCode"],
-				// 是否隐藏相册，默认false不隐藏
-				hideAlbum: false,
-			},
-			(ret) => {
-				let vehicleObj = JSON.parse(ret.resp_result);
-				if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请扫载具码"
-					})
-					return;
-				}
-				for (let i = 0; i < newBindList.value.length; i++) {
-					if (newBindList.value[i].carrierId === vehicleObj.carrierId) {
+			// 调用插件的 mpaasScan 方法
+			mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，
+					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+					scanType: ["qrCode", "barCode"],
+					// 是否隐藏相册，默认false不隐藏
+					hideAlbum: false,
+				},
+				(ret) => {
+					let vehicleObj = JSON.parse(ret.resp_result);
+					if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
 						uni.showToast({
 							icon: "none",
-							title: "载具已存在"
+							title: "请扫载具码"
 						})
 						return;
 					}
-				}
-				const checkData = {
-					...dayWorkInfo,
-					dayworkCarriers: newBindList.value,
-					newCarrierId: vehicleObj.carrierId
-				}
-				console.log("dayWorkInfo", dayWorkInfo);
-				checkCarrierNew(checkData).then(response => {
-					// console.log(response)
-					// uni.showToast({
-					// 	icon: 'none',
-					// 	title: response.msg
-					// })
-					if (response.code == 200) {
-						newBindList.value.push(JSON.parse(ret.resp_result));
-					} else {
+					for (let i = 0; i < newBindList.value.length; i++) {
+						if (newBindList.value[i].carrierId === vehicleObj.carrierId) {
+							uni.showToast({
+								icon: "none",
+								title: "载具已存在"
+							})
+							return;
+						}
+					}
+					const checkData = {
+						...dayWorkInfo,
+						dayworkCarriers: newBindList.value,
+						newCarrierId: vehicleObj.carrierId
+					}
+					console.log("dayWorkInfo", dayWorkInfo);
+					checkCarrierNew(checkData).then(response => {
+						// console.log(response)
+						// uni.showToast({
+						// 	icon: 'none',
+						// 	title: response.msg
+						// })
+						if (response.code == 200) {
+							newBindList.value.push(JSON.parse(ret.resp_result));
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: response.msg
+							})
+							return;
+						}
+					}).catch(err => {
 						uni.showToast({
 							icon: 'none',
-							title: response.msg
+							title: '箱码检测检测错误' + err.message
 						})
-						return;
-					}
-				}).catch(err => {
-					uni.showToast({
-						icon: 'none',
-						title: '箱码检测检测错误' + err.message
 					})
-				})
-				// checkCarrier(vehicleObj.carrierId).then(response => {
-				// 	console.log(response)
-				// 	if (response.code == 200) {
-				// 		newBindList.value.push(JSON.parse(ret.resp_result));
-				// 	} else {
-				// 		uni.showToast({
-				// 			icon: 'none',
-				// 			title: response.msg
-				// 		})
-				// 		return;
-				// 	}
-				// })
-			}
-		);
-	}
-*/
+					// checkCarrier(vehicleObj.carrierId).then(response => {
+					// 	console.log(response)
+					// 	if (response.code == 200) {
+					// 		newBindList.value.push(JSON.parse(ret.resp_result));
+					// 	} else {
+					// 		uni.showToast({
+					// 			icon: 'none',
+					// 			title: response.msg
+					// 		})
+					// 		return;
+					// 	}
+					// })
+				}
+			);
+		}
+	*/
 	function handleScanCode() {
 		// 引入原生插件
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-
-		// 调用插件的 mpaasScan 方法
-		mpaasScanModule.mpaasScan({
-				// 扫码识别类型，参数可多选，qrCode、barCode，
-				// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
-				scanType: ["qrCode", "barCode"],
-				// 是否隐藏相册，默认false不隐藏
-				hideAlbum: false,
-			},
-			(ret) => {
-				let vehicleObj = { carrierCode: ret.resp_result };
-				if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
-					uni.showToast({
-						icon: "none",
-						title: "请扫载具码"
-					})
-					return;
-				}
-				for (let i = 0; i < newBindList.value.length; i++) {
-					if (newBindList.value[i].carrierCode === vehicleObj.carrierCode) {
+		if (mpaasScanModule) {
+			// 调用插件的 mpaasScan 方法
+			mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，
+					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+					scanType: ["qrCode", "barCode"],
+					// 是否隐藏相册，默认false不隐藏
+					hideAlbum: false,
+				},
+				(ret) => {
+					let vehicleObj = {
+						carrierCode: ret.resp_result
+					};
+					console.log("扫码验证数据", vehicleObj);
+					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
 						uni.showToast({
 							icon: "none",
-							title: "载具已存在"
+							title: "请扫载具码"
 						})
 						return;
 					}
-				}
-				const checkData = {
-					...dayWorkInfo,
-					dayworkCarriers: newBindList.value,
-					newCarrierCode: vehicleObj.carrierCode
-				}
-				console.log("dayWorkInfo", dayWorkInfo);
-				checkCarrierNew(checkData).then(response => {
-					if (response.code == 200) {
-						newBindList.value.push(JSON.parse(ret.resp_result));
-					} else {
+					for (let i = 0; i < newBindList.value.length; i++) {
+						if (newBindList.value[i].carrierCode === vehicleObj.carrierCode) {
+							uni.showToast({
+								icon: "none",
+								title: "载具已存在"
+							})
+							return;
+						}
+					}
+					const checkData = {
+						...dayWorkInfo,
+						dayworkCarriers: newBindList.value,
+						newCarrierCode: vehicleObj.carrierCode
+					}
+					console.log("dayWorkInfo", dayWorkInfo);
+					checkCarrierNew(checkData).then(response => {
+						if (response.code == 200) {
+							newBindList.value.push(response.data);
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: response.msg
+							})
+							return;
+						}
+					}).catch(err => {
 						uni.showToast({
 							icon: 'none',
-							title: response.msg
+							title: '箱码检测检测错误' + err.message
 						})
-						return;
-					}
-				}).catch(err => {
+					})
+				}
+			);
+		} else {
+			const checkData = {
+				...dayWorkInfo,
+				dayworkCarriers: newBindList.value,
+				newCarrierCode: '500002'
+			}
+			checkCarrierNew(checkData).then(response => {
+				if (response.code == 200) {
+					console.log("带回", response);
+					newBindList.value.push(response.data);
+					console.log("newBindList添加", newBindList.value);
+				} else {
 					uni.showToast({
 						icon: 'none',
-						title: '箱码检测检测错误' + err.message
+						title: response.msg
 					})
+					return;
+				}
+			}).catch(err => {
+				uni.showToast({
+					icon: 'none',
+					title: '箱码检测检测错误' + err.message
 				})
-			}
-		);
+			})
+		}
+
 	}
 
 	function handleSubmit() {

pages/outsourcedReturnCheck/carriers.vue

@@ -111,17 +111,17 @@
 			console.log(res)
 		})
 	}
-/*
-	function checkItem(item) {
-		// console.log(item)
-		if (checkedCarriers.value.findIndex(v => item.id === v) >= 0) {
-			return true
-		} else {
-			return false;
+	/*
+		function checkItem(item) {
+			// console.log(item)
+			if (checkedCarriers.value.findIndex(v => item.id === v) >= 0) {
+				return true
+			} else {
+				return false;
+			}
+			// return true;
 		}
-		// return true;
-	}
-*/
+	*/
 	function checkItem(item) {
 		if (checkedCarriers.value.findIndex(v => item.code === v) >= 0) {
 			return true
@@ -129,113 +129,113 @@
 			return false;
 		}
 	}
-/* 【原有的handleScanCode代码】
-	function handleScanCode() {
-		// 引入原生插件
-		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-		// const mpaasScanModule = false
-		if (mpaasScanModule) {
-			// 调用插件的 mpaasScan 方法
-			mpaasScanModule.mpaasScan({
-					// 扫码识别类型，参数可多选，qrCode、barCode，
-					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
-					scanType: ["qrCode", "barCode"],
-					// 是否隐藏相册，默认false不隐藏
-					hideAlbum: false,
-				},
-				(ret) => {
-					let vehicleObj = JSON.parse(ret.resp_result);
-					if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
-						message.value = '请扫载具码'
-						inputDialog.value.open()
-						return;
-					}
-					let checked = false
-					let allChecked = true
-					details.value.forEach(l => {
-						checked = checked || (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
-						// allChecked = allChecked && (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
-						if (checked) {
-							checkedCarriers.value.push(vehicleObj.carrierId)
+	/* 【原有的handleScanCode代码】
+		function handleScanCode() {
+			// 引入原生插件
+			const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+			// const mpaasScanModule = false
+			if (mpaasScanModule) {
+				// 调用插件的 mpaasScan 方法
+				mpaasScanModule.mpaasScan({
+						// 扫码识别类型，参数可多选，qrCode、barCode，
+						// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+						scanType: ["qrCode", "barCode"],
+						// 是否隐藏相册，默认false不隐藏
+						hideAlbum: false,
+					},
+					(ret) => {
+						let vehicleObj = JSON.parse(ret.resp_result);
+						if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
+							message.value = '请扫载具码'
+							inputDialog.value.open()
+							return;
 						}
-						allChecked = allChecked && l.carriers.every(t => checkedCarriers.value.includes(t.id))
-					})
-					if (checked) {
-						uni.showToast({
-							icon: 'none',
-							title: '已扫箱' + vehicleObj.carrierCode
+						let checked = false
+						let allChecked = true
+						details.value.forEach(l => {
+							checked = checked || (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
+							// allChecked = allChecked && (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
+							if (checked) {
+								checkedCarriers.value.push(vehicleObj.carrierId)
+							}
+							allChecked = allChecked && l.carriers.every(t => checkedCarriers.value.includes(t.id))
 						})
-						if (allChecked) {
-							debonce(() => {
-								uni.showToast({
-									icon: 'none',
-									title: '已验证所有箱码'
-								})
-							}, 700)
+						if (checked) {
+							uni.showToast({
+								icon: 'none',
+								title: '已扫箱' + vehicleObj.carrierCode
+							})
+							if (allChecked) {
+								debonce(() => {
+									uni.showToast({
+										icon: 'none',
+										title: '已验证所有箱码'
+									})
+								}, 700)
+							} else {
+								debounce(handleScanCode, 700)
+							}
 						} else {
-							debounce(handleScanCode, 700)
+							message.value = '该箱号' + vehicleObj.carrierCode + '不在此发出单'
+							inputDialog.value.open()
+							return
 						}
-					} else {
-						message.value = '该箱号' + vehicleObj.carrierCode + '不在此发出单'
-						inputDialog.value.open()
-						return
 					}
-				}
-			);
-		} else {
-			// message.value = '测试dialog'
-			// console.log(message.value)
-			// inputDialog.value.open()
-			// if (checkedCarriers.value.length < details.value[0].carriers.length) {
-			// 	checkedCarriers.value.push(details.value[0].carriers[checkedCarriers.value.length].id)
-			// } else {
-			// 	checkedCarriers.value.pop()
-			// }
-			// debounce(handleScanCode, 700)
-			let vehicleObj = {
-				carrierId: "1",
-				carrierCode: "1"
-			};
+				);
+			} else {
+				// message.value = '测试dialog'
+				// console.log(message.value)
+				// inputDialog.value.open()
+				// if (checkedCarriers.value.length < details.value[0].carriers.length) {
+				// 	checkedCarriers.value.push(details.value[0].carriers[checkedCarriers.value.length].id)
+				// } else {
+				// 	checkedCarriers.value.pop()
+				// }
+				// debounce(handleScanCode, 700)
+				let vehicleObj = {
+					carrierId: "1",
+					carrierCode: "1"
+				};
 
-			if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
-				message.value = '请扫载具码'
-				inputDialog.value.open()
-				return;
-			}
-			let checked = false
-			let allChecked = true
-			details.value.forEach(l => {
-				checked = checked || (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
-				// allChecked = allChecked && (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
-				if (checked) {
-					checkedCarriers.value.push(vehicleObj.carrierId)
+				if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
+					message.value = '请扫载具码'
+					inputDialog.value.open()
+					return;
 				}
-				allChecked = allChecked && l.carriers.every(t => checkedCarriers.value.includes(t.id))
-			})
-			if (checked) {
-				uni.showToast({
-					icon: 'none',
-					title: '已扫箱' + vehicleObj.carrierCode
+				let checked = false
+				let allChecked = true
+				details.value.forEach(l => {
+					checked = checked || (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
+					// allChecked = allChecked && (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
+					if (checked) {
+						checkedCarriers.value.push(vehicleObj.carrierId)
+					}
+					allChecked = allChecked && l.carriers.every(t => checkedCarriers.value.includes(t.id))
 				})
-				if (allChecked) {
-					debonce(() => {
-						uni.showToast({
-							icon: 'none',
-							title: '已验证所有箱码'
-						})
-					}, 700)
+				if (checked) {
+					uni.showToast({
+						icon: 'none',
+						title: '已扫箱' + vehicleObj.carrierCode
+					})
+					if (allChecked) {
+						debonce(() => {
+							uni.showToast({
+								icon: 'none',
+								title: '已验证所有箱码'
+							})
+						}, 700)
+					} else {
+						debounce(handleScanCode, 700)
+					}
 				} else {
-					debounce(handleScanCode, 700)
+					message.value = '该箱号' + vehicleObj.carrierCode + '不在此发出单'
+					inputDialog.value.open()
+					return
 				}
-			} else {
-				message.value = '该箱号' + vehicleObj.carrierCode + '不在此发出单'
-				inputDialog.value.open()
-				return
 			}
 		}
-	}
-*/
-function handleScanCode() {
+	*/
+	function handleScanCode() {
 		// 引入原生插件
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
 		// const mpaasScanModule = false
@@ -249,7 +249,9 @@ function handleScanCode() {
 					hideAlbum: false,
 				},
 				(ret) => {
-					let vehicleObj = {carrierCode: ret.resp_result};
+					let vehicleObj = {
+						carrierCode: ret.resp_result
+					};
 					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
 						message.value = '请扫载具码'
 						inputDialog.value.open()
@@ -258,11 +260,13 @@ function handleScanCode() {
 					let checked = false
 					let allChecked = true
 					details.value.forEach(l => {
-						checked = checked || (l.carriers.findIndex(e => e.id === vehicleObj.carrierCode) >= 0)
+						checked = checked || (l.carriers.findIndex(e => e.caode === vehicleObj.carrierCode) >=
+							0)
 						if (checked) {
 							checkedCarriers.value.push(vehicleObj.carrierCode)
 						}
-						allChecked = allChecked && l.carriers.every(t => checkedCarriers.value.includes(t.code))
+						allChecked = allChecked && l.carriers.every(t => checkedCarriers.value.includes(t
+							.code))
 					})
 					if (checked) {
 						uni.showToast({
@@ -289,7 +293,7 @@ function handleScanCode() {
 		} else {
 			let vehicleObj = {
 				carrierId: "0",
-				carrierCode: "1"
+				carrierCode: "500001"
 			};
 
 			if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
@@ -300,7 +304,7 @@ function handleScanCode() {
 			let checked = false
 			let allChecked = true
 			details.value.forEach(l => {
-				checked = checked || (l.carriers.findIndex(e => e.id === vehicleObj.carrierCode) >= 0)
+				checked = checked || (l.carriers.findIndex(e => e.code === vehicleObj.carrierCode) >= 0)
 				// allChecked = allChecked && (l.carriers.findIndex(e => e.id === vehicleObj.carrierId) >= 0)
 				if (checked) {
 					checkedCarriers.value.push(vehicleObj.carrierCode)