Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

Fixiaobai

2023-12-13 4f57c68a590a1197b2be5715ee1f4a2fa7b62711

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 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: {}, // 记忆中列宽，默认列宽

 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) {