From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/process/method/methodVerification/index.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index 59fda20..8be4cf8 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -17,12 +17,10 @@
</div>
</div>
<div class="table">
- <div>
- <limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
- :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" :page="page"
- @pagination="pagination">
- </limsTable>
- </div>
+ <limsTable :column="tableColumn" :height="'calc(100vh - 23em)'" :table-data="tableData"
+ :table-loading="tableLoading" :page="page"
+ @pagination="pagination">
+ </limsTable>
</div>
<formDIa v-if="formDIa" ref="formDIa" :operationType="operationType" @closeDia="closeDia"></formDIa>
</div>
@@ -100,6 +98,7 @@
page: {
size: 20,
current: 1,
+ total: 0
},
total: 0,
formDIa: false,
--
Gitblit v1.9.3