1.提交

loulijun2021

2023-02-15 557334431db09d85b7bb54e3f2a2226d46d323a5

1.提交

 src/views/bbgl/bzgz.vue

@@ -258,7 +258,7 @@
            <el-table
              ref="tableDataRef2"
              class="tableFixed"
              :data="tableData"
              :data="tableData2"
              :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
              border
              :summary-method="getSummaries"
@@ -508,6 +508,7 @@
      groupArr: [],
      total: 10,
      tableData: [],
      tableData2: [],
      dialogVisible: false,
      tagArr: [], //
      dialogForm: {
@@ -618,7 +619,13 @@

      }
      const res = await GroupSalaryReportSearch(data)
      this.tableData = res.data
      if (this.form.compute === 'last') {
        this.tableData = res.data
      }
      if (this.form.compute === 'contin') {
        this.tableData2 = res.data
      }

      this.total = res.count

      return { code: res.code }

 src/views/bbgl/rygz.vue

@@ -239,7 +239,7 @@
            <el-table
              ref="tableDataRef"
              class="tableFixed"
              :data="tableData"
              :data="tableData2"
              :height="isExpandForm?(tableHeight-70):(tableHeight-30)+'px'"
              border
              :summary-method="getSummaries"
@@ -468,6 +468,7 @@
      groupArr: [],
      total: 10,
      tableData: [],
      tableData2: [],
      dialogVisible: false,
      tagArr: [], //
      dialogForm: {
@@ -581,7 +582,12 @@
      }

      const res = await PeopleSalaryReportSearch(data)
      this.tableData = res.data
      if (this.form.compute === 'last') {
        this.tableData = res.data
      }
      if (this.form.compute === 'contin') {
        this.tableData2 = res.data
      }
      this.total = res.count

      return { code: res.code }