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/formDia.vue | 913 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 602 insertions(+), 311 deletions(-)
diff --git a/src/views/equipmentManagement/upkeep/Form/formDia.vue b/src/views/equipmentManagement/upkeep/Form/formDia.vue
index 60dda54..a7a8211 100644
--- a/src/views/equipmentManagement/upkeep/Form/formDia.vue
+++ b/src/views/equipmentManagement/upkeep/Form/formDia.vue
@@ -1,349 +1,640 @@
<template>
- <FormDialog
- v-model="dialogVisitable"
- :title="operationType === 'add' ? '鏂板淇濆吇浠诲姟' : '缂栬緫淇濆吇浠诲姟'"
- width="800px"
- :operation-type="operationType"
- @confirm="submitForm"
- @cancel="cancel"
- @close="cancel"
- >
- <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
- <el-row>
- <el-col :span="12">
- <el-form-item label="璁惧鍚嶇О" prop="taskId">
- <el-select v-model="form.taskId" @change="setDeviceModel" filterable>
- <el-option
- v-for="(item, index) in deviceOptions"
- :key="index"
- :label="item.deviceName"
- :value="item.id"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿">
- <el-input
- v-model="form.deviceModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="褰曞叆浜�" prop="inspector">
- <el-select
- v-model="form.inspector"
- filterable
- default-first-option
- :reserve-keyword="false"
- placeholder="璇烽�夋嫨"
- clearable
- >
- <el-option
- v-for="item in userList"
- :label="item.nickName"
- :value="item.userId"
- :key="item.userId"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐧昏鏃堕棿" prop="registrationDate">
- <el-date-picker
- v-model="form.registrationDate"
- type="date"
- placeholder="閫夋嫨鐧昏鏃ユ湡"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- style="width: 100%"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="淇濆吇椤圭洰" prop="machineryCategory">
- <el-input
- v-model.trim="form.machineryCategory"
- type="textarea"
- placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
- clearable
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="淇濆吇浜�" prop="maintenancePerson">
- <el-input
- v-model.trim="form.maintenancePerson"
- placeholder="璇疯緭鍏ヤ繚鍏讳汉濮撳悕"
- maxlength="100"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="浠诲姟棰戠巼" prop="frequencyType">
- <el-select v-model="form.frequencyType" placeholder="璇烽�夋嫨" clearable>
- <el-option label="姣忔棩" value="DAILY"/>
- <el-option label="姣忓懆" value="WEEKLY"/>
- <el-option label="姣忔湀" value="MONTHLY"/>
- <el-option label="瀛e害" value="QUARTERLY"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12" v-if="form.frequencyType === 'DAILY' && form.frequencyType">
- <el-form-item label="鏃ユ湡" prop="frequencyDetail">
- <el-time-picker v-model="form.frequencyDetail" placeholder="閫夋嫨鏃堕棿" format="HH:mm"
- value-format="HH:mm" />
- </el-form-item>
- </el-col>
- <el-col :span="12" v-if="form.frequencyType === 'WEEKLY' && form.frequencyType">
- <el-form-item label="鏃ユ湡" prop="frequencyDetail">
- <el-select v-model="form.week" placeholder="璇烽�夋嫨" clearable style="width: 50%">
- <el-option label="鍛ㄤ竴" value="MON"/>
- <el-option label="鍛ㄤ簩" value="TUE"/>
- <el-option label="鍛ㄤ笁" value="WED"/>
- <el-option label="鍛ㄥ洓" value="THU"/>
- <el-option label="鍛ㄤ簲" value="FRI"/>
- <el-option label="鍛ㄥ叚" value="SAT"/>
- <el-option label="鍛ㄦ棩" value="SUN"/>
- </el-select>
- <el-time-picker v-model="form.time" placeholder="閫夋嫨鏃堕棿" format="HH:mm"
- value-format="HH:mm" style="width: 50%"/>
- </el-form-item>
- </el-col>
- <el-col :span="12" v-if="form.frequencyType === 'MONTHLY' && form.frequencyType">
- <el-form-item label="鏃ユ湡" prop="frequencyDetail">
- <el-date-picker
- v-model="form.frequencyDetail"
- type="datetime"
- clearable
- placeholder="閫夋嫨寮�濮嬫棩鏈�"
- format="DD,HH:mm"
- value-format="DD,HH:mm"
- />
- </el-form-item>
- </el-col>
- <el-col :span="12" v-if="form.frequencyType === 'QUARTERLY' && form.frequencyType">
- <el-form-item label="鏃ユ湡" prop="frequencyDetail">
- <el-date-picker
- v-model="form.frequencyDetail"
- type="datetime"
- clearable
- placeholder="閫夋嫨寮�濮嬫棩鏈�"
- format="MM,DD,HH:mm"
- value-format="MM,DD,HH:mm"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="24">
- <el-form-item label="瀹氭椂浠诲姟">
- <el-switch
- v-model="form.isActive"
- :active-value="1"
- :inactive-value="0"
- active-text="寮�鍚�"
- inactive-text="鍏抽棴"
- inline-prompt
- />
- <span style="margin-left: 12px; color: #909399; font-size: 12px;">
- {{ form.isActive === 1 ? '浠诲姟灏嗘寜璁″垝鎵ц' : '浠诲姟鏆傚仠鎵ц' }}
- </span>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" type="textarea" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </FormDialog>
+ <FormDialog
+ v-model="dialogVisitable"
+ :title="operationType === 'add' ? '鏂板淇濆吇浠诲姟' : '缂栬緫淇濆吇浠诲姟'"
+ width="800px"
+ :operation-type="operationType"
+ @confirm="submitForm"
+ @cancel="cancel"
+ @close="cancel"
+ >
+ <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="璁惧鍚嶇О" prop="taskId">
+ <el-select v-model="form.taskId" @change="setDeviceModel" filterable>
+ <el-option
+ v-for="(item, index) in deviceOptions"
+ :key="index"
+ :label="item.deviceName"
+ :value="item.id"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸鍨嬪彿">
+ <el-input v-model="form.deviceModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="褰曞叆浜�" prop="inspector">
+ <el-select
+ v-model="form.inspector"
+ filterable
+ default-first-option
+ :reserve-keyword="false"
+ placeholder="璇烽�夋嫨"
+ clearable
+ >
+ <el-option
+ v-for="item in userList"
+ :label="item.nickName"
+ :value="item.userId"
+ :key="item.userId"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐧昏鏃堕棿" prop="registrationDate">
+ <el-date-picker
+ v-model="form.registrationDate"
+ type="date"
+ placeholder="閫夋嫨鐧昏鏃ユ湡"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="淇濆吇浜�" prop="maintenancePerson">
+ <el-input
+ v-model.trim="form.maintenancePerson"
+ placeholder="璇疯緭鍏ヤ繚鍏讳汉濮撳悕"
+ maxlength="100"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浠诲姟棰戠巼" prop="frequencyType">
+ <el-select
+ v-model="form.frequencyType"
+ placeholder="璇烽�夋嫨锛堟棩銆佸懆銆佹湀銆佸搴︼級"
+ clearable
+ @change="onFrequencyChange"
+ >
+ <el-option label="姣忔棩" value="DAILY" />
+ <el-option label="姣忓懆" value="WEEKLY" />
+ <el-option label="姣忔湀" value="MONTHLY" />
+ <el-option label="瀛e害" value="QUARTERLY" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.frequencyType === 'DAILY' && form.frequencyType">
+ <el-form-item label="鏃ユ湡" prop="frequencyDetail">
+ <el-time-picker
+ v-model="form.frequencyDetail"
+ placeholder="閫夋嫨鏃堕棿"
+ format="HH:mm"
+ value-format="HH:mm"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.frequencyType === 'WEEKLY' && form.frequencyType">
+ <el-form-item label="鏃ユ湡" prop="frequencyDetail">
+ <el-select v-model="form.week" placeholder="璇烽�夋嫨" clearable style="width: 50%">
+ <el-option label="鍛ㄤ竴" value="MON" />
+ <el-option label="鍛ㄤ簩" value="TUE" />
+ <el-option label="鍛ㄤ笁" value="WED" />
+ <el-option label="鍛ㄥ洓" value="THU" />
+ <el-option label="鍛ㄤ簲" value="FRI" />
+ <el-option label="鍛ㄥ叚" value="SAT" />
+ <el-option label="鍛ㄦ棩" value="SUN" />
+ </el-select>
+ <el-time-picker
+ v-model="form.time"
+ placeholder="閫夋嫨鏃堕棿"
+ format="HH:mm"
+ value-format="HH:mm"
+ style="width: 50%"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.frequencyType === 'MONTHLY' && form.frequencyType">
+ <el-form-item label="鏃ユ湡" prop="frequencyDetail">
+ <el-date-picker
+ v-model="form.frequencyDetail"
+ type="datetime"
+ clearable
+ placeholder="閫夋嫨寮�濮嬫棩鏈�"
+ format="DD,HH:mm"
+ value-format="DD,HH:mm"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.frequencyType === 'QUARTERLY' && form.frequencyType">
+ <el-form-item label="鏃ユ湡" prop="frequencyDetail">
+ <el-date-picker
+ v-model="form.frequencyDetail"
+ type="datetime"
+ clearable
+ placeholder="閫夋嫨寮�濮嬫棩鏈�"
+ format="MM,DD,HH:mm"
+ value-format="MM,DD,HH:mm"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="淇濆吇椤圭洰" prop="maintenanceItemIds">
+ <div class="maintenance-selection">
+ <div class="selection-toolbar">
+ <el-button
+ type="primary"
+ plain
+ :disabled="!form.taskId || !form.frequencyType"
+ @click="itemSelectorVisible = true"
+ >閫夋嫨淇濆吇椤圭洰</el-button
+ >
+ <span v-if="!form.taskId || !form.frequencyType" class="selection-hint"
+ >璇峰厛閫夋嫨璁惧鍜屼换鍔¢鐜囷紝璁惧缁戝畾鐨勪繚鍏婚」鐩皢鑷姩甯﹀嚭</span
+ >
+ <span v-else class="selection-hint"
+ >璁惧缁戝畾椤圭洰宸茶嚜鍔ㄥ甫鍑猴紝鍙澶栭�夋嫨閫氱敤椤圭洰锛屾垨娣诲姞鏈换鍔′笓鐢ㄩ」鐩�</span
+ >
+ </div>
+ <div class="custom-input">
+ <el-input
+ v-model="customItemProject"
+ maxlength="200"
+ clearable
+ placeholder="杈撳叆鏈换鍔′笓鐢ㄧ殑淇濆吇椤圭洰"
+ />
+ <el-input
+ v-model="customItemName"
+ maxlength="2000"
+ clearable
+ placeholder="杈撳叆椤圭洰瀵瑰簲鐨勪繚鍏诲唴瀹�"
+ @keyup.enter="addCustomItem"
+ />
+ <el-button
+ :disabled="!customItemProject.trim() || !customItemName.trim()"
+ @click="addCustomItem"
+ >娣诲姞</el-button
+ >
+ </div>
+ <div class="selected-panel">
+ <div class="selected-header">
+ <span class="selected-title">宸查�� {{ selectedList.length }} 椤�</span>
+ <span v-if="sourceStats.length" class="selected-stats">
+ <span v-for="stat in sourceStats" :key="stat.source" class="selected-stat"
+ >{{ stat.label }} {{ stat.count }}</span
+ >
+ </span>
+ </div>
+ <ol v-if="selectedList.length" class="selected-list">
+ <li v-for="(item, index) in selectedList" :key="item.key" class="selected-row">
+ <span class="row-index">{{ index + 1 }}</span>
+ <el-tag size="small" effect="light" :type="sourceMeta[item.source].type">{{
+ sourceMeta[item.source].label
+ }}</el-tag>
+ <span class="row-text" :title="item.itemProject">{{ item.itemProject }}</span>
+ <el-button link type="danger" @click="removeSelectedItem(item)">绉婚櫎</el-button>
+ </li>
+ </ol>
+ <el-empty v-else :image-size="56" description="灏氭湭閫夋嫨淇濆吇椤圭洰" />
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="瀹氭椂浠诲姟">
+ <el-switch
+ v-model="form.isActive"
+ :active-value="1"
+ :inactive-value="0"
+ active-text="寮�鍚�"
+ inactive-text="鍏抽棴"
+ inline-prompt
+ />
+ <span style="margin-left: 12px; color: #909399; font-size: 12px">
+ {{ form.isActive === 1 ? "浠诲姟灏嗘寜璁″垝鎵ц" : "浠诲姟鏆傚仠鎵ц" }}
+ </span>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="澶囨敞" prop="remarks">
+ <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" type="textarea" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </FormDialog>
+ <MaintenanceItemSelector
+ v-model:visible="itemSelectorVisible"
+ :selected-items="selectedItems"
+ :device-ledger-id="form.taskId"
+ :frequency-type="form.frequencyType"
+ @confirm="applyMaintenanceItems"
+ />
</template>
<script setup>
import FormDialog from "@/components/Dialog/FormDialog.vue";
-import { reactive, ref, getCurrentInstance, toRefs } from "vue";
-import {userListNoPageByTenantId} from "@/api/system/user.js";
+import { computed, reactive, ref, getCurrentInstance, toRefs } from "vue";
+import { userListNoPageByTenantId } from "@/api/system/user.js";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
-import { deviceMaintenanceTaskAdd, deviceMaintenanceTaskEdit } from "@/api/equipmentManagement/upkeep";
+import {
+ deviceMaintenanceTaskAdd,
+ deviceMaintenanceTaskEdit,
+ getMaintenanceItemList,
+} from "@/api/equipmentManagement/upkeep";
import { getCurrentDate } from "@/utils/index.js";
import useUserStore from "@/store/modules/user.js";
+import MaintenanceItemSelector from "./MaintenanceItemSelector.vue";
-const { proxy } = getCurrentInstance()
-const emit = defineEmits()
+const { proxy } = getCurrentInstance();
+const emit = defineEmits();
const dialogVisitable = ref(false);
-const operationType = ref('add');
+const operationType = ref("add");
const deviceOptions = ref([]);
+const itemSelectorVisible = ref(false);
const userStore = useUserStore();
const data = reactive({
- form: {
- taskId: undefined,
- taskName: undefined,
- // 褰曞叆浜猴細鍗曢�変竴涓敤鎴� id
- inspector: undefined,
- machineryCategory: "",
- remarks: '',
- frequencyType: '',
- frequencyDetail: '',
- week: '',
- time: '',
- deviceModel: undefined, // 瑙勬牸鍨嬪彿
- registrationDate: '',
- maintenancePerson: '', // 淇濆吇浜�
- isActive: 0 // 瀹氭椂浠诲姟寮�鍏筹細0=鍏抽棴锛�1=寮�鍚�
- },
- rules: {
- taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
- inspector: [{ required: true, message: "璇烽�夋嫨褰曞叆浜�", trigger: "blur" },],
- registrationDate: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }],
- machineryCategory: [{ required: true, message: "璇疯緭鍏ヤ繚鍏婚」鐩�", trigger: "blur" }]
- }
-})
-const { form, rules } = toRefs(data)
-const userList = ref([])
+ form: {
+ taskId: undefined,
+ taskName: undefined,
+ // 褰曞叆浜猴細鍗曢�変竴涓敤鎴� id
+ inspector: undefined,
+ maintenanceItemIds: [],
+ remarks: "",
+ frequencyType: "",
+ frequencyDetail: "",
+ week: "",
+ time: "",
+ deviceModel: undefined, // 瑙勬牸鍨嬪彿
+ registrationDate: "",
+ maintenancePerson: "", // 淇濆吇浜�
+ isActive: 0, // 瀹氭椂浠诲姟寮�鍏筹細0=鍏抽棴锛�1=寮�鍚�
+ },
+ rules: {
+ taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" }],
+ inspector: [{ required: true, message: "璇烽�夋嫨褰曞叆浜�", trigger: "blur" }],
+ registrationDate: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }],
+ maintenanceItemIds: [
+ { type: "array", required: true, min: 1, message: "璇峰嬀閫変繚鍏婚」鐩�", trigger: "change" },
+ ],
+ frequencyType: [{ required: true, message: "璇烽�夋嫨浠诲姟棰戠巼", trigger: "change" }],
+ frequencyDetail: [
+ {
+ validator: (_, value, callback) => {
+ const valid =
+ form.value.frequencyType === "WEEKLY"
+ ? Boolean(form.value.week && form.value.time)
+ : Boolean(value);
+ callback(valid ? undefined : new Error("璇烽�夋嫨鎵ц鏃ユ湡鍜屾椂闂�"));
+ },
+ trigger: "change",
+ },
+ ],
+ },
+});
+const { form, rules } = toRefs(data);
+const userList = ref([]);
+// 浠庝繚鍏诲唴瀹规竻鍗曚腑閫変腑鐨勯」锛堣澶囩粦瀹氭垨閫氱敤锛�
+const selectedItems = ref([]);
+// 浠呭睘浜庢湰浠诲姟鐨勮嚜瀹氫箟鍐呭锛屼笉鍐欏叆淇濆吇鍐呭娓呭崟
+const customItems = ref([]);
+const customItemProject = ref("");
+const customItemName = ref("");
+const sourceMeta = {
+ device: { label: "鏈澶�", type: "primary" },
+ common: { label: "閫氱敤", type: "info" },
+ custom: { label: "鑷畾涔�", type: "warning" },
+ other: { label: "鍏跺畠璁惧", type: "danger" },
+ saved: { label: "宸蹭繚瀛�", type: "success" },
+};
+const getSource = (item) => {
+ if (item.deviceLedgerId === undefined) return "saved";
+ if (item.deviceLedgerId === null) return "common";
+ return String(item.deviceLedgerId) === String(form.value.taskId) ? "device" : "other";
+};
+const selectedList = computed(() => [
+ ...selectedItems.value.map((item) => ({
+ key: `item-${item.id}`,
+ id: item.id,
+ itemProject: item.itemProject,
+ source: getSource(item),
+ })),
+ ...customItems.value.map((item) => ({
+ key: item.key,
+ id: null,
+ itemProject: item.itemProject,
+ itemName: item.itemName,
+ source: "custom",
+ })),
+]);
+const sourceStats = computed(() =>
+ Object.keys(sourceMeta)
+ .map((source) => ({
+ source,
+ label: sourceMeta[source].label,
+ count: selectedList.value.filter((item) => item.source === source).length,
+ }))
+ .filter((stat) => stat.count > 0)
+);
+const syncItemIds = () => {
+ form.value.maintenanceItemIds = [
+ ...selectedItems.value.map((item) => item.id),
+ ...customItems.value.map((item) => item.key),
+ ];
+ proxy.$refs.formRef?.clearValidate("maintenanceItemIds");
+};
+const applyMaintenanceItems = (items) => {
+ selectedItems.value = items;
+ syncItemIds();
+};
+const addCustomItem = () => {
+ const project = customItemProject.value.trim();
+ const name = customItemName.value.trim();
+ if (!project || !name) return;
+ if (selectedList.value.some((item) => item.itemProject === project)) {
+ proxy.$modal.msgWarning("宸插瓨鍦ㄧ浉鍚岀殑淇濆吇椤圭洰");
+ return;
+ }
+ customItems.value = [
+ ...customItems.value,
+ { key: `custom-${Date.now()}`, itemProject: project, itemName: name },
+ ];
+ customItemProject.value = "";
+ customItemName.value = "";
+ syncItemIds();
+};
+const removeSelectedItem = (item) => {
+ if (item.source === "custom")
+ customItems.value = customItems.value.filter((custom) => custom.key !== item.key);
+ else
+ selectedItems.value = selectedItems.value.filter(
+ (selected) => String(selected.id) !== String(item.id)
+ );
+ syncItemIds();
+};
const loadDeviceName = async () => {
- const { data } = await getDeviceLedger();
- deviceOptions.value = data;
+ const { data } = await getDeviceLedger();
+ deviceOptions.value = data;
};
// 閫夋嫨璁惧鏃讹紝鍥炲~璁惧鍚嶇О(taskName)鍜岃鏍煎瀷鍙�(deviceModel)
-const setDeviceModel = (id) => {
- const option = deviceOptions.value.find((item) => item.id === id);
- if (option) {
- form.value.taskId = option.id;
- form.value.taskName = option.deviceName;
- form.value.deviceModel = option.deviceModel;
- }
-}
+const setDeviceModel = (id, preserveItems = false) => {
+ const option = deviceOptions.value.find((item) => item.id === id);
+ if (option) {
+ form.value.taskId = option.id;
+ form.value.taskName = option.deviceName;
+ form.value.deviceModel = option.deviceModel;
+ if (!preserveItems) autoFillBoundItems(id);
+ }
+};
+const clearSelectedItems = () => {
+ selectedItems.value = [];
+ syncItemIds();
+};
+const onFrequencyChange = () => autoFillBoundItems();
+// 鎸夎澶囧拰棰戠巼鑷姩甯﹀嚭璇ヨ澶囩粦瀹氱殑淇濆吇鍐呭锛涢�氱敤鍐呭锛堟棤璁惧锛夐渶鐢ㄦ埛鎵嬪姩棰濆閫夋嫨
+const autoFillBoundItems = async (deviceId) => {
+ const id = deviceId ?? form.value.taskId;
+ const frequency = form.value.frequencyType;
+ if (!id || !frequency) return clearSelectedItems();
+ const { code, data } = await getMaintenanceItemList({
+ deviceLedgerId: id,
+ frequencyType: frequency,
+ isActive: 1,
+ });
+ if (code !== 200 || id !== form.value.taskId || frequency !== form.value.frequencyType) return;
+ applyMaintenanceItems(data || []);
+};
// 鎵撳紑寮规
const openDialog = async (type, row) => {
- dialogVisitable.value = true
- operationType.value = type
-
- // 閲嶇疆琛ㄥ崟
- resetForm();
-
- // 鍔犺浇鐢ㄦ埛鍒楄〃
- userListNoPageByTenantId().then((res) => {
- userList.value = res.data;
- });
-
- // 鍔犺浇璁惧鍒楄〃
- await loadDeviceName();
-
- if (type === 'edit' && row) {
- form.value = { ...row }
- // 缂栬緫鏃剁敤鎺ュ彛杩斿洖鐨� registrantId 鍥炴樉褰曞叆浜�
- if (row.registrantId) {
- form.value.inspector = row.registrantId
- }
+ dialogVisitable.value = true;
+ operationType.value = type;
- // 濡傛灉鏈夎澶嘔D锛岃嚜鍔ㄨ缃澶囦俊鎭�
- if (form.value.taskId) {
- setDeviceModel(form.value.taskId);
- }
- } else if (type === 'add') {
- // 鏂板鏃惰缃櫥璁版棩鏈熶负褰撳ぉ
- form.value.registrationDate = getCurrentDate();
- // 鏂板鏃惰缃綍鍏ヤ汉涓哄綋鍓嶇櫥褰曡处鎴�
- form.value.inspector = userStore.id;
- }
-}
+ // 閲嶇疆琛ㄥ崟
+ resetForm();
+
+ // 鍔犺浇鐢ㄦ埛鍒楄〃
+ userListNoPageByTenantId().then((res) => {
+ userList.value = res.data;
+ });
+ // 鍔犺浇璁惧鍒楄〃
+ await loadDeviceName();
+
+ if (type === "edit" && row) {
+ form.value = { ...row };
+ const savedItems = row.maintenanceItems || [];
+ selectedItems.value = savedItems
+ .filter((item) => item.maintenanceItemId != null)
+ .map((item) => ({
+ id: item.maintenanceItemId,
+ itemProject: item.itemProject,
+ itemName: item.itemName,
+ }));
+ customItems.value = savedItems
+ .filter((item) => item.maintenanceItemId == null)
+ .map((item, index) => ({
+ key: `custom-saved-${index}`,
+ itemProject: item.itemProject,
+ itemName: item.itemName,
+ }));
+ syncItemIds();
+ // 缂栬緫鏃剁敤鎺ュ彛杩斿洖鐨� registrantId 鍥炴樉褰曞叆浜�
+ if (row.registrantId) {
+ form.value.inspector = row.registrantId;
+ }
+
+ // 濡傛灉鏈夎澶嘔D锛岃嚜鍔ㄨ缃澶囦俊鎭�
+ if (form.value.taskId) {
+ setDeviceModel(form.value.taskId, true);
+ }
+ } else if (type === "add") {
+ // 鏂板鏃惰缃櫥璁版棩鏈熶负褰撳ぉ
+ form.value.registrationDate = getCurrentDate();
+ // 鏂板鏃惰缃綍鍏ヤ汉涓哄綋鍓嶇櫥褰曡处鎴�
+ form.value.inspector = userStore.id;
+ }
+};
// 鍏抽棴瀵硅瘽妗�
const cancel = () => {
- resetForm()
- dialogVisitable.value = false
- emit('closeDia')
-}
+ itemSelectorVisible.value = false;
+ resetForm();
+ dialogVisitable.value = false;
+ emit("closeDia");
+};
// 閲嶇疆琛ㄥ崟鍑芥暟
const resetForm = () => {
- if (proxy.$refs.formRef) {
- proxy.$refs.formRef.resetFields()
- }
- // 閲嶇疆琛ㄥ崟鏁版嵁纭繚璁惧淇℃伅姝g‘閲嶇疆
- form.value = {
- taskId: undefined,
- taskName: undefined,
- inspector: undefined,
- machineryCategory: "",
- remarks: '',
- frequencyType: '',
- frequencyDetail: '',
- week: '',
- time: '',
- deviceModel: undefined,
- registrationDate: '',
- maintenancePerson: '',
- isActive: 0
- }
-}
+ itemSelectorVisible.value = false;
+ selectedItems.value = [];
+ customItems.value = [];
+ customItemProject.value = "";
+ customItemName.value = "";
+ if (proxy.$refs.formRef) {
+ proxy.$refs.formRef.resetFields();
+ }
+ // 閲嶇疆琛ㄥ崟鏁版嵁纭繚璁惧淇℃伅姝g‘閲嶇疆
+ form.value = {
+ taskId: undefined,
+ taskName: undefined,
+ inspector: undefined,
+ maintenanceItemIds: [],
+ remarks: "",
+ frequencyType: "",
+ frequencyDetail: "",
+ week: "",
+ time: "",
+ deviceModel: undefined,
+ registrationDate: "",
+ maintenancePerson: "",
+ isActive: 0,
+ };
+};
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
- proxy.$refs["formRef"].validate(async valid => {
- if (valid) {
- try {
- const payload = { ...form.value }
- // 涓嶅啀鍚戝悗绔紶淇濆吇浜哄瓧娈碉紝浠呬娇鐢ㄦ帴鍙h姹傜殑 registrant / registrantId
- // 鏍规嵁閫夋嫨鐨�"褰曞叆浜�"璁剧疆 registrant / registrantId
- if (payload.inspector) {
- const selectedUser = userList.value.find(
- (u) => String(u.userId) === String(payload.inspector)
- )
- if (selectedUser) {
- payload.registrantId = selectedUser.userId
- payload.registrant = selectedUser.nickName
- }
- }
- delete payload.inspector
- delete payload.inspectorIds
- delete payload.active
+ proxy.$refs["formRef"].validate(async (valid) => {
+ if (valid) {
+ try {
+ const payload = { ...form.value };
+ payload.maintenanceItemIds = selectedItems.value.map((item) => item.id);
+ payload.customItems = customItems.value.map((item) => ({
+ itemProject: item.itemProject,
+ itemName: item.itemName,
+ }));
+ // 涓嶅啀鍚戝悗绔紶淇濆吇浜哄瓧娈碉紝浠呬娇鐢ㄦ帴鍙h姹傜殑 registrant / registrantId
+ // 鏍规嵁閫夋嫨鐨�"褰曞叆浜�"璁剧疆 registrant / registrantId
+ if (payload.inspector) {
+ const selectedUser = userList.value.find(
+ (u) => String(u.userId) === String(payload.inspector)
+ );
+ if (selectedUser) {
+ payload.registrantId = selectedUser.userId;
+ payload.registrant = selectedUser.nickName;
+ }
+ }
+ delete payload.inspector;
+ delete payload.inspectorIds;
+ delete payload.active;
- if (payload.frequencyType === 'WEEKLY') {
- let frequencyDetail = ''
- frequencyDetail = payload.week + ',' + payload.time
- payload.frequencyDetail = frequencyDetail
- }
+ if (payload.frequencyType === "WEEKLY") {
+ let frequencyDetail = "";
+ frequencyDetail = payload.week + "," + payload.time;
+ payload.frequencyDetail = frequencyDetail;
+ }
- // 褰曞叆鏃ユ湡锛氱洿鎺ヤ娇鐢ㄨ〃鍗曢噷鐨� registrationDate 瀛楁
- // 涓�浜涢粯璁ょ姸鎬佸瓧娈�
- if (payload.status === undefined || payload.status === null || payload.status === '') {
- payload.status = '0' // 榛樿鐘舵�侊紝鍙寜瀹為檯鏋氫妇璋冩暣
- }
- payload.deleted = 0
+ // 褰曞叆鏃ユ湡锛氱洿鎺ヤ娇鐢ㄨ〃鍗曢噷鐨� registrationDate 瀛楁
+ // 涓�浜涢粯璁ょ姸鎬佸瓧娈�
+ if (payload.status === undefined || payload.status === null || payload.status === "") {
+ payload.status = "0"; // 榛樿鐘舵�侊紝鍙寜瀹為檯鏋氫妇璋冩暣
+ }
+ payload.deleted = 0;
- if (operationType.value === 'edit') {
- await deviceMaintenanceTaskEdit(payload)
- } else {
- await deviceMaintenanceTaskAdd(payload)
- }
- cancel()
- proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')
- } catch (error) {
- proxy.$modal.msgError('鎻愪氦澶辫触锛岃閲嶈瘯')
- }
- }
- })
-}
-defineExpose({ openDialog })
+ if (operationType.value === "edit") {
+ await deviceMaintenanceTaskEdit(payload);
+ } else {
+ await deviceMaintenanceTaskAdd(payload);
+ }
+ cancel();
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ } catch (error) {
+ proxy.$modal.msgError("鎻愪氦澶辫触锛岃閲嶈瘯");
+ }
+ }
+ });
+};
+defineExpose({ openDialog });
</script>
<style scoped>
-
+.maintenance-selection {
+ width: 100%;
+}
+.selection-toolbar {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+}
+.selection-hint {
+ color: #909399;
+ font-size: 12px;
+}
+.custom-input {
+ display: flex;
+ gap: 8px;
+ margin-top: 10px;
+}
+.custom-input .el-input:first-child {
+ flex: 0 0 30%;
+}
+.custom-input .el-input:nth-child(2) {
+ flex: 1;
+ min-width: 0;
+}
+.selected-panel {
+ margin-top: 10px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ background: #fafafa;
+}
+.selected-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 8px 12px;
+ border-bottom: 1px solid #ebeef5;
+}
+.selected-title {
+ font-weight: 600;
+ color: #303133;
+}
+.selected-stats {
+ display: flex;
+ gap: 12px;
+ color: #909399;
+ font-size: 12px;
+}
+.selected-list {
+ max-height: 220px;
+ margin: 0;
+ padding: 4px 0;
+ overflow-y: auto;
+ list-style: none;
+}
+.selected-row {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ padding: 6px 12px;
+}
+.selected-row:hover {
+ background: #f0f7ff;
+}
+.row-index {
+ width: 24px;
+ flex-shrink: 0;
+ color: #909399;
+ text-align: right;
+}
+.row-text {
+ flex: 1;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ color: #303133;
+}
</style>
--
Gitblit v1.9.3