From b88332e0a2686e68023e26438af97f79247b1ddd Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 16 五月 2026 14:14:53 +0800
Subject: [PATCH] feat: 设备保养修改，新增保养人、详情
---
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 245 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 200 insertions(+), 45 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index bb686dc..efa04a5 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
@@ -2,7 +2,7 @@
<FormDialog
v-model="visible"
:title="id ? '缂栬緫璁惧淇濆吇璁″垝' : '鏂板璁惧淇濆吇璁″垝'"
- width="500px"
+ width="640px"
@confirm="sendForm"
@cancel="handleCancel"
@close="handleClose"
@@ -35,25 +35,17 @@
<el-form-item label="淇濆吇椤圭洰">
<el-input
v-model="form.maintenanceLocation"
+ type="textarea"
+ :rows="3"
placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
/>
</el-form-item>
<el-form-item label="褰曞叆浜�">
- <el-select
- v-model="form.createUser"
- placeholder="璇烽�夋嫨"
- filterable
- default-first-option
- :reserve-keyword="false"
- clearable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- />
- </el-select>
+ <el-input
+ :model-value="registrantDisplayName"
+ disabled
+ placeholder="褰撳墠鐧诲綍鐢ㄦ埛"
+ />
</el-form-item>
<el-form-item v-if="id" label="淇濅慨鐘舵��">
<el-select v-model="form.status">
@@ -73,6 +65,18 @@
clearable
/>
</el-form-item>
+ <el-form-item label="闄勪欢">
+ <el-upload
+ :http-request="handlePlanFileUpload"
+ :file-list="planFileList"
+ :on-remove="handlePlanFileRemove"
+ multiple
+ list-type="picture-card"
+ >
+ <el-icon><Plus /></el-icon>
+ </el-upload>
+ <span v-if="!id" class="upload-tip">鍙厛閫夋嫨闄勪欢锛屼繚瀛樿鍒掑悗鑷姩鍏宠仈鍒版湰璁″垝</span>
+ </el-form-item>
</el-form>
</FormDialog>
</template>
@@ -84,18 +88,42 @@
editUpkeep,
getUpkeepById,
} 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 { onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
import dayjs from "dayjs";
-import { userListNoPage } from "@/api/system/user.js";
+import useUserStore from "@/store/modules/user.js";
+import request from "@/utils/request";
defineOptions({
name: "璁惧淇濆吇鏂板璁″垝",
});
const emits = defineEmits(["ok"]);
+
+const userStore = useUserStore();
+const javaApi = import.meta.env.VITE_APP_BASE_API;
+
+const pendingTempFiles = ref([]);
+const planFileList = ref([]);
+
+const registrantDisplayName = computed(
+ () => userStore.nickName || userStore.name || "褰撳墠鐧诲綍鐢ㄦ埛"
+);
+
+const syncCreateUserFromLogin = () => {
+ if (userStore.id != null && userStore.id !== "") {
+ form.createUser = userStore.id;
+ }
+};
const id = ref();
const visible = ref(false);
@@ -108,64 +136,178 @@
};
const { form, resetForm } = useFormData({
- deviceLedgerId: undefined, // 璁惧Id
- deviceName: undefined, // 璁惧鍚嶇О
- deviceModel: undefined, // 瑙勬牸鍨嬪彿
- maintenanceLocation: undefined, // 淇濆吇椤圭洰
- maintenancePlanTime: undefined, // 璁″垝淇濆吇鏃ユ湡
- createUser: undefined, // 褰曞叆浜�
- status: 0, //淇濅慨鐘舵��
+ deviceLedgerId: undefined,
+ deviceName: undefined,
+ deviceModel: undefined,
+ maintenanceLocation: undefined,
+ maintenancePlanTime: undefined,
+ createUser: undefined,
+ status: 0,
});
const setDeviceModel = (deviceId) => {
const option = deviceOptions.value.find((item) => item.id === deviceId);
- form.deviceModel = option.deviceModel;
+ if (option) {
+ form.deviceModel = option.deviceModel;
+ }
};
-/**
- * @desc 璁剧疆琛ㄥ崟鍐呭
- * @param data 璁惧淇℃伅
- */
+const resetAttachmentState = () => {
+ pendingTempFiles.value = [];
+ planFileList.value = [];
+};
+
+const normalizeFilePreviewUrl = (url = "") => {
+ if (!url) return "";
+ if (url.startsWith("http")) return url;
+ if (url.startsWith("/profile")) return javaApi + url;
+ return url;
+};
+
+const loadPlanFiles = async (planId) => {
+ if (!planId) return;
+ const res = await listMaintenanceTaskFiles({
+ current: 1,
+ size: 100,
+ deviceMaintenanceId: planId,
+ });
+ const records = res?.data?.records || [];
+ planFileList.value = records.map((item) => ({
+ name: item.name,
+ url: normalizeFilePreviewUrl(item.url),
+ status: "success",
+ uid: `saved-${item.id}`,
+ fileId: item.id,
+ }));
+};
+
+const uploadTempFile = (file) => {
+ const fd = new FormData();
+ fd.append("file", file);
+ fd.append("type", "16");
+ return request({
+ url: "/file/upload",
+ method: "post",
+ data: fd,
+ headers: { "Content-Type": "multipart/form-data" },
+ });
+};
+
+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 || {};
+ pendingTempFiles.value.push({
+ tempId: data.tempId,
+ name: data.originalName || file.name,
+ });
+ onSuccess(res);
+ planFileList.value.push({
+ name: data.originalName || file.name,
+ url: "",
+ status: "success",
+ uid: data.tempId,
+ tempId: data.tempId,
+ });
+ } catch (e) {
+ onError(e);
+ ElMessage.error("闄勪欢涓婁紶澶辫触");
+ }
+};
+
+const handlePlanFileRemove = async (file) => {
+ if (file.fileId) {
+ try {
+ await delMaintenanceTaskFile(file.fileId);
+ await loadPlanFiles(id.value);
+ } catch (e) {
+ ElMessage.error("鍒犻櫎闄勪欢澶辫触");
+ }
+ 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);
+};
+
+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 setForm = (data) => {
form.deviceLedgerId = data.deviceLedgerId;
form.deviceName = data.deviceName;
form.deviceModel = data.deviceModel;
form.maintenanceLocation = data.maintenanceLocation;
- form.createUser = Number(data.createUser);
form.status = data.status;
+ syncCreateUserFromLogin();
form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
"YYYY-MM-DD HH:mm:ss"
);
};
-// 鐢ㄦ埛鍒楄〃
-const userList = ref([]);
-
onMounted(() => {
loadDeviceName();
- userListNoPage().then((res) => {
- userList.value = res.data;
- });
});
const openEdit = async (editId) => {
+ resetAttachmentState();
const { data } = await getUpkeepById(editId);
id.value = editId;
visible.value = true;
await nextTick();
setForm(data);
+ await loadPlanFiles(editId);
};
const sendForm = async () => {
+ syncCreateUserFromLogin();
loading.value = true;
try {
- const { code } = id.value
- ? await editUpkeep({ id: unref(id), ...form })
- : await addUpkeep(form);
- if (code == 200) {
- ElMessage.success(`${id.value ? "缂栬緫" : "鏂板"}璁″垝鎴愬姛`);
- visible.value = false;
- emits("ok");
+ if (id.value) {
+ const { code } = await editUpkeep({ id: unref(id), ...form });
+ if (code == 200) {
+ ElMessage.success("缂栬緫璁″垝鎴愬姛");
+ visible.value = false;
+ emits("ok");
+ }
+ } else {
+ const res = await addUpkeep(form);
+ if (res.code == 200) {
+ const planId = res.data?.id;
+ if (planId) {
+ await bindPendingFiles(planId);
+ }
+ ElMessage.success("鏂板璁″垝鎴愬姛");
+ visible.value = false;
+ emits("ok");
+ }
}
} finally {
loading.value = false;
@@ -174,16 +316,21 @@
const handleCancel = () => {
resetForm();
+ resetAttachmentState();
visible.value = false;
};
const handleClose = () => {
resetForm();
+ resetAttachmentState();
visible.value = false;
};
const openModal = () => {
id.value = undefined;
+ resetForm();
+ resetAttachmentState();
+ syncCreateUserFromLogin();
visible.value = true;
};
@@ -193,4 +340,12 @@
});
</script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.upload-tip {
+ display: block;
+ font-size: 12px;
+ color: #999;
+ margin-top: 8px;
+ line-height: 1.4;
+}
+</style>
--
Gitblit v1.9.3