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/component/EditFormDia.vue | 10 +---
src/views/CNAS/process/method/standardMethod/index.vue | 20 +++++++++
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 65 ++++++++++++++++++++++++++++++--
src/api/cnas/process/method/standardNoveltyRetrieval.js | 9 ++++
4 files changed, 91 insertions(+), 13 deletions(-)
diff --git a/src/api/cnas/process/method/standardNoveltyRetrieval.js b/src/api/cnas/process/method/standardNoveltyRetrieval.js
index a0062e8..92baccf 100644
--- a/src/api/cnas/process/method/standardNoveltyRetrieval.js
+++ b/src/api/cnas/process/method/standardNoveltyRetrieval.js
@@ -19,6 +19,15 @@
});
}
+// 鏌ヨ鐢辨爣鍑嗙淮鎶よ嚜鍔ㄥ綊妗ｇ殑璁板綍
+export function pageAutoArchived(query) {
+ return request({
+ url: "/processMethodSearchNew/pageAutoArchived",
+ method: "get",
+ params: query,
+ });
+}
+
// 鏂板鏍囧噯鏌ユ柊瀹℃壒娴佺▼
export function addSearchNewArchived(data) {
return request({
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index 81719d2..ead7cd7 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/src/views/CNAS/process/method/standardMethod/index.vue
@@ -70,6 +70,12 @@
<el-option label="鏄�" :value="1"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鏄惁鏌ユ柊" prop="needSearchNew">
+ <el-select v-model="addForm.needSearchNew" size="small" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option label="鍚�" :value="0"></el-option>
+ <el-option label="鏄�" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item v-if="title === '鏂板'" label="闄勪欢">
<el-upload ref="addUpload" action="#" :auto-upload="false" multiple :file-list="pendingFiles"
:on-change="pendingFileChange" :on-remove="pendingFileRemove" :before-upload="beforeFileUpload"
@@ -175,6 +181,14 @@
}
},
},
+ {
+ label: "鏄惁鏌ユ柊",
+ prop: "needSearchNew",
+ width: "90px",
+ dataType: "tag",
+ formatData: (value) => value == 1 ? "鏄�" : "鍚�",
+ formatType: (value) => value == 1 ? "success" : "info",
+ },
{label: "鍒涘缓浜�", prop: "createUserName"},
{label: "鍒涘缓鏃堕棿", prop: "createTime"},
{label: "鏇存柊浜�", prop: "updateUserName"},
@@ -232,6 +246,9 @@
isUse: [
{required: true, message: "璇烽�夋嫨鏄惁鍚敤", trigger: "change"},
],
+ needSearchNew: [
+ {required: true, message: "璇烽�夋嫨鏄惁鏌ユ柊", trigger: "change"},
+ ],
},
};
},
@@ -275,7 +292,7 @@
},
openAdd() {
this.title = "鏂板";
- this.addForm = {industryIds: [], isProduct: 1, isUse: 1};
+ this.addForm = {industryIds: [], isProduct: 1, isUse: 1, needSearchNew: 0};
this.pendingFiles = [];
this.addDlog = true;
},
@@ -284,6 +301,7 @@
this.addDlog = true;
this.addForm = this.HaveJson(row)
this.addForm.industryIds = this.addForm.industryIds || [];
+ if (this.addForm.needSearchNew == null) this.addForm.needSearchNew = 0;
},
getQualificationList() {
this.getDicts("cnas_method_qualification").then((response) => {
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/component/EditFormDia.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/component/EditFormDia.vue
index 5d4f86c..b2929cb 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/component/EditFormDia.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/component/EditFormDia.vue
@@ -18,11 +18,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鏄惁鏄柊鏍囧噯锛�" prop="isNewStandard">
- <el-radio-group v-model="form.isNewStandard">
- <el-radio :value="0">鍚�</el-radio>
- <el-radio :value="1">鏄�</el-radio>
- </el-radio-group>
+ <el-form-item label="鏄惁鏄柊鏍囧噯锛�">
+ <el-tag type="success">鏄�</el-tag>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -89,7 +86,6 @@
formRules: {
methodName: [{required: true, message: '璇峰～鍐欐爣鍑嗗悕绉�',trigger: 'blur'}],
standardNo: [{required: true, message: '璇峰～鍐欐爣鍑嗗彿',trigger: 'blur'}],
- isNewStandard: [{required: true, message: '璇烽�夋嫨鏄惁鏄柊鏍囧噯',trigger: 'change'}],
newMethodName: [{required: false, message: '璇峰～鍐欐柊鏍囧噯鍚嶇О',trigger: 'blur'}],
newStandardNo: [{required: false, message: '璇峰～鍐欐柊鏍囧噯鍙�',trigger: 'blur'}],
searchNewSource: [{required: true, message: '璇烽�夋嫨鏌ユ柊璁板綍鏉ユ簮',trigger: 'change'}],
@@ -103,7 +99,7 @@
methods: {
openDia(row) {
this.formDia = true
- this.form = {...row}
+ this.form = {...row, isNewStandard: 1}
},
handleEdit() {
this.$refs['form'].validate((valid) => {
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