From 90839ac8191503b8706c97e607f69bfcb2dcb7a3 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 20 十月 2026 15:36:57 +0800
Subject: [PATCH] feat: 设备保养和巡检优化,项目拆分
---
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 188 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 158 insertions(+), 30 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index 29e218a..acb8f7b 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="960px"
@confirm="sendForm"
@cancel="handleCancel"
@close="handleClose"
@@ -26,18 +26,46 @@
</el-select>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿">
- <el-input
- v-model="form.deviceModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
- disabled
- />
+ <el-input v-model="form.deviceModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" disabled />
</el-form-item>
- <el-form-item label="淇濆吇椤圭洰">
- <el-input
- v-model="form.machineryCategory"
- type="textarea"
- placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
- />
+ <el-form-item label="淇濆吇棰戠巼">
+ <el-select
+ v-model="form.frequencyType"
+ placeholder="璇峰厛閫夋嫨淇濆吇棰戠巼"
+ @change="clearSelectedItems"
+ >
+ <el-option label="姣忔棩" value="DAILY" />
+ <el-option label="姣忓懆" value="WEEKLY" />
+ <el-option label="姣忔湀" value="MONTHLY" />
+ <el-option label="姣忓搴�" value="QUARTERLY" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="淇濆吇鍐呭">
+ <div class="maintenance-selection">
+ <el-button
+ type="primary"
+ plain
+ :disabled="!form.deviceLedgerId || !form.frequencyType"
+ @click="itemSelectorVisible = true"
+ >閫夋嫨淇濆吇鍐呭</el-button
+ >
+ <div v-if="selectedMaintenanceItems.length" class="paper-list">
+ <div class="paper-list__heading">
+ <strong>淇濆吇椤圭洰娓呭崟</strong>
+ <span>鍏� {{ selectedMaintenanceItems.length }} 椤�</span>
+ </div>
+ <div
+ v-for="(item, index) in selectedMaintenanceItems"
+ :key="item.id"
+ class="paper-list__row"
+ >
+ <span class="paper-list__number">{{ index + 1 }}</span>
+ <span class="paper-list__content">{{ item.itemName }}</span>
+ <el-button link type="danger" @click="removeMaintenanceItem(item.id)">绉婚櫎</el-button>
+ </div>
+ </div>
+ <el-empty v-else description="閫夋嫨璁惧鍜岄鐜囧悗锛屾坊鍔犳湰璁″垝鐨勪繚鍏婚」鐩�" :image-size="54" />
+ </div>
</el-form-item>
<el-form-item label="褰曞叆浜�">
<el-select
@@ -64,11 +92,7 @@
</el-select>
</el-form-item>
<el-form-item label="淇濆吇浜�">
- <el-input
- v-model="form.maintenancePerson"
- placeholder="璇疯緭鍏ヤ繚鍏讳汉濮撳悕"
- clearable
- />
+ <el-input v-model="form.maintenancePerson" placeholder="璇疯緭鍏ヤ繚鍏讳汉濮撳悕" clearable />
</el-form-item>
<el-form-item label="璁″垝淇濆吇鏃ユ湡">
<el-date-picker
@@ -90,22 +114,26 @@
</el-row>
</el-form>
</FormDialog>
+ <MaintenanceItemSelector
+ v-model:visible="itemSelectorVisible"
+ :selected-items="selectedMaintenanceItems"
+ :device-ledger-id="form.deviceLedgerId"
+ :frequency-type="form.frequencyType"
+ @confirm="applyMaintenanceItems"
+ />
</template>
<script setup>
import FormDialog from "@/components/Dialog/FormDialog.vue";
-import {
- addUpkeep,
- editUpkeep,
- getUpkeepById,
-} from "@/api/equipmentManagement/upkeep";
+import { addUpkeep, editUpkeep, getUpkeepById } from "@/api/equipmentManagement/upkeep";
import { ElMessage } from "element-plus";
import useFormData from "@/hooks/useFormData";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
-import { onMounted } from "vue";
+import { computed, onMounted } from "vue";
import dayjs from "dayjs";
import { userListNoPage } from "@/api/system/user.js";
import FileUpload from "@/components/AttachmentUpload/file/index.vue";
+import MaintenanceItemSelector from "./MaintenanceItemSelector.vue";
defineOptions({
name: "璁惧淇濆吇鏂板璁″垝",
@@ -116,8 +144,10 @@
const id = ref();
const visible = ref(false);
const loading = ref(false);
+const itemSelectorVisible = ref(false);
const deviceOptions = ref([]);
+const maintenanceItemOptions = ref([]);
const loadDeviceName = async () => {
const { data } = await getDeviceLedger();
deviceOptions.value = data;
@@ -130,14 +160,39 @@
maintenancePlanTime: undefined, // 璁″垝淇濆吇鏃ユ湡
createUser: undefined, // 褰曞叆浜�
status: 0, //淇濅慨鐘舵��
- machineryCategory: undefined,
+ maintenanceItemIds: [],
+ frequencyType: "",
storageBlobDTOs: [],
maintenancePerson: undefined, // 淇濆吇浜�
});
+const selectedMaintenanceItems = computed(() => {
+ const ids = new Set((form.maintenanceItemIds || []).map(String));
+ return maintenanceItemOptions.value.filter((item) => ids.has(String(item.id)));
+});
+const applyMaintenanceItems = (items) => {
+ maintenanceItemOptions.value = items;
+ form.maintenanceItemIds = items.map((item) => item.id);
+};
+const clearSelectedItems = () => {
+ form.maintenanceItemIds = [];
+ maintenanceItemOptions.value = [];
+};
+const removeMaintenanceItem = (id) => {
+ form.maintenanceItemIds = form.maintenanceItemIds.filter(
+ (itemId) => String(itemId) !== String(id)
+ );
+ maintenanceItemOptions.value = maintenanceItemOptions.value.filter(
+ (item) => String(item.id) !== String(id)
+ );
+};
+
const setDeviceModel = (deviceId) => {
const option = deviceOptions.value.find((item) => item.id === deviceId);
- form.deviceModel = option.deviceModel;
+ if (option) {
+ form.deviceModel = option.deviceModel;
+ clearSelectedItems();
+ }
};
/**
@@ -146,16 +201,21 @@
*/
const setForm = (data) => {
form.deviceLedgerId = data.deviceLedgerId;
+ form.frequencyType = data.frequencyType;
form.deviceName = data.deviceName;
form.deviceModel = data.deviceModel;
form.createUser = Number(data.createUser);
form.status = data.status;
- form.machineryCategory = data.machineryCategory;
+ form.maintenanceItemIds =
+ data.maintenanceItemIds || data.maintenanceItems?.map((item) => item.maintenanceItemId) || [];
+ maintenanceItemOptions.value = (data.maintenanceItems || []).map((item) => ({
+ id: item.maintenanceItemId,
+ itemName: item.itemName,
+ isActive: item.isActive,
+ }));
form.maintenancePerson = data.maintenancePerson;
if (data.maintenancePlanTime) {
- form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
- "YYYY-MM-DD HH:mm:ss"
- );
+ form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format("YYYY-MM-DD HH:mm:ss");
}
form.storageBlobDTOs = data.storageBlobVOs || [];
};
@@ -179,6 +239,14 @@
};
const sendForm = async () => {
+ if (!form.deviceLedgerId || !form.frequencyType) {
+ ElMessage.warning("璇烽�夋嫨璁惧鍜屼繚鍏婚鐜�");
+ return;
+ }
+ if (!form.maintenanceItemIds?.length) {
+ ElMessage.warning("璇烽�夋嫨鑷冲皯涓�涓繚鍏婚」鐩�");
+ return;
+ }
loading.value = true;
try {
const { code } = id.value
@@ -195,11 +263,13 @@
};
const handleCancel = () => {
+ itemSelectorVisible.value = false;
resetForm();
visible.value = false;
};
const handleClose = () => {
+ itemSelectorVisible.value = false;
resetForm();
visible.value = false;
};
@@ -207,6 +277,7 @@
const openModal = () => {
id.value = undefined;
visible.value = true;
+ maintenanceItemOptions.value = [];
};
defineExpose({
@@ -215,4 +286,61 @@
});
</script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.maintenance-selection {
+ width: 100%;
+}
+.paper-list {
+ margin-top: 12px;
+ border: 1px solid #cbd2d9;
+ background: #fff;
+}
+.paper-list__heading {
+ display: flex;
+ justify-content: space-between;
+ padding: 10px 14px;
+ border-bottom: 1px solid #cbd2d9;
+ background: #f5f7fa;
+ color: #303946;
+}
+.paper-list__heading span {
+ color: #606a75;
+ font-size: 13px;
+ font-weight: normal;
+}
+.paper-list__row {
+ display: grid;
+ grid-template-columns: 38px minmax(0, 1fr) 52px;
+ align-items: start;
+ gap: 10px;
+ padding: 12px 14px;
+ border-bottom: 1px solid #e1e5e9;
+}
+.paper-list__row:last-child {
+ border-bottom: 0;
+}
+.paper-list__number {
+ color: #596575;
+ text-align: center;
+}
+.paper-list__content {
+ color: #303946;
+ line-height: 1.7;
+ white-space: pre-wrap;
+ overflow-wrap: anywhere;
+}
+:deep(.el-dialog) {
+ max-width: calc(100vw - 32px);
+}
+:deep(.el-dialog__body) {
+ max-height: calc(100vh - 180px);
+ overflow-y: auto;
+}
+@media (max-width: 720px) {
+ .paper-list__row {
+ grid-template-columns: 28px minmax(0, 1fr) 42px;
+ gap: 6px;
+ padding: 10px 8px;
+ }
+}
+</style>
--
Gitblit v1.9.3