Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-19 d7557c1681b2da87df6509b3faf5dc4cefac1da2

 src/views/overview/OverviewListView.vue

@@ -11,12 +11,22 @@
    </div>
    <div class="list-view">
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          @selTableCol="selTableCol"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        <TableCommonView ref="tableListRef" :table-list="tableList" @selTableCol="selTableCol">
          <template slot="tableButton">
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <el-button @click="tableRowClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                <el-button
                  v-if="scope.row.status !== 4"
                  @click="tableRowClick(scope.row, '编辑')"
                  type="text"
                  size="small"
                  >编辑</el-button
                >
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -28,6 +38,7 @@
      :work-type="workType"
      :edit-common-config="editConfig"
      :add-name="this.$route.params.name"
      :display-edit="displayEdit"
    />
  </div>
</template>
@@ -61,7 +72,8 @@
      },
      workType: this.$route.params.workType,
      keyword: "",
      params: {}
      params: {},
      displayEdit: false
    }
  },
  created() {
@@ -222,11 +234,11 @@
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
    // 查看 编辑
    tableRowClick(row, val) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.title = val
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.infomation = { ...row }
    },