From 4f57c68a590a1197b2be5715ee1f4a2fa7b62711 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 13 十二月 2023 14:36:09 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/productionschedul/index.vue | 31 ++++++++++++++++++++++++-------
src/views/common/ztt-table.vue | 2 ++
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index c517021..64d8045 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -397,6 +397,7 @@
@size-change="sizeChangeHandle"
:page-sizes="[10, 20, 50, 100]"
:page-size="pagination.pageSize"
+ :page-count="pagination.size"
:layout="
size
? 'total, prev, pager, next'
@@ -718,6 +719,7 @@
currentPage:
this.table.currentPage == null ? 1 : this.table.currentPage,
pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
+ size: this.table.size == null ? 7 : this.table.size,
total: this.table.total == null ? 0 : this.table.total
}, // 鍒嗛〉淇℃伅
inMemoryColWidth: {}, // 璁板繂涓垪瀹斤紝榛樿鍒楀
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index b76fe0c..e19b0e5 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -4,8 +4,14 @@
<el-row>
<el-col :span="12">
<div style="height:80vh;padding: 0px 10px;">
- <avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod"
+ <avue-crud
+ :data="tableData"
+ ref="crud"
+ :option="option"
+ :span-method="spanMethod"
@refresh-change="getData"
+ @current-change="handleCurrentChange"
+ @size-change="handleSizeChange"
:page="page"
@selection-change="selectionRow"
:table-loading="loading">
@@ -156,7 +162,8 @@
page: {
total: 10,
currentPage: 1,
- pageSize: 10
+ pageSize: 10,
+ pagerCount: 5
},
option: {
height: 400,
@@ -455,13 +462,26 @@
}
return ''
},
+ handleSizeChange(val){
+ if(val){
+ this.page.pageSize=val
+ this.getData()
+ }
+ },
+ handleCurrentChange(val){
+ if(val){
+ this.page.currentPage=val
+ this.getData()
+ }
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
this.loading = true
let param = {
- size: 20,
- current: 1,
+ size: this.page.pageSize,
+ current: this.page.currentPage,
}
+ console.log(this.page);
fetchScheduleList(param).then((res) => {
this.tableData = res.data.data.records
this.page.total = res.data.data.total
@@ -469,9 +489,6 @@
this.scheduleList = []
})
this.loading = false
- },
- handleCurrentChange(val) {
- this.multipleSelection = val
},
// 鍒犻櫎
deleteHandle(row,index) {
--
Gitblit v1.9.3