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/externalService/serviceAndSupplyPro/component/ConsumableProject.vue | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue
index 9dd50d2..1ad4556 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/component/ConsumableProject.vue
@@ -4,34 +4,23 @@
<el-button icon="el-icon-plus" size="small" type="primary" @click="showDialog">
娣诲姞椤圭洰
</el-button>
- <el-button icon="el-icon-upload2" size="small" @click="exportExcel">
- 瀵煎嚭
- </el-button>
+<!-- <el-button icon="el-icon-upload2" size="small" @click="exportExcel">-->
+<!-- 瀵煎嚭-->
+<!-- </el-button>-->
</div>
<limsTable
:column="columns"
:height="'25vh'"
:isSelection="true"
:table-data="tableData"
+ @pagination="pagination"
+ :page="page"
style="margin-top: 18px;"
>
<template v-slot:operation="scope">
<el-button size="small" type="text" @click="deleteData(scope.row)">鍒犻櫎</el-button>
</template>
</limsTable>
- <div class="pagination">
- <div></div>
- <el-pagination
- background
- :page-size="pagination.pageSize"
- :page-sizes="[10, 20, 30, 40]"
- :total="pagination.total"
- layout="total, sizes, prev, pager, next, jumper"
- @current-change="handleCurrent"
- @size-change="handleSize"
- >
- </el-pagination>
- </div>
<AddProject ref="AddProjectRef" @submit="fetchData"/>
</div>
</template>
@@ -80,9 +69,9 @@
}
],
tableData: [],
- pagination: {
+ page: {
current: 1,
- pageSize: 20,
+ size: 20,
total: 0
},
listId: 0,
@@ -103,12 +92,17 @@
async fetchData() {
if (this.listId === 0) return
procurementSuppliesExpendlist({
- procurementSuppliesListId:this.listId
+ procurementSuppliesListId:this.listId,
+ ...this.page
}).then(res => {
if (res.code === 200) {
this.tableData = res.data
}
})
+ },
+ pagination (page) {
+ this.page.size = page.limit
+ this.fetchData()
},
showDialog() {
this.$refs.AddProjectRef.openDialog(this.row);
@@ -120,10 +114,6 @@
this.fetchData()
}
})
- },
- handleCurrent() {
- },
- handleSize() {
},
exportExcel() {
}
--
Gitblit v1.9.3