Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

 src/views/dashboard/sbUser.vue

@@ -2,9 +2,11 @@
  <el-dialog
    :title="title"
    top="50px"
    width="80%"
    :close-on-click-modal="false"
    :close-on-press-escape="false"
    :visible.sync="isVisible"
    :before-close="beforeClose"
  >
    <div class="app-container">
      <div class="filter-container" style="margin-left: -340px;">
@@ -20,21 +22,25 @@
        ref="multipleTable"
        :data="list"
        row-key="prop1"
        width="50%"
        stripe
        border
        :cell-style="{padding:'7px 0','text-align':'center'}"
        :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
        style="width: 100%;"
      >
        <el-table-column type="selection" :reserve-selection="false" width="55" />
        <el-table-column prop="empNumb" label="员工编号" width="180" />
        <el-table-column prop="deptName" label="护卫点" width="180" />
        <el-table-column prop="jobName" label="岗位名称" width="180" />
        <el-table-column prop="empName" label="姓名" width="180" />
        <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
        <el-table-column prop="applayDate" label="社保申请日期" width="180" />
        <el-table-column prop="proposer" label="申请人" width="180" />
        <el-table-column prop="insuranceGaers" label="社保档位" width="180" />
        <el-table-column prop="reportStatus " label="是否已报告" width="180" />
        <el-table-column prop="applayStatus" label="状态" width="180" />
        <el-table-column prop="auditor" label="审核人" width="180" />
        <el-table-column prop="remark" label="备注" width="280" />
        <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
        <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
        <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
        <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
        <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
        <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" />
        <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" min-width="120" />
        <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
        <el-table-column show-overflow-tooltip prop="insuranceGaers" :formatter="insuranceGaersFormat" label="社保档位" width="100" />
        <el-table-column show-overflow-tooltip prop="reportStatus" :formatter="reportStatusFormat" label="是否已报告" width="100" />
        <el-table-column show-overflow-tooltip prop="applayStatus" :formatter="applayStatusFormat" label="状态" width="80" />
        <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="80" />
        <el-table-column show-overflow-tooltip prop="remark" label="备注" />
      </el-table>
      <pagination
        v-show="total>0"
@@ -92,7 +98,10 @@
      defaultProps: {
        children: 'children',
        label: 'label'
      }
      },
      insuranceGaersOptions: [],
      applayStatusOptions: [],
      reportStatusOptions: []
    }
  },
  computed: {
@@ -102,7 +111,30 @@
      }
    }
  },
  mounted() {
    this.getDicts('insuranceGaers').then(response => {
      this.insuranceGaersOptions = response.data
    })
    this.getDicts('applayStatus').then(response => {
      this.applayStatusOptions = response.data
    })
    this.getDicts('reportStatus').then(response => {
      this.reportStatusOptions = response.data
    })
  },
  methods: {
    insuranceGaersFormat(row, column) {
      return this.selectDictLabel(this.insuranceGaersOptions, row.insuranceGaers)
    },
    reportStatusFormat(row, column) {
      return this.selectDictLabel(this.reportStatusOptions, row.reportStatus)
    },
    applayStatusFormat(row, column) {
      return this.selectDictLabel(this.applayStatusOptions, row.applayStatus)
    },
    beforeClose(done) {
      this.$emit('cancleChooseUser')
    },
    search() {
      this.fetch({
        ...this.queryParams