From b304ff03ae47e963b3b398d382090679d6a4944f Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期五, 14 三月 2025 09:22:28 +0800 Subject: [PATCH] 标准查新分页修改 --- src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 60 +++++++++++++----------------------------------------------- 1 files changed, 13 insertions(+), 47 deletions(-) diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue index 4321fb6..4006fd6 100644 --- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue +++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue @@ -3,8 +3,11 @@ <div class="search"> <div> <el-form :model="searchForm" ref="searchForm" size="small" :inline="true"> - <el-form-item label="鏍囧噯鍙�" prop="standardNo"> + <el-form-item label="鏍囧噯鍙�" prop="standardNo" v-if="tabIndex === '0'"> <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.standardNo"></el-input> + </el-form-item> + <el-form-item label="瀛樻。鍚嶇О" prop="archivedName" v-if="tabIndex === '1'"> + <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.archivedName"></el-input> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button> @@ -13,20 +16,20 @@ </el-form> </div> <div> - <el-button size="medium" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button> - <el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="headers" :on-error="onError" + <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" accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' style="display: inline-block; margin-left: 10px;"> - <el-button :loading="upLoading" size="medium" type="primary">瀵煎叆</el-button> + <el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button> </el-upload> - <el-button size="medium" style="margin-left: 10px;" type="primary" @click="openFormDia">鏂� 澧�</el-button> + <el-button size="small" style="margin-left: 10px;" type="primary" @click="openFormDia">鏂� 澧�</el-button> </div> </div> <div> <div class="table"> <div class="table-tab"> - <el-radio-group v-model="tabIndex" @input="searchList"> + <el-radio-group v-model="tabIndex" @change="searchList"> <el-radio-button label="0">浠婂勾鏍囧噯璁板綍</el-radio-button> <el-radio-button label="1">鍘嗗彶妗f</el-radio-button> </el-radio-group> @@ -96,6 +99,7 @@ addSearchNewArchived, exportMethodSearchNew, pageMethodSearchNew, pageSearchNewArchived, pageSearchNewBackups, ratifySearchNewArchivedr } from '@/api/cnas/process/method/standardNoveltyRetrieval' +import {selectUserCondition} from "@/api/performance/class"; export default { name: 'a7-standard-novelty-retrieval', @@ -112,6 +116,7 @@ searchForm: { year: '', standardNo: '', + archivedName: '' }, options: [ { label: '涓婂崐骞�', value: '1' }, @@ -468,7 +473,6 @@ writeDate: '', ratifyDate: '', }, - userList: [], approvalDialog: false, approvalDialog1: false, viewRocordDia: false, @@ -485,23 +489,9 @@ methods: { // 鏌ヨ鍒楄〃 searchList() { - let params = {} - if (this.tabIndex === '0') { - params = { - entity: { - standardNo: this.searchForm.standardNo, - }, - page: this.page - } - } else { - params = { - entity: {}, - page: this.oldPage - } - } if (this.tabIndex === '0') { this.tableLoading = true - pageMethodSearchNew({ ...params.oldPage, ...params.entity }).then(res => { + pageMethodSearchNew({ standardNo: this.searchForm.standardNo, ...this.page }).then(res => { this.tableLoading = false if (res.code === 200) { this.tableData = res.data.records @@ -513,12 +503,9 @@ }) } else { this.oldTableLoading = true - pageSearchNewArchived({ - ...params.page, ...params.entity - }).then(res => { + pageSearchNewArchived({archivedName: this.searchForm.archivedName, ...this.oldPage}).then(res => { this.oldTableLoading = false if (res.code === 200) { - console.log('res>>>>>>>>>>>>', res) this.oldTableData = res.data.records this.oldPage.total = res.data.total } @@ -670,30 +657,9 @@ this.oldPage.size = page.limit this.searchList(); }, - // - getUserList() { - this.$axios.post(this.$api.user.selectUserList, { - page: { current: -1, size: -1, }, - entity: { name: null } - }, { - headers: { - 'Content-Type': 'application/json' - } - }).then(res => { - if (res.code === 201) { - return - } - this.userList = res.data.body.records - }) - }, }, // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭� computed: { - headers() { - return { - 'token': sessionStorage.getItem('token') - } - }, action() { return this.javaApi + '/processMethodSearchNew/importMethodSearchNew' } -- Gitblit v1.9.3