From beadc7f71e4eafeca1aee29be931c05df6bd07a5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 20 十二月 2023 13:20:55 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/productionschedul/index.vue | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index b76fe0c..72fd3d4 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">
@@ -134,7 +140,6 @@
deleteSchedul,
updateSchedul
} from '@/api//plan/productionschedul'
-import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
export default {
@@ -156,9 +161,14 @@
page: {
total: 10,
currentPage: 1,
- pageSize: 10
+ pageSize: 10,
+ pagerCount: 5
},
option: {
+ defaultSort:{
+ prop:'id',
+ order:'descending'
+ },
height: 400,
selection: true,
columnBtn: false,
@@ -291,7 +301,6 @@
},
components: {
ttable,
- TableForm,
},
computed: {
...mapGetters(['permissions']),
@@ -300,11 +309,11 @@
this.loading = true
this.getData()
this.getParamType()
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
beforeUpdate() {
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
watch:{
@@ -455,12 +464,24 @@
}
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,
}
fetchScheduleList(param).then((res) => {
this.tableData = res.data.data.records
@@ -469,9 +490,6 @@
this.scheduleList = []
})
this.loading = false
- },
- handleCurrentChange(val) {
- this.multipleSelection = val
},
// 鍒犻櫎
deleteHandle(row,index) {
@@ -499,7 +517,7 @@
ele.span = this.rowSpan(ele.prop, parent)
})
},
- rowSort(list) {
+ rowSort() {
let propList = this.spanArr.map(ele => ele.prop)
this.spanArr.forEach((ele, index) => {
let key = ele.prop
@@ -559,6 +577,9 @@
}
</script>
<style>
+.avue-crud__tip{
+ display: none;
+}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
padding-left: 0px;
padding-right: 0px;
--
Gitblit v1.9.3