Merge remote-tracking branch 'origin/master'

yz

2021-03-07 0b0f1db860f93f5203ac9c8e4402d4ebec4027c8

 src/views/user/inemployees.vue

@@ -3,11 +3,11 @@
    <el-container>
      <el-header :height="headerHeight">
        <el-row style="margin-bottom: 10px;">
          <el-col :span="16">
          <el-col :span="15">
            <h3 class="bu-tian-jia-title">在职员工</h3>
          </el-col>
          <el-col :span="8" style="margin-top: 15px;">
            <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
          <el-col :span="9" style="margin-top: 15px;">
            <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:300px" />
            <span class="search-btn" @click="vagueSearch">查询</span>
            <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
          </el-col>
@@ -23,10 +23,10 @@
            <el-col :span="4">身份证号：
              <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
            </el-col>
            <el-col :span="3">部门（护卫点）：
            <el-col :span="4">部门（护卫点）：
              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
            </el-col>
            <el-col :span="8">入职日期：
            <el-col :span="7">入职日期：
              <el-date-picker
                v-model="queryParams.entryDateStr"
                size="small"
@@ -188,6 +188,7 @@
        <el-table
          ref="multipleTable"
          :data="tableData"
          :cell-style="{padding:'7px 0'}"
          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
          stripe
          style="width: 100%;color: #000;"
@@ -213,27 +214,28 @@
              >编辑</span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="deptName" label="部门（护卫点）" />
          <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
          <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="80" :formatter="sexFormat" />
          <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="80" />
          <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="100" :formatter="educationFormat" />
          <el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" :formatter="nativePlaceFormat" />
          <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" />
          <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
          <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
          <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="60" :formatter="educationFormat" />
          <el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
          <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="100">
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
            <template slot-scope="{row}">
              {{ transEmpStatus(row.empStatus) }}
            </template>
          </el-table-column>
          <el-table-column prop="entryTypeName" label="入职类型" />
          <el-table-column prop="entryTypeName" label="入职类型" width="80" />
        </el-table>
        <pagination
          v-show="total>0"
          style="text-align: right;width: 98%;"
          :total="total"
          :page.sync="pagination.num"
          :limit.sync="pagination.size"
@@ -1967,6 +1969,11 @@
}
</script>
<style lang="scss">
.zzyg-table {
  .el-table th, .el-table td {
    padding: 7px 0;
  }
}

.fj-checkbox {
  .el-checkbox__input.is-checked .el-checkbox__inner {