From a52ac50ffc5f3b369eb689dd734bfb8a4bb988a4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:41:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/method/methodVerification/index.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index dd77321..c26f254 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -3,8 +3,8 @@
<div style="display: flex;justify-content: space-between">
<div style="display: flex;">
<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">鏍囧噯鏂规硶</span>
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.methodName"
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">鏍囧噯鍚嶇О</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.standardName"
@keyup.enter="searchList"></el-input>
</div>
<div style="line-height: 30px;">
@@ -22,24 +22,26 @@
@pagination="pagination">
</limsTable>
</div>
- <formDIa v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIa>
+ <component :is="isWordForm ? 'wordFormDIa' : 'formDIa'" v-if="formDIa" ref="formDIa"
+ :operationType="operationType" @closeDia="closeDia" />
</div>
</template>
<script>
import limsTable from '@/components/Table/lims-table.vue'
import formDIa from './component/formDIa.vue';
+import wordFormDIa from './component/wordFormDIa.vue';
import { delMethodVerify, exportMethodVerify, pagesMethodVerify } from '@/api/cnas/process/method/methodVerification'
export default {
name: 'MethodVerification',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { limsTable, formDIa },
+ components: { limsTable, formDIa, wordFormDIa },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
searchForm: {
- methodName: '',
+ standardName: '',
operationType: 1,
},
options: [
@@ -48,18 +50,18 @@
],
tableColumn: [
{
- label: '鏍囧噯鏂规硶',
- prop: 'methodName',
+ label: '鏍囧噯鍚嶇О',
+ prop: 'standardName',
minWidth: '100'
},
{
- label: '楠岃瘉鍘熷洜',
- prop: 'verifyReason',
+ label: '鏍囧噯缂栧彿',
+ prop: 'standardCode',
minWidth: '100'
},
{
- label: '涓昏鎶�鏈彉鍖�',
- prop: 'technologyChange',
+ label: '楠岃瘉椤圭洰',
+ prop: 'verifyItem',
minWidth: '100'
},
{
@@ -110,6 +112,7 @@
total: 0,
formDIa: false,
operationType: '',
+ isWordForm: true,
};
},
mounted() {
@@ -120,7 +123,7 @@
// 鏌ヨ鍒楄〃
searchList() {
const entity = {
- methodName: this.searchForm.methodName,
+ standardName: this.searchForm.standardName,
operationType: this.searchForm.operationType,
}
const page = this.page
@@ -158,12 +161,13 @@
},
// 閲嶇疆鏌ヨ鏉′欢
resetSearchForm() {
- this.searchForm.methodName = '';
+ this.searchForm.standardName = '';
this.searchList()
},
openFormDia(type, row) {
this.formDIa = true
this.operationType = type
+ this.isWordForm = type === 'add' || !!row?.standardCode
this.$nextTick(() => {
this.$refs.formDIa.openDia(row)
})
--
Gitblit v1.9.3