From 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index 2f71c5c..a459b37 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -7,9 +7,14 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.standardNo"
@keyup.enter="searchList"></el-input>
</div>
- <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;" v-if="tabIndex === '1'">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;" v-if="tabIndex === '1' && historyType === 'manual'">
<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.archivedName"
+ @keyup.enter="searchList"></el-input>
+ </div>
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;" v-if="tabIndex === '1' && historyType === 'auto'">
+ <span style="width: 68px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">鏍囧噯鍙�</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.standardNo"
@keyup.enter="searchList"></el-input>
</div>
<div style="line-height: 30px;">
@@ -17,7 +22,7 @@
<el-button size="small" @click="resetSearchForm">閲嶇疆</el-button>
</div>
</div>
- <div style="line-height: 30px;">
+ <div style="line-height: 30px;" v-if="tabIndex === '0'">
<el-button size="small" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button>
<el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="uploadHeader" :on-error="onError"
:on-success="handleSuccessUp" :show-file-list="false"
@@ -42,8 +47,15 @@
</lims-table>
</div>
<div v-if="tabIndex === '1'">
- <lims-table :column="oldTableColumn" :height="'calc(100vh - 20em)'" :table-data="oldTableData"
+ <el-radio-group v-model="historyType" size="small" style="margin-bottom: 10px" @change="switchHistoryType">
+ <el-radio-button value="manual">鎵嬪姩妗ｆ</el-radio-button>
+ <el-radio-button value="auto">鑷姩褰掓。璁板綍</el-radio-button>
+ </el-radio-group>
+ <lims-table v-if="historyType === 'manual'" :column="oldTableColumn" :height="'calc(100vh - 23em)'" :table-data="oldTableData"
:table-loading="oldTableLoading" :page="oldPage" @pagination="oldPagination">
+ </lims-table>
+ <lims-table v-else :column="autoArchivedColumn" :height="'calc(100vh - 23em)'" :table-data="autoArchivedData"
+ :table-loading="autoArchivedLoading" :page="autoArchivedPage" @pagination="autoArchivedPagination">
</lims-table>
</div>
</div>
@@ -86,7 +98,7 @@
import EditFormDia from './component/EditFormDia.vue';
import {
addSearchNewArchived, exportMethodSearchNew,
- pageMethodSearchNew, pageSearchNewArchived, pageSearchNewBackups, ratifySearchNewArchivedr
+ pageMethodSearchNew, pageSearchNewArchived, pageSearchNewBackups, pageAutoArchived, ratifySearchNewArchivedr
} from '@/api/cnas/process/method/standardNoveltyRetrieval'
export default {
@@ -450,6 +462,25 @@
oldTableData: [],
oldTableLoading: false,
tabIndex: '0',
+ historyType: 'manual',
+ autoArchivedData: [],
+ autoArchivedLoading: false,
+ autoArchivedPage: {size: 10, current: 1, total: 0},
+ autoArchivedColumn: [
+ {label: '鏍囧噯鍚嶇О', prop: 'methodName', minWidth: '120'},
+ {label: '鏍囧噯鍙�', prop: 'standardNo', minWidth: '100'},
+ {label: '鏂囦欢缂栧彿', prop: 'fileNo', minWidth: '110'},
+ {
+ dataType: 'tag', label: '鏄惁鏄柊鏍囧噯', prop: 'isNewStandard', minWidth: '110',
+ formatData: () => '鍚�', formatType: () => 'danger'
+ },
+ {
+ dataType: 'tag', label: '鏌ヨ璁板綍鏉ユ簮', prop: 'searchNewSource', minWidth: '110',
+ formatData: (value) => ({0: '鏍囧噯缃�', 1: '濮旀墭鎯呮姤', 2: '鏍囧噯鏁�', 3: '鍏朵粬'}[value] || ''),
+ formatType: (value) => ({0: 'success', 1: 'danger', 2: 'warning', 3: 'info'}[value] || 'info')
+ },
+ {label: '鑷姩褰掓。鏃堕棿', prop: 'autoArchivedTime', minWidth: '150'}
+ ],
formDialog: false,
editFormDialog: false,
upLoading: false,
@@ -488,7 +519,7 @@
console.log('err---', err);
this.tableLoading = false
})
- } else {
+ } else if (this.historyType === 'manual') {
this.oldTableLoading = true
pageSearchNewArchived({archivedName: this.searchForm.archivedName, ...this.oldPage}).then(res => {
this.oldTableLoading = false
@@ -500,6 +531,18 @@
}).catch(err => {
console.log('err---', err);
this.oldTableLoading = false
+ })
+ } else {
+ this.autoArchivedLoading = true
+ pageAutoArchived({standardNo: this.searchForm.standardNo, ...this.autoArchivedPage}).then(res => {
+ this.autoArchivedLoading = false
+ if (res.code === 200) {
+ this.autoArchivedData = res.data.records
+ this.autoArchivedPage.total = res.data.total
+ }
+ }).catch(err => {
+ console.log('err---', err);
+ this.autoArchivedLoading = false
})
}
},
@@ -575,6 +618,12 @@
// 閲嶇疆鏌ヨ鏉′欢
resetSearchForm() {
this.searchForm.standardNo = '';
+ this.searchForm.archivedName = '';
+ this.searchList()
+ },
+ switchHistoryType() {
+ this.oldPage.current = 1
+ this.autoArchivedPage.current = 1
this.searchList()
},
// 鎿嶄綔鏂板妗�
@@ -642,6 +691,12 @@
},
oldPagination(page) {
this.oldPage.size = page.limit
+ this.oldPage.current = page.page
+ this.searchList();
+ },
+ autoArchivedPagination(page) {
+ this.autoArchivedPage.size = page.limit
+ this.autoArchivedPage.current = page.page
this.searchList();
},
},
--
Gitblit v1.9.3