From 248d9f8b01d9a395af66f2336cb0b1eeeff2bd0a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 19 二月 2025 10:10:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/structural/capabilityAndLaboratory/laboratory/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
index 8d66a13..c0bf840 100644
--- a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
@@ -32,7 +32,7 @@
<div v-if="radio===0">
<lims-table :tableData="tableData" :column="column"
:isSelection="true" :handleSelectionChange="handleSelectionChange"
- @pagination="pagination"
+ @pagination="pagination" :height="'calc(100vh - 300px)'"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
<div class="table" v-if="radio===1" v-loading="pageLoading" @scroll="scrollFn">
@@ -288,7 +288,7 @@
this.selection = selection;
},
pagination (page) {
- this.page.size = page.pageNum.limit
+ this.page.size = page.limit
this.refreshTable()
},
// 璧勮川鏄庣粏鎵归噺鍒犻櫎
--
Gitblit v1.9.3