Merge branch 'main' of http://47.109.71.130:3000/attiya/ebike-ui

ebike-maintenance/components/scanCode/scanCode.vue

@@ -33,6 +33,13 @@
 		code.value = value.detail.value;
 		emit('scan-change', value.detail.value);
 	}
+	
+	const onSetValue = (value) => {
+		code.value = value;
+	}
+	defineExpose({
+		onSetValue
+	});
 </script>
 
 <style>

ebike-maintenance/pages/warehouse/wholebind/wholebind.vue

@@ -19,7 +19,8 @@
 				<uni-section title="中控" type="line">
 					<uni-forms-item label="中控编号" required :name="['ebikeEcuInfo','ecuCode']"
 						:rules="[{ required: true, errorMessage: '请扫描或输入中控编号' }]">
-						<ecuCodeScan @scan-change="ecuCodeScanChange" :codeValue="ebikeInfo.ebikeEcuInfo.ecuCode" />
+						<ecuCodeScan @scan-change="ecuCodeScanChange" :codeValue="ebikeInfo.ebikeEcuInfo.ecuCode"
+							ref="ecuCodeScan_zk" />
 					</uni-forms-item>
 					<uni-forms-item label="中控序列号" required :name="['ebikeEcuInfo','ecuSN']"
 						:rules="[{ required: true, errorMessage: '请输入中控序列号' }]">
@@ -35,13 +36,13 @@
 					<uni-forms-item label="电池编号" required :name="['ebikeBatteryInfo','batteryCode']"
 						:rules="[{ required: true, errorMessage: '请扫描或输入电池编号' }]">
 						<scanCode @scan-change="batteryCodeScanChange"
-							:codeValue="ebikeInfo.ebikeBatteryInfo.batteryCode" />
+							:codeValue="ebikeInfo.ebikeBatteryInfo.batteryCode" ref="scanCode_dc" />
 					</uni-forms-item>
 				</uni-section>
 				<uni-section title="头盔" type="line">
 					<uni-forms-item label="头盔编号" :name="['ebikeHelmetInfo','helmetCode']">
-						<scanCode @scan-change="helmetCodeScanChange"
+						<scanCode @scan-change="helmetCodeScanChange" :codeValue="ebikeInfo.ebikeHelmetInfo.helmetCode"
-							:codeValue="ebikeInfo.ebikeHelmetInfo.helmetCode" />
+							ref="scanCode_tk" />
 					</uni-forms-item>
 				</uni-section>
 			</uni-forms>
@@ -63,6 +64,9 @@
 	} from '@/utils/tools';
 	const ebikeInfoForm = ref(null);
 	const bikeCodeScanRef = ref(null);
+	const ecuCodeScan_zk = ref(null);
+	const scanCode_dc = ref(null);
+	const scanCode_tk = ref(null);
 
 	const ebikeInfo = ref({
 		bikeCode: '',
@@ -172,21 +176,53 @@
 		// }, 1000);
 	};
 	const ecuCodeScanChange = (data) => {
-		ebikeInfo.value.ebikeEcuInfo.ecuCode = data["imei"];
+		if (!data["sn"]) return;
-		ebikeInfo.value.ebikeEcuInfo.ecuSN = data["sn"];
+
+		const params = {
+			"componentCode": data["sn"],
+			"componentType": "262711452730008" //中控
+		}
+
+		api.callOperateApi("ebikeComponent/validateComponentExistence", params).then(res => {
+			if (res.code == 200) {
+				if (res.data) {
+					ebikeInfo.value.ebikeEcuInfo.ecuCode = data["imei"];
+					ebikeInfo.value.ebikeEcuInfo.ecuSN = data["sn"];
+				} else {
+					ebikeInfo.value.ebikeEcuInfo.ecuCode = "";
+					ebikeInfo.value.ebikeEcuInfo.ecuSN = "";
+					ecuCodeScan_zk.value.onSetValue("");
+					showModelMessage("中控不在仓库中,请重新扫码或输入!");
+				}
+			} else {
+				ebikeInfo.value.ebikeEcuInfo.ecuCode = "";
+				ebikeInfo.value.ebikeEcuInfo.ecuSN = "";
+				ecuCodeScan_zk.value.onSetValue("");
+				showModelMessage("操作失败！");
+			}
+
+		})
 	};
 
 	const batteryCodeScanChange = (data) => {
 		if (!data) return;
-		api.callOperateApi("ebikeBatteryQrcode/checkbatteryCodeExistence?batteryCode=" + data, {},
+		const params = {
-			"get").then(res => {
+			"componentCode": data,
+			"componentType": "262711452730000" //电池
+		}
+		api.callOperateApi("ebikeComponent/validateComponentExistence", params).then(res => {
 			if (res.code == 200) {
-				if (res.data > 0) {
+				if (res.data) {
 					ebikeInfo.value.ebikeBatteryInfo.batteryCode = data;
 				} else {
 					ebikeInfo.value.ebikeBatteryInfo.batteryCode = "";
-					showModelMessage("电池二维码未生成,请重新扫码或输入!")
+					scanCode_dc.value.onSetValue("");
+					showModelMessage("电池不在仓库中,请重新扫码或输入!");
 				}
+			} else {
+				scanCode_dc.value.onSetValue("");
+				ebikeInfo.value.ebikeBatteryInfo.batteryCode = "";
+				showModelMessage("操作失败！");
 			}
 
 		})
@@ -194,16 +230,24 @@
 
 	const helmetCodeScanChange = (data) => {
 		if (!data) return;
-		api.callOperateApi("ebikeHelmetQrcode/checkhelmetCodeExistence?helmetCode=" + data, {},
+		const params = {
-			"get").then(res => {
+			"componentCode": data,
+			"componentType": "262711452730001" //头盔
+		}
+		api.callOperateApi("ebikeComponent/validateComponentExistence", params).then(res => {
 			if (res.code == 200) {
 				if (res.data > 0) {
 					ebikeInfo.value.ebikeHelmetInfo.helmetCode = data;
 				} else {
 					ebikeInfo.value.ebikeHelmetInfo.helmetCode = "";
+					scanCode_tk.value.onSetValue("");
 					// bikeCodeScanRef.value.onSetValue("");
-					showModelMessage("头盔二维码未生成,请重新扫码或输入!")
+					showModelMessage("头盔不在仓库中,请重新扫码或输入!")
 				}
+			} else {
+				scanCode_tk.value.onSetValue("");
+				ebikeInfo.value.ebikeHelmetInfo.helmetCode = "";
+				showModelMessage("操作失败！");
 			}
 
 		})

ebike-operate/src/views/Urban/OperateRegionAdd/index.vue

@@ -33,7 +33,7 @@
       <a-button
         v-if="current == 2"
         style="margin-left: 8px"
-        @click="prev"
+        @click="next"
       >完成</a-button>
       <a-button
         type="default"
@@ -80,11 +80,17 @@ const next = () => {
   switch (current.value) {
     case 0:
       formModelOperateAdd.value.formSave((bres, data) => {
-        if(bres) current.value++;
+        if (bres) current.value++;
       });
       break;
-    case 1: break;
+    case 1:
-    case 2: break;
+      formModel.value.formSave((bres, data) => {
+        if (bres) current.value++;
+      }); break;
+    case 2:
+      formModelOperateAdd.value.formSave((bres, data) => {
+        if (bres) current.value++;
+      }); break;
     default: break
   }
 };