From 7ec5ffea363cd5a97562785b116e70a9323e9d46 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 18 五月 2026 10:40:10 +0800
Subject: [PATCH] 设备保养：新增保养人，保养项目录入展示
---
src/pages/equipmentManagement/upkeep/index.vue | 6 +++++-
src/pages/equipmentManagement/upkeep/add.vue | 23 ++++++++++++++++++-----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/pages/equipmentManagement/upkeep/add.vue b/src/pages/equipmentManagement/upkeep/add.vue
index c89e05a..db60a0a 100644
--- a/src/pages/equipmentManagement/upkeep/add.vue
+++ b/src/pages/equipmentManagement/upkeep/add.vue
@@ -40,10 +40,18 @@
<u-icon name="arrow-right" @click="showDatePicker" />
</template>
</u-form-item>
-
- <u-form-item label="淇濆吇椤圭洰" prop="maintenanceLocation" border-bottom>
+
+ <u-form-item label="淇濆吇浜�" prop="maintenancePerson" border-bottom>
<u-input
- v-model="form.maintenanceLocation"
+ v-model="form.maintenancePerson"
+ placeholder="璇疯緭鍏ヤ繚鍏讳汉"
+ clearable
+ />
+ </u-form-item>
+
+ <u-form-item label="淇濆吇椤圭洰" prop="maintenanceItems" border-bottom>
+ <u-input
+ v-model="form.maintenanceItems"
placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
clearable
/>
@@ -81,8 +89,11 @@
import PageHeader from '@/components/PageHeader.vue';
import { getDeviceLedger } from '@/api/equipmentManagement/ledger';
import { addUpkeep, editUpkeep, getUpkeepById } from '@/api/equipmentManagement/upkeep';
+import useUserStore from '@/store/modules/user';
import dayjs from "dayjs";
import { formatDateToYMD } from '@/utils/ruoyi';
+
+const userStore = useUserStore();
defineOptions({
name: "璁惧淇濆吇璁″垝琛ㄥ崟",
@@ -130,7 +141,8 @@
deviceLedgerId: undefined, // 璁惧ID
deviceModel: undefined, // 瑙勬牸鍨嬪彿
maintenancePlanTime: dayjs().format("YYYY-MM-DD"), // 璁″垝淇濆吇鏃ユ湡
- maintenanceLocation: undefined, // 淇濆吇椤圭洰
+ maintenancePerson: userStore.nickName || undefined, // 淇濆吇浜�
+ maintenanceItems: undefined, // 淇濆吇椤圭洰
});
// 鍔犺浇璁惧鍒楄〃
@@ -153,7 +165,8 @@
form.value.deviceLedgerId = data.deviceLedgerId;
form.value.deviceModel = data.deviceModel;
form.value.maintenancePlanTime = dayjs(data.maintenancePlanTime).format("YYYY-MM-DD");
- form.value.maintenanceLocation = data.maintenanceLocation;
+ form.value.maintenancePerson = data.maintenancePerson;
+ form.value.maintenanceItems = data.maintenanceItems || data.maintenanceLocation;
// 璁剧疆璁惧鍚嶇О鏄剧ず
const device = deviceOptions.value.find(item => item.id === data.deviceLedgerId);
if (device) {
diff --git a/src/pages/equipmentManagement/upkeep/index.vue b/src/pages/equipmentManagement/upkeep/index.vue
index 57469b8..b8ffb3a 100644
--- a/src/pages/equipmentManagement/upkeep/index.vue
+++ b/src/pages/equipmentManagement/upkeep/index.vue
@@ -55,8 +55,12 @@
<text class="detail-value">{{ formatDate(item.maintenancePlanTime) || '-' }}</text>
</view>
<view class="detail-row">
+ <text class="detail-label">淇濆吇浜�</text>
+ <text class="detail-value">{{ item.maintenancePerson || '-' }}</text>
+ </view>
+ <view class="detail-row">
<text class="detail-label">淇濆吇椤圭洰</text>
- <text class="detail-value">{{ item.maintenanceLocation || '-' }}</text>
+ <text class="detail-value">{{ item.maintenanceItems || item.maintenanceLocation || '-' }}</text>
</view>
<view class="detail-row">
<text class="detail-label">褰曞叆浜�</text>
--
Gitblit v1.9.3