Merge remote-tracking branch 'origin/master'

yz

2021-03-05 ded74de21871a897e6a9f8f71b6225a70eec868e

 src/views/user/outemployess.vue

@@ -174,7 +174,7 @@
          </form>
        </div>
      </el-header>
      <el-main style="height: 85%;">
      <el-main style="height: 85vh;">
        <el-row style="margin: 10px 0 10px 0;">
          <el-col :span="24">
            <el-button type="primary" @click="delEmp">删除员工</el-button>
@@ -182,7 +182,13 @@
            <el-button type="danger" class="hr-but-all" @click="doDcbb">导出报表</el-button>
          </el-col>
        </el-row>
        <el-table ref="multipleTable" :data="tableData" style="width: 100%;">
        <el-table
          ref="multipleTable"
          :data="tableData"
          stripe
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
          style="width: 100%;"
        >
          <el-table-column type="selection" width="55" />
          <el-table-column label="操作" width="120">
            <template slot-scope="scope">
@@ -1045,7 +1051,6 @@
  },
  methods: {
    educationFormat(row, column) {
      debugger
      return this.selectDictLabel(this.educationOptions, row.education)
    },
    sexFormat(row, column) {
@@ -1418,6 +1423,8 @@
  color: #D9001B;
}

</style>
<style>
.search-btn {
  display: inline-block;
  width: 3.64vw;
@@ -1445,4 +1452,7 @@
  cursor: pointer;
  vertical-align: middle;
}
.el-dialog.is-fullscreen {
  overflow: hidden;
}
</style>