Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-10 06963d397d023ba076508808c8a0ec55da85067e

 src/views/febs/system/job/Index.vue

@@ -1,17 +1,21 @@
<template>
  <div class="app-container">
    <div class="filter-container">
      <el-input v-model="queryParams.positionName" placeholder="岗位名称" class="filter-item search-item" />
      <el-button class="filter-item" type="primary" @click="search">
      <el-input v-model="queryParams.positionName" placeholder="岗位" class="filter-item search-item" />
      <el-button class="hr-but-all" type="primary" @click="search">
        {{ $t('table.search') }}
      </el-button>
      <el-button class="filter-item" type="success" @click="reset">
      <el-button class="hr-but-all" type="success" @click="reset">
        {{ $t('table.reset') }}
      </el-button>
      <el-button v-has-permission="['position:add']" class="filter-item" type="primary" @click.native="add">
      <el-button v-has-permission="['position:add']" class="hr-but-all" type="primary" @click.native="add">
        {{ $t('table.add') }}
      </el-button>
      <el-button v-has-permission="['position:delete']" class="el-icon-delete table-operation" style="color: #f50;" @click.native="batchDelete">
      <!--      <el-button v-has-permission="['position:delete']" class="el-icon-delete table-operation" style="color: #f50;" @click.native="batchDelete">-->
      <!--        {{ $t('table.delete') }}-->
      <!--      </el-button>-->

      <el-button v-has-permission="['position:delete']" type="primary" @click.native="batchDelete">
        {{ $t('table.delete') }}
      </el-button>
    </div>
@@ -28,7 +32,7 @@
    >
      <el-table-column type="selection" align="center" width="40px" />
      <el-table-column v-if="fsnumShow" label="" prop="positionId" :show-overflow-tooltip="false" align="center" />
      <el-table-column label="岗位名称" prop="positionName" :show-overflow-tooltip="true" align="center" min-width="100px" />
      <el-table-column label="岗位" prop="positionName" :show-overflow-tooltip="true" align="center" min-width="100px" />
      <el-table-column label="岗位编码" prop="positionCode" :show-overflow-tooltip="true" align="center" />
      <el-table-column label="创建时间" prop="createTime" :show-overflow-tooltip="true" align="center" min-width="170px" />
      <el-table-column label="创建人" prop="creator" :show-overflow-tooltip="true" align="center" min-width="160px" />
@@ -84,7 +88,7 @@
      queryParams: {},
      selection: [],
      pagination: {
        size: 10,
        size: 15,
        num: 1
      }
    }
@@ -136,6 +140,7 @@
        cancelButtonText: this.$t('common.cancel'),
        type: 'warning'
      }).then(() => {
        debugger
        const positionId = []
        this.selection.forEach((c) => {
          positionId.push(c.positionId)
@@ -146,6 +151,7 @@
      })
    },
    singleDelete(row) {
      debugger
      this.$refs.table.toggleRowSelection(row, true)
      this.delete(row.positionId)
    },