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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index e19b0e5..72fd3d4 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -140,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 {
@@ -166,6 +165,10 @@
pagerCount: 5
},
option: {
+ defaultSort:{
+ prop:'id',
+ order:'descending'
+ },
height: 400,
selection: true,
columnBtn: false,
@@ -298,7 +301,6 @@
},
components: {
ttable,
- TableForm,
},
computed: {
...mapGetters(['permissions']),
@@ -307,11 +309,11 @@
this.loading = true
this.getData()
this.getParamType()
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
beforeUpdate() {
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
watch:{
@@ -481,7 +483,6 @@
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
@@ -516,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
@@ -576,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