From 752b14d2caa47ccceac328f79389fbf5e2e62ce4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 24 九月 2025 15:18:39 +0800
Subject: [PATCH] 分析追溯
---
src/pages/equipmentManagement/repair/add.vue | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index b4252d3..0940052 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -4,7 +4,7 @@
<PageHeader :title="operationType === 'edit' ? '缂栬緫鎶ヤ慨' : '鏂板鎶ヤ慨'" @back="goBack" />
<!-- 琛ㄥ崟鍐呭 -->
- <u-form @submit="sendForm" ref="formRef" :rules="formRules" label-width="110" input-align="right" error-message-align="right">
+ <u-form @submit="sendForm" ref="formRef" :rules="formRules" :model="form" label-width="110">
<!-- 鍩烘湰淇℃伅 -->
<u-cell-group title="鍩烘湰淇℃伅">
<u-form-item label="璁惧鍚嶇О" prop="deviceLedgerId" required border-bottom>
@@ -13,6 +13,7 @@
placeholder="璇烽�夋嫨璁惧鍚嶇О"
@click="showDevicePicker"
clearable
+ readonly=""
/>
<template #right>
<u-icon name="scan" @click="startScan" class="scan-icon" />
@@ -169,7 +170,7 @@
if (code == 200) {
form.value.deviceLedgerId = data.deviceLedgerId;
form.value.deviceModel = data.deviceModel;
- form.value.repairTime = data.repairTime;
+ form.value.repairTime = dayjs(data.repairTime).format("YYYY-MM-DD");
form.value.repairName = data.repairName;
form.value.remark = data.remark;
// 璁剧疆璁惧鍚嶇О鏄剧ず
@@ -185,28 +186,6 @@
// 鏂板妯″紡
operationType.value = 'add';
}
-};
-
-// 娓呴櫎琛ㄥ崟鏍￠獙鐘舵��
-const clearValidate = () => {
- formRef.value?.clearValidate();
-};
-
-// 閲嶇疆琛ㄥ崟鏁版嵁鍜屾牎楠岀姸鎬�
-const resetForm = () => {
- form.value = {
- deviceLedgerId: undefined,
- deviceModel: undefined,
- repairTime: dayjs().format("YYYY-MM-DD"),
- repairName: undefined,
- remark: undefined,
- };
- deviceNameText.value = '';
-};
-
-const resetFormAndValidate = () => {
- resetForm();
- clearValidate();
};
// 鎵弿浜岀淮鐮佸姛鑳�
@@ -237,24 +216,26 @@
}
isScanning.value = true;
- showToast('鎵爜鎴愬姛锛�3绉掑悗鑷姩濉厖璁惧淇℃伅');
+ showToast('鎵爜鎴愬姛');
// 3绉掑悗澶勭悊鎵爜缁撴灉
scanTimer.value = setTimeout(() => {
processScanResult(scanResult);
isScanning.value = false;
- }, 3000);
+ }, 100);
};
+function getDeviceIdByRegExp(url) {
+ // 鍖归厤deviceId=鍚庨潰鐨勬暟瀛�
+ const reg = /deviceId=(\d+)/;
+ const match = url.match(reg);
+ // 濡傛灉鍖归厤鍒扮粨鏋滐紝杩斿洖鏁板瓧绫诲瀷锛屽惁鍒欒繑鍥瀗ull
+ return match ? Number(match[1]) : null;
+}
// 澶勭悊鎵爜缁撴灉骞跺尮閰嶈澶�
const processScanResult = (scanResult) => {
- // 鍦ㄨ澶囧垪琛ㄤ腑鏌ユ壘鍖归厤鐨勮澶�
- // 鍋囪浜岀淮鐮佸唴瀹规槸璁惧鍚嶇О鎴栬澶囩紪鍙�
- const matchedDevice = deviceOptions.value.find(device =>
- device.deviceName === scanResult ||
- device.deviceCode === scanResult ||
- device.id.toString() === scanResult
- );
+ const deviceId = getDeviceIdByRegExp(scanResult);
+ const matchedDevice = deviceOptions.value.find(item => item.id == deviceId);
if (matchedDevice) {
// 鎵惧埌鍖归厤鐨勮澶囷紝鑷姩濉厖
@@ -288,6 +269,7 @@
// 纭鏃ユ湡閫夋嫨
const onDateConfirm = (e) => {
form.value.repairTime = formatDateToYMD(e.value);
+ pickerDateValue.value = dayjs(e.value).format("YYYY-MM-DD");
showDate.value = false;
};
@@ -313,18 +295,37 @@
const sendForm = async () => {
try {
// 鎵嬪姩楠岃瘉琛ㄥ崟
- await formRef.value?.validate();
-
+ let isValid = true;
+ let errorMessage = '';
+ if (!form.value.deviceLedgerId) {
+ isValid = false;
+ errorMessage = '璇烽�夋嫨璁惧鍚嶇О';
+ } else if (!form.value.repairTime || form.value.repairTime.trim() === '') {
+ isValid = false;
+ errorMessage = '璇烽�夋嫨鎶ヤ慨鏃ユ湡';
+ } else if (!form.value.repairName || form.value.repairName.trim() === '') {
+ isValid = false;
+ errorMessage = '璇疯緭鍏ユ姤淇汉';
+ } else if (!form.value.remark || form.value.remark.trim() === '') {
+ isValid = false;
+ errorMessage = '璇疯緭鍏ユ晠闅滅幇璞�';
+ }
+
+ if (!isValid) {
+ showToast(errorMessage);
+ return;
+ }
+
loading.value = true;
const id = getPageId();
-
+
// 鍑嗗鎻愪氦鏁版嵁
const submitData = { ...form.value };
-
+
const { code } = id
? await editRepair({ id: id, ...submitData })
: await addRepair(submitData);
-
+
if (code == 200) {
showToast(`${id ? "缂栬緫" : "鏂板"}鎶ヤ慨鎴愬姛`);
setTimeout(() => {
@@ -341,19 +342,21 @@
// 杩斿洖涓婁竴椤�
const goBack = () => {
+ uni.removeStorageSync('repairId');
uni.navigateBack();
};
// 鑾峰彇椤甸潰鍙傛暟
const getPageParams = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
+ // 浣跨敤uni.getStorageSync鑾峰彇id
+ const id = uni.getStorageSync('repairId');
// 鏍规嵁鏄惁鏈塱d鍙傛暟鏉ュ垽鏂槸鏂板杩樻槸缂栬緫
- if (options.id) {
+ if (id) {
// 缂栬緫妯″紡锛岃幏鍙栬鎯�
- loadForm(options.id);
+ loadForm(id);
+ // 鍙�夛細鑾峰彇鍚庢竻闄ゅ瓨鍌ㄧ殑id锛岄伩鍏嶅奖鍝嶅悗缁搷浣�
+ uni.removeStorageSync('repairId');
} else {
// 鏂板妯″紡
loadForm();
@@ -362,10 +365,9 @@
// 鑾峰彇椤甸潰ID
const getPageId = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
- return options.id;
+ // 浣跨敤uni.getStorageSync鑾峰彇id
+ const id = uni.getStorageSync('repairId');
+ return id;
};
</script>
--
Gitblit v1.9.3