From aeabb6a019fbb7e60bd3b6c8cf3e4081abdff80c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 20:39:10 +0800
Subject: [PATCH] feat: 设备巡检任务添加启用/停用
---
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 192 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 137 insertions(+), 55 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index efa04a5..35c8c0e 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
@@ -2,12 +2,12 @@
<FormDialog
v-model="visible"
:title="id ? '缂栬緫璁惧淇濆吇璁″垝' : '鏂板璁惧淇濆吇璁″垝'"
- width="640px"
+ width="680px"
@confirm="sendForm"
@cancel="handleCancel"
@close="handleClose"
>
- <el-form :model="form" label-width="100px">
+ <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="璁惧鍚嶇О">
<el-select
v-model="form.deviceLedgerId"
@@ -32,19 +32,44 @@
disabled
/>
</el-form-item>
- <el-form-item label="淇濆吇椤圭洰">
- <el-input
- v-model="form.maintenanceLocation"
- type="textarea"
- :rows="3"
- placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
- />
- </el-form-item>
<el-form-item label="褰曞叆浜�">
<el-input
:model-value="registrantDisplayName"
disabled
placeholder="褰撳墠鐧诲綍鐢ㄦ埛"
+ />
+ </el-form-item>
+ <el-form-item label="淇濆吇浜�" prop="maintenancePerson">
+ <el-select
+ v-model="form.maintenancePerson"
+ filterable
+ default-first-option
+ :reserve-keyword="false"
+ placeholder="璇烽�夋嫨淇濆吇浜�"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in userList"
+ :key="'mp-' + item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="淇濆吇閮ㄤ綅" prop="maintenanceLocation">
+ <el-input
+ v-model="form.maintenanceLocation"
+ type="textarea"
+ :rows="3"
+ placeholder="璇疯緭鍏ヤ繚鍏婚儴浣�"
+ />
+ </el-form-item>
+ <el-form-item label="淇濆吇鍐呭" prop="maintenanceItems">
+ <el-input
+ v-model="form.maintenanceItems"
+ type="textarea"
+ :rows="3"
+ placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�"
/>
</el-form-item>
<el-form-item v-if="id" label="淇濅慨鐘舵��">
@@ -54,7 +79,7 @@
<el-option label="澶辫触" :value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璁″垝淇濆吇鏃ユ湡">
+ <el-form-item label="璁″垝淇濆吇鏃ユ湡" prop="maintenancePlanTime">
<el-date-picker
style="width: 100%"
v-model="form.maintenancePlanTime"
@@ -90,15 +115,14 @@
} from "@/api/equipmentManagement/upkeep";
import {
listMaintenanceTaskFiles,
- bindMaintenanceTaskFile,
- uploadMaintenanceTaskFile,
delMaintenanceTaskFile,
} from "@/api/equipmentManagement/maintenanceTaskFile";
import { ElMessage } from "element-plus";
import { Plus } from "@element-plus/icons-vue";
import useFormData from "@/hooks/useFormData";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
-import { computed, onMounted, ref } from "vue";
+import { userListNoPageByTenantId } from "@/api/system/user.js";
+import { computed, nextTick, onMounted, ref, unref } from "vue";
import dayjs from "dayjs";
import useUserStore from "@/store/modules/user.js";
import request from "@/utils/request";
@@ -114,10 +138,21 @@
const pendingTempFiles = ref([]);
const planFileList = ref([]);
+// 缂栬緫妯″紡涓嬪凡淇濆瓨浣嗗緟鍒犻櫎鐨勬枃浠跺垪琛�
+const pendingDeleteFiles = ref([]);
const registrantDisplayName = computed(
() => userStore.nickName || userStore.name || "褰撳墠鐧诲綍鐢ㄦ埛"
);
+
+const formRef = ref();
+
+const rules = {
+ maintenancePerson: [{ required: true, message: "璇烽�夋嫨淇濆吇浜�", trigger: "change" }],
+ maintenanceLocation: [{ required: true, message: "璇疯緭鍏ヤ繚鍏婚儴浣�", trigger: "blur" }],
+ maintenanceItems: [{ required: true, message: "璇疯緭鍏ヤ繚鍏诲唴瀹�", trigger: "blur" }],
+ maintenancePlanTime: [{ required: true, message: "璇烽�夋嫨璁″垝淇濆吇鏃ユ湡", trigger: "change" }],
+};
const syncCreateUserFromLogin = () => {
if (userStore.id != null && userStore.id !== "") {
@@ -130,9 +165,16 @@
const loading = ref(false);
const deviceOptions = ref([]);
+const userList = ref([]);
+
const loadDeviceName = async () => {
const { data } = await getDeviceLedger();
deviceOptions.value = data;
+};
+
+const loadUserList = async () => {
+ const res = await userListNoPageByTenantId();
+ userList.value = res.data || [];
};
const { form, resetForm } = useFormData({
@@ -140,7 +182,9 @@
deviceName: undefined,
deviceModel: undefined,
maintenanceLocation: undefined,
+ maintenanceItems: undefined,
maintenancePlanTime: undefined,
+ maintenancePerson: undefined,
createUser: undefined,
status: 0,
});
@@ -155,6 +199,7 @@
const resetAttachmentState = () => {
pendingTempFiles.value = [];
planFileList.value = [];
+ pendingDeleteFiles.value = [];
};
const normalizeFilePreviewUrl = (url = "") => {
@@ -178,6 +223,8 @@
status: "success",
uid: `saved-${item.id}`,
fileId: item.id,
+ // 鏍囪涓哄凡淇濆瓨鐨勬枃浠讹紝涓嶆槸鏂颁笂浼犵殑
+ isNew: false,
}));
};
@@ -196,38 +243,33 @@
const handlePlanFileUpload = async (options) => {
const { file, onSuccess, onError } = options;
try {
- if (id.value) {
- const fd = new FormData();
- fd.append("file", file);
- fd.append("deviceMaintenanceId", String(id.value));
- const res = await uploadMaintenanceTaskFile(fd);
- if (res.code === 200) {
- await loadPlanFiles(id.value);
- onSuccess(res);
- ElMessage.success("闄勪欢涓婁紶鎴愬姛");
- } else {
- onError(new Error(res.msg || "涓婁紶澶辫触"));
- }
- return;
- }
+ // 鏃犺鏂板杩樻槸缂栬緫锛岄兘鍏堜笂浼犲埌涓存椂鐩綍
const res = await uploadTempFile(file);
if (res.code !== 200) {
onError(new Error(res.msg || "涓婁紶澶辫触"));
return;
}
const data = res.data || {};
+ const tempId = data.tempId;
+
+ // 璁板綍涓存椂鏂囦欢淇℃伅
pendingTempFiles.value.push({
- tempId: data.tempId,
+ tempId: tempId,
name: data.originalName || file.name,
+ fileId: id.value ? tempId : undefined,
});
+
onSuccess(res);
planFileList.value.push({
name: data.originalName || file.name,
url: "",
status: "success",
- uid: data.tempId,
- tempId: data.tempId,
+ uid: tempId,
+ tempId: tempId,
+ // 鏍囪涓烘柊涓婁紶鐨勪复鏃舵枃浠�
+ isNew: true,
});
+ ElMessage.success("闄勪欢涓婁紶鎴愬姛");
} catch (e) {
onError(e);
ElMessage.error("闄勪欢涓婁紶澶辫触");
@@ -235,28 +277,29 @@
};
const handlePlanFileRemove = async (file) => {
- if (file.fileId) {
- try {
- await delMaintenanceTaskFile(file.fileId);
- await loadPlanFiles(id.value);
- } catch (e) {
- ElMessage.error("鍒犻櫎闄勪欢澶辫触");
- }
+ // 浠庢樉绀哄垪琛ㄤ腑绉婚櫎
+ planFileList.value = planFileList.value.filter((f) => f.uid !== file.uid);
+
+ const tempId = file.tempId || file.uid;
+ if (file.isNew) {
+ // 鏂颁笂浼犵殑涓存椂鏂囦欢锛岀洿鎺ヤ粠寰呬笂浼犲垪琛ㄧЩ闄�
+ pendingTempFiles.value = pendingTempFiles.value.filter((f) => f.tempId !== tempId);
return;
}
- const tempId = file.tempId || file.uid;
- pendingTempFiles.value = pendingTempFiles.value.filter((f) => f.tempId !== tempId);
- planFileList.value = planFileList.value.filter((f) => (f.tempId || f.uid) !== tempId);
+
+ if (file.fileId) {
+ pendingDeleteFiles.value.push({
+ fileId: file.fileId,
+ name: file.name,
+ });
+ }
};
-const bindPendingFiles = async (planId) => {
- if (!pendingTempFiles.value.length) return;
- for (const item of pendingTempFiles.value) {
- await bindMaintenanceTaskFile({
- tempId: item.tempId,
- name: item.name,
- deviceMaintenanceId: planId,
- });
+// 澶勭悊缂栬緫妯″紡涓嬪緟鍒犻櫎鐨勬枃浠�
+const processPendingDeletes = async () => {
+ if (!pendingDeleteFiles.value.length) return;
+ for (const file of pendingDeleteFiles.value) {
+ await delMaintenanceTaskFile(file.fileId);
}
};
@@ -265,19 +308,53 @@
form.deviceName = data.deviceName;
form.deviceModel = data.deviceModel;
form.maintenanceLocation = data.maintenanceLocation;
+ form.maintenanceItems = data.maintenanceItems;
form.status = data.status;
syncCreateUserFromLogin();
+ if (data.maintenancePersonId) {
+ form.maintenancePerson = data.maintenancePersonId;
+ } else if (data.maintenancePerson) {
+ const matched = userList.value.find(
+ (u) => u.nickName === data.maintenancePerson
+ );
+ if (matched) {
+ form.maintenancePerson = matched.userId;
+ }
+ }
form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
"YYYY-MM-DD HH:mm:ss"
);
};
+const buildSubmitPayload = () => {
+ const payload = { ...form };
+ const maintenancePersonUserId = form.maintenancePerson;
+ if (maintenancePersonUserId) {
+ const maintainer = userList.value.find(
+ (u) => String(u.userId) === String(maintenancePersonUserId)
+ );
+ if (maintainer) {
+ payload.maintenancePersonId = maintainer.userId;
+ payload.maintenancePerson = maintainer.nickName;
+ }
+ }
+ // 浼犻�掍复鏃舵枃浠禝D鍒楄〃锛岀敱鍚庣缁熶竴澶勭悊
+ if (pendingTempFiles.value.length > 0) {
+ payload.tempFileIds = pendingTempFiles.value.map((f) => f.tempId);
+ }
+ return payload;
+};
+
onMounted(() => {
loadDeviceName();
+ loadUserList();
});
const openEdit = async (editId) => {
resetAttachmentState();
+ if (!userList.value.length) {
+ await loadUserList();
+ }
const { data } = await getUpkeepById(editId);
id.value = editId;
visible.value = true;
@@ -288,22 +365,24 @@
const sendForm = async () => {
syncCreateUserFromLogin();
+ const valid = await formRef.value?.validate().catch(() => false);
+ if (!valid) return;
loading.value = true;
try {
+ const payload = buildSubmitPayload();
if (id.value) {
- const { code } = await editUpkeep({ id: unref(id), ...form });
+ // 缂栬緫妯″紡锛氬厛澶勭悊寰呭垹闄ょ殑鏂囦欢锛屽啀淇濆瓨琛ㄥ崟
+ await processPendingDeletes();
+ const { code } = await editUpkeep({ id: unref(id), ...payload });
if (code == 200) {
ElMessage.success("缂栬緫璁″垝鎴愬姛");
visible.value = false;
emits("ok");
}
} else {
- const res = await addUpkeep(form);
+ // 鏂板妯″紡锛歵empFileIds 浼氶殢 payload 涓�璧蜂紶鍒板悗绔紝鐢卞悗绔鐞嗕复鏃舵枃浠剁殑鍏宠仈
+ const res = await addUpkeep(payload);
if (res.code == 200) {
- const planId = res.data?.id;
- if (planId) {
- await bindPendingFiles(planId);
- }
ElMessage.success("鏂板璁″垝鎴愬姛");
visible.value = false;
emits("ok");
@@ -331,6 +410,9 @@
resetForm();
resetAttachmentState();
syncCreateUserFromLogin();
+ if (userStore.id != null && userStore.id !== "") {
+ form.maintenancePerson = userStore.id;
+ }
visible.value = true;
};
--
Gitblit v1.9.3