From a2c14224bb79a9dbf0fae117853f3869c726fe6e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 19 五月 2026 19:05:25 +0800
Subject: [PATCH] feat: 设备巡检新增巡检验收人
---
src/views/equipmentManagement/inspectionManagement/components/formDia.vue | 38 +++++++++++++++++++++++++-------------
src/views/equipmentManagement/inspectionManagement/index.vue | 1 +
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
index 264584f..95ebd51 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/formDia.vue
@@ -26,19 +26,15 @@
</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 label="宸℃楠屾敹浜�" prop="acceptanceInspector">
+ <el-select v-model="form.acceptanceInspector" 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="isActive">
- <el-switch
- v-model="form.isActive"
- :active-value="1"
- :inactive-value="0"
- active-text="鍚敤"
- inactive-text="鍋滅敤"
- />
+ <el-form-item label="澶囨敞" prop="remarks">
+ <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" type="textarea" />
</el-form-item>
</el-col>
</el-row>
@@ -127,8 +123,10 @@
form: {
taskId: undefined,
taskName: undefined,
- inspector: '',
+ inspector: [],
inspectorIds: '',
+ acceptanceInspector: undefined,
+ acceptanceInspectorIds: '',
remarks: '',
frequencyType: '',
frequencyDetail: '',
@@ -138,7 +136,8 @@
},
rules: {
taskId: [{ required: true, message: "璇烽�夋嫨璁惧", trigger: "change" },],
- inspector: [{ required: true, message: "璇疯緭鍏ュ贰妫�浜�", trigger: "blur" },],
+ inspector: [{ required: true, message: "璇烽�夋嫨宸℃浜�", trigger: "change" },],
+ acceptanceInspector: [{ required: true, message: "璇烽�夋嫨宸℃楠屾敹浜�", trigger: "change" },],
dateStr: [{ required: true, message: "璇烽�夋嫨鐧昏鏃堕棿", trigger: "change" }],
frequencyType: [{ required: true, message: "璇烽�夋嫨浠诲姟棰戠巼", trigger: "change" }],
frequencyDetail: [
@@ -239,6 +238,12 @@
} else {
form.value.inspector = []
}
+ // 纭繚 acceptanceInspectorIds 瀛樺湪鎵嶈祴鍊�
+ if (form.value.acceptanceInspectorIds) {
+ form.value.acceptanceInspector = Number(form.value.acceptanceInspectorIds)
+ } else {
+ form.value.acceptanceInspector = undefined
+ }
// 纭繚 isActive 鏈夊�硷紝榛樿鍚敤
if (form.value.isActive === undefined || form.value.isActive === null) {
form.value.isActive = 1
@@ -281,8 +286,10 @@
form.value = {
taskId: undefined,
taskName: undefined,
- inspector: '',
+ inspector: [],
inspectorIds: '',
+ acceptanceInspector: undefined,
+ acceptanceInspectorIds: '',
remarks: '',
frequencyType: '',
frequencyDetail: '',
@@ -302,6 +309,11 @@
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.frequencyType === 'WEEKLY') {
let frequencyDetail = ''
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index 1be5ad9..3f47aa3 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -132,6 +132,7 @@
{ prop: "taskName", label: "宸℃浠诲姟鍚嶇О", minWidth: 160 },
{ prop: "remarks", label: "澶囨敞", minWidth: 150 },
{ prop: "inspector", label: "鎵ц宸℃浜�", minWidth: 150, slot: "inspector" },
+ { prop: "acceptanceInspector", label: "宸℃楠屾敹浜�", minWidth: 150 },
{
prop: "frequencyType",
label: "棰戞",
--
Gitblit v1.9.3