haoxuan
2024-04-07 9284dbc97513286ac3f16782a5088cc838682897
Merge branch 'master' of http://192.168.5.5:10010/r/silk/silk-web
2个文件已修改
12 ■■■■ 已修改文件
src/components/makepager/TableCommonView.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportManage/payableSalaryReport/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/makepager/TableCommonView.vue
@@ -20,7 +20,13 @@
      :row-class-name="tableRowClassName"
    >
      <el-table-column v-if="selectBox" type="selection" width="40" :selectable="selectable"> </el-table-column>
      <el-table-column v-if="tableList.selectIndex" type="index" label="序号" width="50"></el-table-column>
      <el-table-column
        v-if="tableList.selectIndex"
        type="index"
        label="序号"
        width="50"
        :fixed="tableList.isFixed"
      ></el-table-column>
      <el-table-column
        v-for="(item, i) in tableList.tableColumn"
        :key="i"
@@ -30,6 +36,7 @@
        :min-width="item.min"
        show-overflow-tooltip
        :sortable="item.sortable"
        :fixed="item.fixed"
        v-if="item.isShowColumn"
      >
        <template slot-scope="scope">
@@ -158,6 +165,7 @@
      default: () => {
        return {
          selectIndex: true,
          isFixed: false,
          tableInfomation: [], // 接口返回数据
          showcol: [],
          allcol: [],
src/views/reportManage/payableSalaryReport/index.vue
@@ -93,7 +93,7 @@
    setTable() {
      this.tableList = {
        selectIndex: true,
        fixed: true,
        isFixed: true,
        tableInfomation: [{ name: "张三" }, { name: "lisi" }, { name: "王五" }],
        allcol: [],
        showcol: this.showCol,