guoyujia 1 year ago
parent
commit
0ab6db60af
2 changed files with 46 additions and 41 deletions
  1. 25 32
      pages/outsourcedInspection/scan.vue
  2. 21 9
      pages/processInspection/scan.vue

+ 25 - 32
pages/outsourcedInspection/scan.vue

@@ -64,18 +64,28 @@
 
 
 	// 扫码
 	// 扫码
 	const handleScanCode = () => {
 	const handleScanCode = () => {
-		console.log("外协检查扫码")
-		uni.scanCode({
-			onlyFromCamera: true,
-			success: function(res) {
-				if (res.scanType !== 'QR_CODE') {
-					uni.showToast({
-						icon: 'none',
-						title: '二维码未识别成功',
-						duration: 2000
-					})
-					return
-				}
+		// 引入原生插件
+		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+		if (mpaasScanModule) {
+			// 调用插件的 mpaasScan 方法
+			mpaasScanModule.mpaasScan({
+					// 扫码识别类型,参数可多选,qrCode、barCode,
+					// 如不设置,默认识别所有扫码类型,可能有些许影响识别效率
+					scanType: ["qrCode", "barCode"],
+					// 是否隐藏相册,默认false不隐藏
+					hideAlbum: false,
+				},
+				(ret) => {
+					console.log(ret);
+					const result = JSON.parse(ret.resp_result);
+					if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
+						uni.showToast({
+							icon: "none",
+							title: "请扫载具码",
+							duration: 1000
+						})
+						return;
+					}
 				const result = JSON.parse(res.result)
 				const result = JSON.parse(res.result)
 
 
 				result.processCode = store.outsourcedCode;
 				result.processCode = store.outsourcedCode;
@@ -98,27 +108,10 @@
 					}
 					}
 
 
 				})
 				})
-				// getLotOutsourcedInfo(result).then(resqust => {
-				// 	console.log("想不出来名字的输出", resqust);
-				// 	if (resqust.code == 200) {
-				// 		lot.value = resqust.data;
-				// 		lot.value.carrierCode = result.carrierCode
-				// 		carrierCode.value = result.carrierCode;
-				// 		console.log("resqust", resqust);
-				// 		uni.hideLoading();
-				// 	} else {
-				// 		uni.showToast({
-				// 			icon: 'none',
-				// 			title: resqust.msg,
-				// 			duration: 2000
-				// 		})
-				// 	}
-
-				// })
-
 			}
 			}
-		});
-	}
+			)
+		}
+}
 
 
 	//选择批号弹窗带回
 	//选择批号弹窗带回
 	function handleSelectProcessInspection(data) {
 	function handleSelectProcessInspection(data) {

+ 21 - 9
pages/processInspection/scan.vue

@@ -63,16 +63,27 @@
 
 
 	// 扫码
 	// 扫码
 	const handleScanCode = () => {
 	const handleScanCode = () => {
-		uni.scanCode({
-			onlyFromCamera: true,
-			success: function(res) {
-				if (res.scanType !== 'QR_CODE') {
+	// 引入原生插件
+	const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+	if (mpaasScanModule) {
+		// 调用插件的 mpaasScan 方法
+		mpaasScanModule.mpaasScan({
+				// 扫码识别类型,参数可多选,qrCode、barCode,
+				// 如不设置,默认识别所有扫码类型,可能有些许影响识别效率
+				scanType: ["qrCode", "barCode"],
+				// 是否隐藏相册,默认false不隐藏
+				hideAlbum: false,
+			},
+			(ret) => {
+				console.log(ret);
+				const result = JSON.parse(ret.resp_result);
+				if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
 					uni.showToast({
 					uni.showToast({
-						icon: 'none',
-						title: '二维码未识别成功',
-						duration: 2000
+						icon: "none",
+						title: "请扫载具码",
+						duration: 1000
 					})
 					})
-					return
+					return;
 				}
 				}
 				const result = JSON.parse(res.result)
 				const result = JSON.parse(res.result)
 
 
@@ -117,7 +128,8 @@
 				})
 				})
 
 
 			}
 			}
-		});
+		);
+		}
 	}
 	}
 
 
 	//选择批号弹窗带回
 	//选择批号弹窗带回