From a7a9f53ef126659f664f5cbfe4eb10bebdfc4a6a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 19 五月 2026 23:33:56 +0800
Subject: [PATCH] feat: 设备巡检修改
---
src/views/equipmentManagement/inspectionManagement/components/formDia.vue | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
index 95ebd51..722c7a1 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
@@ -23,18 +23,29 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
- <el-form-item label="宸℃楠屾敹浜�" prop="acceptanceInspector">
- <el-select v-model="form.acceptanceInspector" placeholder="璇烽�夋嫨" clearable>
+ <el-form-item label="宸℃楠屾敹浜�" prop="inspectionAcceptor">
+ <el-select v-model="form.inspectionAcceptor" 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-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-col :span="12">
+ <el-form-item label="浠诲姟鐘舵��" prop="isActive">
+ <el-switch
+ v-model="form.isActive"
+ :active-value="1"
+ :inactive-value="0"
+ active-text="鍚敤"
+ inactive-text="鍋滅敤"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -123,10 +134,10 @@
form: {
taskId: undefined,
taskName: undefined,
- inspector: [],
+ inspector: '',
inspectorIds: '',
- acceptanceInspector: undefined,
- acceptanceInspectorIds: '',
+ inspectionAcceptor: undefined,
+ inspectionAcceptorId: undefined,
remarks: '',
frequencyType: '',
frequencyDetail: '',
@@ -136,8 +147,8 @@
},
rules: {
taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
- inspector: [{ required: true, message: "璇烽�夋嫨宸℃浜�", trigger: "change" },],
- acceptanceInspector: [{ required: true, message: "璇烽�夋嫨宸℃楠屾敹浜�", trigger: "change" },],
+ inspector: [{ required: true, message: "璇疯緭鍏ュ贰妫�浜�", trigger: "blur" },],
+ inspectionAcceptor: [{ required: true, message: "璇烽�夋嫨宸℃楠屾敹浜�", trigger: "change" },],
dateStr: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }],
frequencyType: [{ required: true, message: "璇烽�夋嫨浠诲姟棰戠巼", trigger: "change" }],
frequencyDetail: [
@@ -238,11 +249,9 @@
} else {
form.value.inspector = []
}
- // 纭繚 acceptanceInspectorIds 瀛樺湪鎵嶈祴鍊�
- if (form.value.acceptanceInspectorIds) {
- form.value.acceptanceInspector = Number(form.value.acceptanceInspectorIds)
- } else {
- form.value.acceptanceInspector = undefined
+ // 纭繚楠屾敹鍏D鍜屽鍚嶆纭洖鏄�
+ if (form.value.inspectionAcceptorId) {
+ form.value.inspectionAcceptor = form.value.inspectionAcceptorId
}
// 纭繚 isActive 鏈夊�硷紝榛樿鍚敤
if (form.value.isActive === undefined || form.value.isActive === null) {
@@ -286,10 +295,10 @@
form.value = {
taskId: undefined,
taskName: undefined,
- inspector: [],
+ inspector: '',
inspectorIds: '',
- acceptanceInspector: undefined,
- acceptanceInspectorIds: '',
+ inspectionAcceptor: undefined,
+ inspectionAcceptorId: undefined,
remarks: '',
frequencyType: '',
frequencyDetail: '',
@@ -309,21 +318,25 @@
form.value.inspectorIds = form.value.inspector.join(',')
delete form.value.inspector
}
- // 纭繚 acceptanceInspectorIds 璧嬪��
- if (form.value.acceptanceInspector) {
- form.value.acceptanceInspectorIds = String(form.value.acceptanceInspector)
- delete form.value.acceptanceInspector
+
+ // 澶勭悊楠屾敹鍏�
+ if (form.value.inspectionAcceptor) {
+ const selectedUser = userList.value.find(u => u.userId === form.value.inspectionAcceptor)
+ if (selectedUser) {
+ form.value.inspectionAcceptorId = form.value.inspectionAcceptor
+ form.value.inspectionAcceptor = selectedUser.nickName
+ }
}
-
+
if (form.value.frequencyType === 'WEEKLY') {
let frequencyDetail = ''
frequencyDetail = form.value.week + ',' + form.value.time
form.value.frequencyDetail = frequencyDetail
}
-
+
let res = await userStore.getInfo()
form.value.registrantId = res.user.userId
-
+
await addOrEditTimingTask(form.value)
cancel()
proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')
--
Gitblit v1.9.3