From 29be8639dc16b5d82bddc6099b1fa5cdca75f77a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 16:28:22 +0800
Subject: [PATCH] feat(import): 统一导入弹框与模板，修复模板日期格式及上传报错
---
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/inspectionEvaluationDialog.vue | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/inspectionEvaluationDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/inspectionEvaluationDialog.vue
index 110092e..68b5163 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/inspectionEvaluationDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/inspectionEvaluationDialog.vue
@@ -7,7 +7,8 @@
:closable="false"/>
<el-alert v-if="!canEdit" :title="editNotice" :type="loaded ? 'warning' : 'info'"
:closable="false" style="margin-top:8px"/>
- <el-form :model="form" label-width="110px" style="margin-top: 16px">
+ <div class="role-hint">鐩戠潱鍛橀粯璁や负璁″垝涓寚瀹氱殑璇勪环浜猴紝琚洃鐫ｄ汉鍛樹负璁″垝涓寚瀹氱殑妫�娴嬪憳銆�</div>
+ <el-form :model="form" label-width="150px" style="margin-top: 16px">
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="妫�娴嬮」鐩�">
@@ -43,14 +44,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐩戠潱鍛�">
+ <el-form-item label="鐩戠潱鍛橈紙璇勪环浜猴級">
<el-select v-model="form.supervisorUserId" filterable style="width: 100%" :disabled="!canEdit">
<el-option v-for="person in supervisorOptions" :key="person.id" :value="person.id" :label="person.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="琚洃鐫ｄ汉鍛�">
+ <el-form-item label="琚洃鐫ｄ汉鍛橈紙妫�娴嬪憳锛�">
<el-input :model-value="supervisedPersonName" disabled/>
</el-form-item>
</el-col>
@@ -168,12 +169,23 @@
},
supervisedPersonName() {
const id = this.form.inspectorUserId || this.row?.inspectorUserId
- return this.people.find(person => Number(person.id) === Number(id))?.name || ''
+ return this.people.find(person => Number(person.id) === Number(id))?.name
+ || this.form.inspectorName || this.row?.inspectorName || ''
},
supervisorOptions() {
const inspectorId = Number(this.form.inspectorUserId || this.row?.inspectorUserId)
- const evaluatorId = Number(this.row?.evaluatorUserId)
- return this.people.filter(person => Number(person.id) !== inspectorId && Number(person.id) !== evaluatorId)
+ // 鐩戠潱鍛橀粯璁ゅ氨鏄鍒掍腑鐨勮瘎浠蜂汉锛屽洜姝よ繖閲屼笉鑳芥妸璇勪环浜烘帓闄ゆ帀锛涘彧鎺掗櫎琚洃鐫ｇ殑妫�娴嬪憳
+ const options = this.people.filter(person => Number(person.id) !== inspectorId)
+ // 宸蹭繚瀛樼殑鐩戠潱鍛樺鏋滀笉鍦ㄤ汉鍛樹笅鎷夊垪琛ㄤ腑锛堣瑙掕壊/鐘舵�佽繃婊ゆ垨宸插仠鐢級锛岃ˉ涓�鏉￠�夐」淇濊瘉鑳藉弽鏄�
+ const savedId = this.form.supervisorUserId
+ if (savedId && !options.some(person => Number(person.id) === Number(savedId))) {
+ const saved = this.people.find(person => Number(person.id) === Number(savedId))
+ options.unshift({
+ id: savedId,
+ name: saved?.name || this.form.supervisorName || `鐢ㄦ埛 ${savedId}`
+ })
+ }
+ return options
}
},
methods: {
@@ -192,7 +204,14 @@
this.people = res.data || []
})
getInspectionEvaluation(row.qualityMonitorDetailsId).then(res => {
- if (res.data) this.form = {...res.data, resultRows: res.data.resultRows || [], measurementConfirmed: false}
+ if (res.data) {
+ this.form = {...res.data, resultRows: res.data.resultRows || [], measurementConfirmed: false}
+ // 鍏滃簳锛氬巻鍙茶瘎浠疯褰曟病鏈夌洃鐫ｅ憳鏃讹紝榛樿甯﹀嚭璁″垝璇勪环浜�
+ if (!this.form.supervisorUserId && this.row?.evaluatorUserId) {
+ this.form.supervisorUserId = this.row.evaluatorUserId
+ this.form.supervisorName = this.people.find(person => Number(person.id) === Number(this.row.evaluatorUserId))?.name || ''
+ }
+ }
}).catch(() => {
this.loadError = '璇勪环璁板綍璇诲彇澶辫触锛岃鍒锋柊鍚庨噸璇�'
}).finally(() => {
@@ -231,3 +250,12 @@
}
}
</script>
+
+<style scoped>
+.role-hint {
+ margin-top: 8px;
+ font-size: 12px;
+ line-height: 18px;
+ color: var(--el-text-color-secondary);
+}
+</style>
--
Gitblit v1.9.3