From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index b00e8cb..4fbcee7 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -1,42 +1,34 @@
<template>
<!-- 澶栨潵鏂囦欢纭璁板綍 -->
- <div class="ExternalDocumentConfirmationRecords">
- <el-tabs type="border-card" v-model="activeName" style="height: 100%;">
+ <div class="capacity-scope">
+ <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @change="getTableData">
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;">
- <div style="display: flex;align-items: center;justify-content: flex-end;margin-right: 20px;">
+ <div style="display: flex;align-items: center;justify-content: flex-end;margin-bottom: 10px">
<el-button size="small" type="primary" @click="openAdd('鏂板')" style="margin-left: 20px;">鏂板</el-button>
<el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
:headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
:on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button size="small" type="primary" :loading="upLoading">瀵煎叆</el-button></el-upload>
</div>
- <div class="table" style="height: calc(100% - 200px)">
- <!-- <ValueTable ref="ValueTable0" :url="$api.manageRecordTotal.pageManageRecordVerify"
- :componentData="componentData0" :key="upIndex0" :delUrl="$api.manageRecordTotal.delManageRecordVerify"
- :upUrl="$api.manageRecordTotal.doManageRecordVerify" /> -->
- <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading0"
- :height="'calc(100vh - 270px)'" @pagination="pagination0"></lims-table>
- </div>
+ <lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading0"
+ :height="'calc(100vh - 290px)'" @pagination="pagination0"></lims-table>
</el-tab-pane>
<el-tab-pane label="鍘嗗彶璁板綍" name="鍘嗗彶璁板綍" style="height: 100%;">
- <div class="search">
- <div class="search_thing">
- <div class="search_label">骞达細</div>
- <div class="search_input">
+ <div>
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+ <el-form-item label="骞�" prop="year">
<el-date-picker v-model="queryParams.year" type="year" placeholder="閫夋嫨骞�" format="yyyy" value-format="yyyy"
- size="small" @change="refreshTable()">
+ size="small" @change="refreshTable()">
</el-date-picker>
- </div>
- </div>
- <div class="search_thing" style="padding-left: 30px;">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </div>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
</div>
- <div class="table">
- <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
- :height="'calc(100vh - 280px)'" @pagination="pagination"></lims-table>
- </div>
+ <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
+ :height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
</el-tab-pane>
</el-tabs>
<!-- 璇︽儏/涓嬭浇/瀹℃牳 -->
@@ -103,6 +95,7 @@
doManageRecordVerify
} from '@/api/cnas/systemManagement/documentRecords.js'
export default {
+ name: 'OutDocumenRecordt',
components: {
filePreview,
limsTable,
@@ -244,11 +237,16 @@
}
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity);
- this.getList()
- this.getList0()
+ this.getTableData();
},
methods: {
+ getTableData() {
+ if (this.activeName === '濉啓') {
+ this.getList0()
+ } else {
+ this.getList()
+ }
+ },
openAdd(title, row) {
this.title = title;
if (row) {
@@ -296,7 +294,7 @@
});
},
pagination0({ page, limit }) {
- this.pag0.current = page;
+ this.page0.current = page;
this.page0.size = limit;
this.getList0();
},
--
Gitblit v1.9.3