From 5c48ef2b8267c38bae717202615e1618074ee31c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 29 八月 2025 15:25:05 +0800
Subject: [PATCH] 修改组件

---
 src/pages/equipmentManagement/repair/add.vue |  281 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 183 insertions(+), 98 deletions(-)

diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index 7b865c0..e9a9dfb 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -4,95 +4,103 @@
 		<PageHeader :title="operationType === 'edit' ? '缂栬緫鎶ヤ慨' : '鏂板鎶ヤ慨'" @back="goBack" />
 		
 		<!-- 琛ㄥ崟鍐呭 -->
-		<van-form @submit="sendForm" ref="formRef" label-width="110px" input-align="right" error-message-align="right" scroll-to-error scroll-to-error-position="center">
+		<u-form @submit="sendForm" ref="formRef" label-width="110" input-align="right" error-message-align="right">
 			<!-- 鍩烘湰淇℃伅 -->
-			<van-cell-group title="鍩烘湰淇℃伅" inset>
-				<van-field
-					v-model="deviceNameText"
-					label="璁惧鍚嶇О"
-					placeholder="璇烽�夋嫨璁惧鍚嶇О"
-					:rules="formRules.deviceLedgerId"
-					required
-					readonly
-					@click="showDevicePicker"
-					clearable
-				/>
-				<van-field
-					v-model="form.deviceModel"
-					label="瑙勬牸鍨嬪彿"
-					placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
-					readonly
-					clearable
-				/>
-				<van-field
-					v-model="form.repairTime"
-					label="鎶ヤ慨鏃ユ湡"
-					placeholder="璇烽�夋嫨鎶ヤ慨鏃ユ湡"
-					:rules="formRules.repairTime"
-					required
-					readonly
-					@click="showDatePicker"
-					clearable
-				/>
-				<van-field
-					v-model="form.repairName"
-					label="鎶ヤ慨浜�"
-					placeholder="璇疯緭鍏ユ姤淇汉"
-					:rules="formRules.repairName"
-					required
-					clearable
-				/>
-				<van-field
-					v-model="form.remark"
-					label="鏁呴殰鐜拌薄"
-					type="textarea"
-					rows="3"
-					placeholder="璇疯緭鍏ユ晠闅滅幇璞�"
-					:rules="formRules.remark"
-					required
-					clearable
-					maxlength="200"
-					show-word-limit
-				/>
-			</van-cell-group>
+			<u-cell-group title="鍩烘湰淇℃伅">
+				<u-form-item label="璁惧鍚嶇О" prop="deviceLedgerId" required>
+					<u-input
+						v-model="deviceNameText"
+						placeholder="璇烽�夋嫨璁惧鍚嶇О"
+						readonly
+						@click="showDevicePicker"
+						clearable
+					>
+						<template #suffix>
+							<u-icon name="scan" @click.stop="startScan" class="scan-icon" />
+						</template>
+					</u-input>
+				</u-form-item>
+				<u-form-item label="瑙勬牸鍨嬪彿">
+					<u-input
+						v-model="form.deviceModel"
+						placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+						readonly
+						clearable
+					/>
+				</u-form-item>
+				<u-form-item label="鎶ヤ慨鏃ユ湡" prop="repairTime" required>
+					<u-input
+						v-model="form.repairTime"
+						placeholder="璇烽�夋嫨鎶ヤ慨鏃ユ湡"
+						readonly
+						@click="showDatePicker"
+						clearable
+					/>
+				</u-form-item>
+				<u-form-item label="鎶ヤ慨浜�" prop="repairName" required>
+					<u-input
+						v-model="form.repairName"
+						placeholder="璇疯緭鍏ユ姤淇汉"
+						clearable
+					/>
+				</u-form-item>
+				<u-form-item label="鏁呴殰鐜拌薄" prop="remark" required>
+					<u-textarea
+						v-model="form.remark"
+						placeholder="璇疯緭鍏ユ晠闅滅幇璞�"
+						:maxlength="200"
+						count
+						:autoHeight="true"
+					/>
+				</u-form-item>
+			</u-cell-group>
 			
 			<!-- 鎻愪氦鎸夐挳 -->
 			<view class="footer-btns">
