From 10f334d1b36f8dad1edcd3b489c9eb6b8773d444 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 03 三月 2025 14:47:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 033f101..11d2981 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -45,14 +45,14 @@
</el-form>
<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
<div class="table" v-if="radio===0">
- <lims-table :tableData="tableData" :column="column"
- @pagination="pagination"
+ <lims-table :tableData="tableData" :column="column" key="tableData"
+ @pagination="pagination" :height="'calc(100vh - 290px)'"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
<!-- 妫�楠屽璞¤〃鏍�-->
<div class="table" v-if="radio===1">
- <lims-table :tableData="testObjectTableData" :column="testObjectColumn"
- @pagination="pagination"
+ <lims-table :tableData="testObjectTableData" :column="testObjectColumn" key="testObjectTableData"
+ @pagination="pagination" :height="'calc(100vh - 290px)'"
:page="testObjectPage" :tableLoading="tableLoading"></lims-table>
</div>
</div>
@@ -385,8 +385,8 @@
this.$refs.upload.clearFiles()
this.uploadDia = false
this.uploading = false
- if (response.code === 201) {
- this.$message.error(response.message)
+ if (response.code !== 200) {
+ this.$message.error(response.msg)
return
}
this.$message.success('涓婁紶鎴愬姛')
@@ -462,10 +462,11 @@
},
refresh() {
this.resetForm('itemParameterForm')
+ this.page.current = 1
this.refreshTable()
},
pagination (page) {
- this.page.size = page.pageNum.limit
+ this.page.size = page.limit
this.refreshTable()
},
// 妫�楠岄」鐩弬鏁版柊澧�
--
Gitblit v1.9.3