From b95a00bf7ec7c667e16032bcabc4d97ef42909fc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 15:27:20 +0800
Subject: [PATCH] feat: 设备保养添加任务状态
---
src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
index c660840..7de50e9 100644
--- a/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue
@@ -2,7 +2,7 @@
<FormDialog
v-model="visible"
:title="'璁惧淇濆吇'"
- width="500px"
+ width="640px"
@confirm="sendForm"
@cancel="handleCancel"
@close="handleClose"
@@ -10,8 +10,9 @@
<el-form :model="form" label-width="100px">
<el-form-item label="瀹為檯淇濆吇浜�">
<el-input
- v-model="form.maintenanceActuallyName"
- placeholder="璇疯緭鍏ュ疄闄呬繚鍏讳汉"
+ :model-value="currentUserName"
+ disabled
+ placeholder="褰撳墠鐧诲綍鐢ㄦ埛"
></el-input>
</el-form-item>
<el-form-item label="瀹為檯淇濆吇鏃ユ湡">
@@ -35,14 +36,20 @@
<el-form-item label="淇濆吇缁撴灉">
<el-input
v-model="form.maintenanceResult"
+ type="textarea"
+ :rows="6"
placeholder="璇疯緭鍏ヤ繚鍏荤粨鏋�"
- type="text" />
+ maxlength="2000"
+ show-word-limit
+ resize="vertical"
+ />
</el-form-item>
</el-form>
</FormDialog>
</template>
<script setup>
+import { computed } from "vue";
import FormDialog from "@/components/Dialog/FormDialog.vue";
import { addMaintenance } from "@/api/equipmentManagement/upkeep";
import useFormData from "@/hooks/useFormData";
@@ -62,6 +69,8 @@
const loading = ref(false);
const userStore = useUserStore();
+const currentUserName = computed(() => userStore.nickName || userStore.name || "");
+
const { form, resetForm } = useFormData({
maintenanceActuallyName: undefined, // 瀹為檯淇濆吇浜�
maintenanceActuallyTime: undefined, // 瀹為檯淇濆吇鏃ユ湡
@@ -70,10 +79,10 @@
});
const setForm = (data) => {
- form.maintenanceActuallyName =
- data.maintenanceActuallyName ?? userStore.nickName;
+ // 瀹為檯淇濆吇浜鸿嚜鍔ㄥ～鍏呭綋鍓嶇櫥褰曚汉锛屼笉鍙紪杈�
+ form.maintenanceActuallyName = userStore.nickName || userStore.name || "";
form.maintenanceActuallyTime =
- data.maintenanceActuallyTime
+ data.maintenanceActuallyTime
? dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss")
: dayjs().format("YYYY-MM-DD HH:mm:ss");
form.maintenanceResult = data.maintenanceResult;
@@ -86,7 +95,12 @@
const sendForm = async () => {
loading.value = true;
try {
- const { code } = await addMaintenance({ id: planId.value, ...form });
+ // 纭繚瀹為檯淇濆吇浜烘槸褰撳墠鐧诲綍浜�
+ const payload = {
+ ...form,
+ maintenanceActuallyName: userStore.nickName || userStore.name || "",
+ };
+ const { code } = await addMaintenance({ id: planId.value, ...payload });
if (code == 200) {
ElMessage.success("淇濆吇鎴愬姛");
emits("ok");
--
Gitblit v1.9.3