-				<van-button class="cancel-btn" @click="goBack">鍙栨秷</van-button>
-				<van-button class="save-btn" native-type="submit" form-type="submit" :loading="loading">淇濆瓨</van-button>
+				<u-button class="cancel-btn" @click="goBack">鍙栨秷</u-button>
+				<u-button class="save-btn" type="primary" @click="sendForm" :loading="loading">淇濆瓨</u-button>
 			</view>
-		</van-form>
+		</u-form>
 
 		<!-- 璁惧閫夋嫨鍣� -->
-		<van-popup v-model:show="showDevice" position="bottom">
-			<van-picker
-				:model-value="devicePickerValue"
+		<u-popup v-model="showDevice" mode="bottom">
+			<u-picker
+				v-model="devicePickerValue"
 				:columns="deviceColumns"
 				@confirm="onDeviceConfirm"
 				@cancel="showDevice = false"
 			/>
-		</van-popup>
+		</u-popup>
 
 		<!-- 鏃ユ湡閫夋嫨鍣� -->
-		<van-popup v-model:show="showDate" position="bottom">
-			<van-date-picker
+		<u-popup v-model="showDate" mode="bottom">
+			<u-datetime-picker
 				v-model="currentDate"
 				title="閫夋嫨鏃ユ湡"
 				@confirm="onDateConfirm"
 				@cancel="showDate = false"
 			/>
-		</van-popup>
+		</u-popup>
 	</view>
 </template>
 
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 import PageHeader from '@/components/PageHeader.vue';
 import { getDeviceLedger } from '@/api/equipmentManagement/ledger';
 import { addRepair, editRepair, getRepairById } from '@/api/equipmentManagement/repair';
 import dayjs from "dayjs";
