Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-11 7369fd5866a78cde7ecbb4721d9decdfa181fd39

 src/views/user/selectuser.vue

@@ -32,6 +32,7 @@
        width="80%"
        @selection-change="handleSelectionChange"
        @row-dblclick="rowDblclick"
        @sort-change="changeSort"
      >
        <el-table-column type="selection" :reserve-selection="false" width="50" />
        <el-table-column v-if="show" prop="empId" label="员工Id" />
@@ -39,7 +40,7 @@
        <el-table-column prop="empName" label="姓名" />
        <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
        <el-table-column v-if="show" prop="deptId" label="部门Id" />
        <el-table-column prop="deptName" label="护卫点" width="180" />
        <el-table-column prop="allDeptName" label="护卫点" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
        <el-table-column v-if="show" prop="jobId" label="岗位Id" />
        <el-table-column prop="jobName" label="岗位" />
        <el-table-column prop="empTypeName" label="员工类别" />
@@ -156,6 +157,11 @@
    rowDblclick(row, column, event) {
      this.$refs.multipleTable.toggleRowSelection(row, true)
      this.sureChoose()
    },
    changeSort(val) {
      this.sort.field = val.prop
      this.sort.order = val.order
      this.search()
    }
  }
}