From a8ebfcbec49fb628fa2fa1a66bc1950125bc0786 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 18 五月 2026 14:51:14 +0800
Subject: [PATCH] 优化设备保养表单：新增保养人选择器，确保保养人必填，加载保养人列表
---
src/pages/equipmentManagement/upkeep/add.vue | 145 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 113 insertions(+), 32 deletions(-)
diff --git a/src/pages/equipmentManagement/upkeep/add.vue b/src/pages/equipmentManagement/upkeep/add.vue
index c0e7e34..bc8cae0 100644
--- a/src/pages/equipmentManagement/upkeep/add.vue
+++ b/src/pages/equipmentManagement/upkeep/add.vue
@@ -40,6 +40,27 @@
<u-icon name="arrow-right" @click="showDatePicker" />
</template>
</u-form-item>
+
+ <u-form-item label="淇濆吇浜�" prop="maintenancePerson" required border-bottom>
+ <u-input
+ v-model="form.maintenancePerson"
+ placeholder="璇烽�夋嫨淇濆吇浜�"
+ readonly
+ @click="showPersonPicker"
+ clearable
+ />
+ <template #right>
+ <u-icon name="arrow-right" @click="showPersonPicker" />
+ </template>
+ </u-form-item>
+
+ <u-form-item label="淇濆吇椤圭洰" prop="maintenanceItems" border-bottom>
+ <u-input
+ v-model="form.maintenanceItems"
+ placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
+ clearable
+ />
+ </u-form-item>
<!-- 鎻愪氦鎸夐挳 -->
<view class="footer-btns">
@@ -56,6 +77,14 @@
@select="onDeviceConfirm"
@close="showDevice = false"
/>
+ <!-- 淇濆吇浜洪�夋嫨鍣� -->
+ <up-action-sheet
+ :show="showPerson"
+ :actions="personActions"
+ title="閫夋嫨淇濆吇浜�"
+ @select="onPersonConfirm"
+ @close="showPerson = false"
+ />
<up-datetime-picker
:show="showDate"
v-model="pickerDateValue"
@@ -69,12 +98,16 @@
<script setup>
import { ref, computed, onMounted, onUnmounted } from 'vue';
-import { onShow } from '@dcloudio/uni-app';
+import { onShow, onUnload } from '@dcloudio/uni-app';
import PageHeader from '@/components/PageHeader.vue';
import { getDeviceLedger } from '@/api/equipmentManagement/ledger';
import { addUpkeep, editUpkeep, getUpkeepById } from '@/api/equipmentManagement/upkeep';
+import { userListNoPageByTenantId } from '@/api/system/user';
+import useUserStore from '@/store/modules/user';
import dayjs from "dayjs";
import { formatDateToYMD } from '@/utils/ruoyi';
+
+const userStore = useUserStore();
defineOptions({
name: "璁惧淇濆吇璁″垝琛ㄥ崟",
@@ -86,11 +119,19 @@
})
}
+const normalizeId = (raw) => {
+ if (raw === null || raw === undefined) return undefined;
+ const val = String(raw).trim();
+ if (!val || val === 'undefined' || val === 'null') return undefined;
+ return val;
+};
+
// 琛ㄥ崟寮曠敤
const formRef = ref(null);
const operationType = ref('add');
const loading = ref(false);
const showDevice = ref(false);
+const showPerson = ref(false);
const showDate = ref(false);
const pickerDateValue = ref(Date.now());
const currentDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()]);
@@ -98,12 +139,20 @@
// 璁惧閫夐」
const deviceOptions = ref([]);
const deviceNameText = ref('');
+// 淇濆吇浜洪�夐」
+const userOptions = ref([]);
// 杞崲涓� action-sheet 闇�瑕佺殑鏍煎紡
const deviceActions = computed(() => {
return deviceOptions.value.map(item => ({
text: item.deviceName,
value: item.id,
data: item
+ }));
+});
+const personActions = computed(() => {
+ return userOptions.value.map(item => ({
+ name: item.nickName,
+ value: item.userId,
}));
});
@@ -115,6 +164,7 @@
const formRules = {
deviceLedgerId: [{ required: true, trigger: "change", message: "璇烽�夋嫨璁惧鍚嶇О" }],
maintenancePlanTime: [{ required: true, trigger: "change", message: "璇烽�夋嫨璁″垝淇濆吇鏃ユ湡" }],
+ maintenancePerson: [{ required: true, trigger: "change", message: "璇烽�夋嫨淇濆吇浜�" }],
};
// 浣跨敤 ref 澹版槑琛ㄥ崟鏁版嵁
@@ -122,6 +172,8 @@
deviceLedgerId: undefined, // 璁惧ID
deviceModel: undefined, // 瑙勬牸鍨嬪彿
maintenancePlanTime: dayjs().format("YYYY-MM-DD"), // 璁″垝淇濆吇鏃ユ湡
+ maintenancePerson: userStore.nickName || undefined, // 淇濆吇浜�
+ maintenanceItems: undefined, // 淇濆吇椤圭洰
});
// 鍔犺浇璁惧鍒楄〃
@@ -131,6 +183,16 @@
deviceOptions.value = data || [];
} catch (e) {
showToast('鑾峰彇璁惧鍒楄〃澶辫触');
+ }
+};
+
+// 鍔犺浇淇濆吇浜哄垪琛�
+const loadUserOptions = async () => {
+ try {
+ const { data } = await userListNoPageByTenantId();
+ userOptions.value = data || [];
+ } catch (e) {
+ showToast('鑾峰彇淇濆吇浜哄垪琛ㄥけ璐�');
}
};
@@ -144,6 +206,8 @@
form.value.deviceLedgerId = data.deviceLedgerId;
form.value.deviceModel = data.deviceModel;
form.value.maintenancePlanTime = dayjs(data.maintenancePlanTime).format("YYYY-MM-DD");
+ form.value.maintenancePerson = data.maintenancePerson;
+ form.value.maintenanceItems = data.maintenanceItems || data.maintenanceLocation;
// 璁剧疆璁惧鍚嶇О鏄剧ず
const device = deviceOptions.value.find(item => item.id === data.deviceLedgerId);
if (device) {
@@ -187,24 +251,25 @@
}
isScanning.value = true;
- showToast('鎵爜鎴愬姛锛�3绉掑悗鑷姩濉厖璁惧淇℃伅');
+ showToast('鎵爜鎴愬姛');
// 3绉掑悗澶勭悊鎵爜缁撴灉
scanTimer.value = setTimeout(() => {
processScanResult(scanResult);
isScanning.value = false;
- }, 3000);
+ }, 1000);
};
-
+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) {
// 鎵惧埌鍖归厤鐨勮澶囷紝鑷姩濉厖
@@ -221,6 +286,22 @@
// 鏄剧ず璁惧閫夋嫨鍣�
const showDevicePicker = () => {
showDevice.value = true;
+};
+
+// 鏄剧ず淇濆吇浜洪�夋嫨鍣�
+const showPersonPicker = () => {
+ if (!userOptions.value.length) {
+ showToast('鏆傛棤鍙�変繚鍏讳汉');
+ return;
+ }
+ showPerson.value = true;
+};
+
+// 纭淇濆吇浜洪�夋嫨
+const onPersonConfirm = (selected) => {
+ const user = userOptions.value.find(item => item.userId === selected.value);
+ form.value.maintenancePerson = user?.nickName || selected.name || '';
+ showPerson.value = false;
};
// 纭璁惧閫夋嫨
@@ -252,8 +333,9 @@
});
onMounted(() => {
- // 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄥ拰鍙傛暟
+ // 椤甸潰鍔犺浇鏃惰幏鍙栬澶囧垪琛ㄣ�佷繚鍏讳汉鍒楄〃鍜屽弬鏁�
loadDeviceName();
+ loadUserOptions();
getPageParams();
});
@@ -288,6 +370,7 @@
if (code == 200) {
showToast(`${id ? "缂栬緫" : "鏂板"}璁″垝鎴愬姛`);
setTimeout(() => {
+ uni.removeStorageSync('repairId');
uni.navigateBack();
}, 1500);
} else {
@@ -301,32 +384,30 @@
// 杩斿洖涓婁竴椤�
const goBack = () => {
+ // 娓呴櫎瀛樺偍鐨刬d
+ uni.removeStorageSync('repairId');
uni.navigateBack();
-};
-
-// 鑾峰彇椤甸潰鍙傛暟
-const getPageParams = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
-
- // 鏍规嵁鏄惁鏈塱d鍙傛暟鏉ュ垽鏂槸鏂板杩樻槸缂栬緫
- if (options.id) {
- // 缂栬緫妯″紡锛岃幏鍙栬鎯�
- loadForm(options.id);
- } else {
- // 鏂板妯″紡
- loadForm();
- }
};
// 鑾峰彇椤甸潰ID
const getPageId = () => {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- const options = currentPage.options;
- return options.id;
+ return normalizeId(uni.getStorageSync('repairId'));
};
+
+// 鑾峰彇椤甸潰鍙傛暟
+const getPageParams = () => {
+ const id = getPageId();
+ if (id) {
+ loadForm(id);
+ } else {
+ operationType.value = 'add';
+ loadForm();
+ }
+};
+
+onUnload(() => {
+ uni.removeStorageSync('repairId');
+});
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3