From 78a3c898908bbb8827d1c2aa6299f92ff03f5847 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:06:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue
index 88318c1..073dca1 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue
@@ -21,8 +21,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐ㄦ帶鏂瑰紡" prop="monitorWay">
- <el-input v-model="form.monitorWay" size="small" clearable placeholder="濡傜洸鏍锋娴嬨�佷汉鍛樻瘮瀵广�佺洃鐫ｆ鏌�" />
+ <el-form-item label="璐ㄦ帶鏂瑰紡" prop="monitorWayList">
+ <el-select v-model="form.monitorWayList" multiple filterable allow-create default-first-option
+ size="small" style="width: 100%" placeholder="鍙閫夛紝涔熷彲杈撳叆鍏朵粬鏂瑰紡">
+ <el-option v-for="item in monitorWayOptions" :key="item" :label="item" :value="item" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -103,6 +106,11 @@
// 杩欓噷瀛樻斁鏁版嵁
return {
formDia: false,
+ // LMSY-CX30-2024銆婅川閲忔帶鍒剁▼搴忋��4.1 瑙勫畾鐨勫父鐢ㄨ川閲忔帶鍒舵墜娈碉紝鍙閫�
+ monitorWayOptions: [
+ '浜哄憳姣斿', '璁惧姣斿', '鏂规硶姣斿', '鐩叉牱妫�娴�',
+ '鐣欐牱鍐嶆祴', '鏍囧噯鐗╄川鐩戞帶', '瀹為獙瀹ら棿姣斿', '鑳藉姏楠岃瘉',
+ ],
form: {
qualityMonitorDetailsId: '',
sortNo: null,
@@ -116,6 +124,7 @@
budget: '',
organization: '',
monitorWay: '',
+ monitorWayList: [],
itemKind: 'OTHER',
standardMethodId: null,
templateId: null,
@@ -134,7 +143,7 @@
rules: {
monitorProject: [{ required: true, message: '璇疯緭鍏ヨ川鎺ч」鐩�', trigger: 'blur' }],
technicalStandardText: [{ required: true, message: '璇疯緭鍏ユ妧鏈爣鍑�', trigger: 'blur' }],
- monitorWay: [{ required: true, message: '璇疯緭鍏ヨ川鎺ф柟寮�', trigger: 'blur' }],
+ monitorWayList: [{ required: true, type: 'array', min: 1, message: '璇烽�夋嫨璐ㄦ帶鏂瑰紡', trigger: 'change' }],
completionMonth: [{ required: true, message: '璇烽�夋嫨瀹屾垚鏃堕檺', trigger: 'change' }],
responsibleUserId: [{ required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: 'change' }],
templateIds: [{ required: true, type: 'array', min: 1, message: '璇疯嚦灏戦�夋嫨涓�涓師濮嬭褰曟ā鏉�', trigger: 'change' }],
@@ -148,6 +157,7 @@
openDia(type, row) {
this.formDia = true
this.operationType = type
+ this.form.monitorWayList = []
this.templateOptions = []
this.allTemplateOptions = []
this.templateBindingLoading = false
@@ -165,7 +175,12 @@
const templateIds = row.templateIds
? String(row.templateIds).split(',').filter(Boolean).map(id => Number(id))
: (row.templateId ? [Number(row.templateId)] : [])
- this.form = {...row, itemKind: row.itemKind || 'OTHER', templateIds}
+ this.form = {
+ ...row,
+ itemKind: row.itemKind || 'OTHER',
+ templateIds,
+ monitorWayList: row.monitorWay ? String(row.monitorWay).split(/[銆�,锛�;锛沒/).map(item => item.trim()).filter(Boolean) : [],
+ }
},
handleStandardChange(id) {
const standard = this.standardOptions.find(item => Number(item.id) === Number(id))
@@ -211,6 +226,8 @@
: []
entity.templateIds = templateIds.join(',') || null
entity.templateId = templateIds.length ? templateIds[0] : null
+ entity.monitorWay = (this.form.monitorWayList || []).map(item => item.trim()).filter(Boolean).join('銆�')
+ delete entity.monitorWayList
entity.reviewerUserId = null
return entity
},
--
Gitblit v1.9.3