-import { showToast } from 'vant';
+// 鏇挎崲 Vant 鐨� toast
+// import { showToast } from 'vant';
+
+// 鏇挎崲 toast 鏂规硶
+const showToast = (message) => {
+  uni.showToast({
+    title: message,
+    icon: 'none'
+  })
+}
 
 defineOptions({
 	name: "璁惧鎶ヤ慨琛ㄥ崟",
@@ -110,6 +118,10 @@
 // 璁惧閫夐」
 const deviceOptions = ref([]);
 const deviceNameText = ref('');
+
+// 鎵爜鐩稿叧鐘舵��
+const isScanning = ref(false);
+const scanTimer = ref(null);
 
 // 琛ㄥ崟楠岃瘉瑙勫垯
 const formRules = {
@@ -204,6 +216,108 @@
 	clearValidate();
 };
 
+// 鎵弿浜岀淮鐮佸姛鑳�
+const startScan = () => {
+	if (isScanning.value) {
+		showToast('姝e湪鎵弿涓紝璇风◢鍊�...');
+		return;
+	}
+	
+	// 璋冪敤uni-app鐨勬壂鐮丄PI
+	uni.scanCode({
+		scanType: ['qrCode', 'barCode'],
+		success: (res) => {
+			handleScanResult(res.result);
+		},
+		fail: (err) => {
+			console.error('鎵爜澶辫触:', err);
+			showToast('鎵爜澶辫触锛岃閲嶈瘯');
+		}
+	});
+};
+
+// 澶勭悊鎵爜缁撴灉
+const handleScanResult = (scanResult) => {
+	if (!scanResult) {
+		showToast('鎵爜缁撴灉涓虹┖');
+		return;
+	}
+	
+	isScanning.value = true;
+	showToast('鎵爜鎴愬姛锛�3绉掑悗鑷姩濉厖璁惧淇℃伅');
+	
+	// 3绉掑悗澶勭悊鎵爜缁撴灉
+	scanTimer.value = setTimeout(() => {
+		processScanResult(scanResult);
+		isScanning.value = false;
+	}, 3000);
+};
+
+// 澶勭悊鎵爜缁撴灉骞跺尮閰嶈澶�
+const processScanResult = (scanResult) => {
+	// 鍦ㄨ澶囧垪琛ㄤ腑鏌ユ壘鍖归厤鐨勮澶�
+	// 鍋囪浜岀淮鐮佸唴瀹规槸璁惧鍚嶇О鎴栬澶囩紪鍙�
+	const matchedDevice = deviceOptions.value.find(device => 
+		device.deviceName === scanResult || 
+		device.deviceCode === scanResult ||
+		device.id.toString() === scanResult
+	);
+	
+	if (matchedDevice) {
+		// 鎵惧埌鍖归厤鐨勮澶囷紝鑷姩濉厖
+		form.value.deviceLedgerId = matchedDevice.id;
+		deviceNameText.value = matchedDevice.deviceName;
+		form.value.deviceModel = matchedDevice.deviceModel;
+		showToast('璁惧淇℃伅宸茶嚜鍔ㄥ~鍏�');
+	} else {
+		// 鏈壘鍒板尮閰嶇殑璁惧
+		showToast('鏈壘鍒板尮閰嶇殑璁惧锛岃鎵嬪姩閫夋嫨');
+	}
+};
+
+// 鏄剧ず璁惧閫夋嫨鍣�
+const showDevicePicker = () => {
+	showDevice.value = true;
+};
+
+// 纭璁惧閫夋嫨
+const onDeviceConfirm = ({ selectedValues, selectedOptions }) => {
+	form.value.deviceLedgerId = selectedOptions[0].value;
+	devicePickerValue.value = selectedValues;
+	showDevice.value = false;
+	setDeviceModel(selectedOptions[0].value);
+};
+
+// 鏄剧ず鏃ユ湡閫夋嫨鍣�
+const showDatePicker = () => {
+	showDate.value = true;
+};
+
+// 纭鏃ユ湡閫夋嫨
+const onDateConfirm = ({ selectedValues }) => {
+	form.value.repairTime = selectedValues.join('-');
+	currentDate.value = selectedValues;
+	showDate.value = false;
+};
+
+onShow(() => {
+	// 椤甸潰鏄剧ず鏃惰幏鍙栧弬鏁�
+	getPageParams();
+});
+
+onMounted(() => {
+	// 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄥ拰鍙傛暟
+	loadDeviceName();
+	getPageParams();
+});
+
+// 缁勪欢鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
+onUnmounted(() => {
+	if (scanTimer.value) {
+		clearTimeout(scanTimer.value);
+	}
+});
+
 // 鎻愪氦琛ㄥ崟
 const sendForm = async () => {
 	try {
@@ -262,42 +376,6 @@
 	const options = currentPage.options;
 	return options.id;
 };
-
-// 鏄剧ず璁惧閫夋嫨鍣�
-const showDevicePicker = () => {
-	showDevice.value = true;
-};
-
-// 纭璁惧閫夋嫨
-const onDeviceConfirm = ({ selectedValues, selectedOptions }) => {
-	form.value.deviceLedgerId = selectedOptions[0].value;
-	devicePickerValue.value = selectedValues;
-	showDevice.value = false;
-	setDeviceModel(selectedOptions[0].value);
-};
-
-// 鏄剧ず鏃ユ湡閫夋嫨鍣�
-const showDatePicker = () => {
-	showDate.value = true;
-};
-
-// 纭鏃ユ湡閫夋嫨
-const onDateConfirm = ({ selectedValues }) => {
-	form.value.repairTime = selectedValues.join('-');
-	currentDate.value = selectedValues;
-	showDate.value = false;
-};
-
-onShow(() => {
-	// 椤甸潰鏄剧ず鏃惰幏鍙栧弬鏁�
-	getPageParams();
-});
-
-onMounted(() => {
-	// 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄥ拰鍙傛暟
-	loadDeviceName();
-	getPageParams();
-});
 </script>
 
 <style scoped lang="scss">
@@ -353,4 +431,11 @@
 	font-size: 12px; 
 	color: #888; 
 }
+
+.scan-icon {
+	color: #1989fa;
+	font-size: 18px;
+	margin-left: 8px;
+	cursor: pointer;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3