fix(bug修复): 【员工智搜】重新入职人员应该无离职日期，但实际显示

luoyb

2021-03-18 d321c2d0a3daacccb866dd57b2d41c84d48d89d2

 src/views/user/search.vue

@@ -268,27 +268,32 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 100%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
            <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="education" label="学历" width="100" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" width="80" :formatter="nativePlaceFormat" />
            <el-table-column show-overflow-tooltip prop="empType" label="员工类型" width="100" :formatter="empTypeFormat" />
            <el-table-column show-overflow-tooltip prop="telePhone" label="电话" width="120" />
            <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
            <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
              <template slot-scope="{row}">
                {{ transEmpStatus(row.empStatus) }}
              </template>
            </el-table-column>
            <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类型" width="100" />
            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" />
            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" />
            <el-table-column show-overflow-tooltip prop="dimissionType" label="入离职类型" width="120" :formatter="dimissionTypFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
              <template slot-scope="{row}">
                {{ transDimissionDate(row.dimissionDate) }}
              </template>
            </el-table-column>
          </el-table>
          <el-dialog title="导出员工" :visible.sync="dialogShowDcyg" width="40%" style="font-weight: 700;">
            <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">请勾选需要导出的字段</div>
@@ -317,7 +322,7 @@
                <tr>
                  <td>部门(护卫点)</td>
                  <td>
                    <el-checkbox label="deptName"><span /></el-checkbox>
                    <el-checkbox label="allDeptName"><span /></el-checkbox>
                  </td>
                  <td>所属岗位</td>
                  <td>
@@ -451,7 +456,7 @@
                  </td>
                  <td>工作证</td>
                  <td>
                    <el-checkbox label="empCardStatus"><span /></el-checkbox>
                    <el-checkbox label="empCardStatusName"><span /></el-checkbox>
                  </td>
                </tr>
                <tr>
@@ -466,6 +471,20 @@
                  <td>员工手册</td>
                  <td>
                    <el-checkbox label="handbookStatusName"><span /></el-checkbox>
                  </td>
                </tr>
                <tr>
                  <td>入职类型</td>
                  <td>
                    <el-checkbox label="entryTypeName"><span /></el-checkbox>
                  </td>
                  <td>离职类型</td>
                  <td>
                    <el-checkbox label="dimissionTypeName"><span /></el-checkbox>
                  </td>
                  <td>编号</td>
                  <td>
                    <el-checkbox label="empNumb"><span /></el-checkbox>
                  </td>
                </tr>
              </el-checkbox-group>
@@ -525,14 +544,15 @@
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            :data="workExperienceData"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="220" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" :formatter="sexFormat" />
            <el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" width="220" />
            <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" width="150" />
            <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="endDate" label="结束日期" width="150" />
            <el-table-column show-overflow-tooltip prop="jobContent" label="主要工作内容" />
          </el-table>
@@ -626,16 +646,17 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <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="身份证号码" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" />
            <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="100" />
            <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
            <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="100" :formatter="typeFormat" />
            <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="80" />
            <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
@@ -735,15 +756,16 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="160" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <!-- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="180" /> -->
            <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="180" />
            <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="180" />
            <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
            <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="120" :formatter="contractStatusFormat" />
            <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="180" />
@@ -829,13 +851,14 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
            <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="120" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
            <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
            <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="120" />
@@ -844,9 +867,9 @@
            <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" />

            <!-- <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="allDeptName" 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 show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="180" /> -->
          </el-table>
@@ -937,17 +960,18 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
            <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" />
            <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
            <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="100" :formatter="leaveTypeFormat" />
            <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="150" />
            <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="120" :formatter="leaveTypeFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
          </el-table>
@@ -984,7 +1008,6 @@
            </el-col>
          </el-row>
          <el-row>

            <el-col :span="6">辞职事由：
              <el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:262px" />
            </el-col>
@@ -1022,14 +1045,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
            <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="160" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" />
            <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -1104,14 +1128,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
            <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="180" />
            <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
            <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
@@ -1194,14 +1219,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="150" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
            <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="100" />
            <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" width="100" :formatter="insuranceGaersFormat" />
            <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
@@ -1308,14 +1334,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
            <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
            <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
@@ -1436,14 +1463,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <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="120" />
            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
            <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
            <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
@@ -1456,7 +1484,6 @@
            <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
            <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
            <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
            <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
            <el-table-column show-overflow-tooltip prop="hrDoDate" label="人事处理时间" width="120" />
            <el-table-column show-overflow-tooltip prop="settleStatus" label="状态" width="80" :formatter="settleStatusFormat" />
            <el-table-column show-overflow-tooltip prop="settleDate" label="结案时间" width="100" />
@@ -1551,20 +1578,21 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" width="100" :formatter="arbitrationTypeFormat" />
            <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
            <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
            <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
            <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
            <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" />
            <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
          </el-table></div>

        <div v-show="showArr[12].show">
@@ -1635,14 +1663,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
            <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="140" />
            <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" width="300" />
            <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" />

@@ -1716,13 +1745,14 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="index" label="序号" width="50" align="center" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="220" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="140" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
            <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
            <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
          </el-table>
        </div>
@@ -1801,17 +1831,19 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="selection" width="55" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <!-- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" /> -->
            <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
            <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
            <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" />
            <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" />
            <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
            <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="changeTypeName" label="调岗类型" />
            <!--            <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />-->
            <el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由描述" width="380" />
          </el-table>
        </div>
@@ -1905,14 +1937,15 @@
            :cell-style="{padding:'7px 0','text-align':'center'}"
            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
            style="width: 100%;height: 70%;"
            @sort-change="changeSort"
          >
            <el-table-column type="selection" width="55" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
            <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="200" />
            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="newJobName" label="岗位" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
            <el-table-column show-overflow-tooltip prop="selfLeaveDay" label="自离天数" />
            <el-table-column show-overflow-tooltip prop="reporter" label="报告人" />
            <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
@@ -1938,7 +1971,7 @@
  },
  data() {
    return {
      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
      cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
      dialogShowDcyg: false,
      isIndeterminate: false,
      checkedCities: [],
@@ -2404,6 +2437,14 @@
    arbitrationStatusFormat(row, column) {
      return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
    },
    dimissionTypFormat(row, column) {
      switch (row.empStatus) {
        case '0':
          return row.entryTypeName
        case '1':
          return row.dimissionTypeName
      }
    },
    handleCheckedCitiesChange(value) {
      const checkedCount = value.length
      this.checkAll = checkedCount === this.cityOptions.length
@@ -2436,7 +2477,6 @@
    resetSearch() {
      this.queryParams = {
        delFlag: 0,
        vague: '',
        sex: [],
        education: [],
        politics: [],
@@ -2444,11 +2484,13 @@
        archivesStatus: [],
        insuranceType: [],
        empStatus: [],
        empType: [],
        baseKey: '',
        empNumb: '',
        empName: '',
        certificateNumb: '',
        jobContent: ''
        jobContent: '',
        inOutType: []
      }
      this.search()
    },
@@ -2505,147 +2547,156 @@
          this.tableUrl = 'hr/empBaseInfo/zslist'
          this.tableDataName = 'basicInformationData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 1:
          this.tableUrl = 'hr/empWorkExperience/list'
          this.tableDataName = 'workExperienceData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 2:
          this.tableUrl = 'hr/empPhysicalExam/list'
          this.tableDataName = 'physicalExamData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 3:
          this.tableUrl = 'hr/empContractInfo/list'
          this.tableDataName = 'contractInfoData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 4:
          this.tableUrl = 'hr/empDimissionAttend/list'
          this.tableDataName = 'dimissionAttendData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 5:
          this.tableUrl = 'hr/empLeaveInfo/list'
          this.tableDataName = 'leaveInfoData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 6:
          this.tableUrl = 'hr/empResign/list'
          this.tableDataName = 'resignData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 7:
          this.tableUrl = 'hr/empUnemployment/list'
          this.tableDataName = 'unemploymentData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 8:
          this.tableUrl = 'hr/empInsurance/list'
          this.tableDataName = 'insuranceData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 9:
          this.tableUrl = 'hr/empAccidentCases/list'
          this.tableDataName = 'accidentCasesData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 10:
          this.tableUrl = 'hr/empOccupational/list'
          this.tableDataName = 'occupationalData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 11:
          this.tableUrl = 'hr/empLaborTrouble/list'
          this.tableDataName = 'laborTroubleData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 12:
          this.tableUrl = 'hr/empBadRecord/list'
          this.tableDataName = 'badRecordData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 13:
          this.tableUrl = 'hr/empRemarkInfo/list'
          this.tableDataName = 'remarkInfoData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 14:
          this.tableUrl = 'hr/empJobChange/list'
          this.tableDataName = 'jobChangeData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
        case 15:
          this.tableUrl = 'hr/empDimissionlog/list'
          this.tableDataName = 'dimissionLogData'
          this.queryParams.delFlag = 0
          this.search()
          this.resetSearch()
          break
      }
    },
    // dic列表转为数组
    dicListToArr(dicList) {
      var arr = []
      for (var i = 0; i < dicList.length; i++) {
        var dic = dicList[i]
        arr.push(dic.dicItemCode)
      }
      return arr
    },
    selectAllSex(val) {
      if (val) {
        this.queryParams.sex = ['1', '2']
        this.queryParams.sex = this.dicListToArr(this.sexOptions)
      } else {
        this.queryParams.sex = []
      }
    },
    selectAllEducation(val) {
      if (val) {
        this.queryParams.education = ['91', '81', '71', '61', '42', '41', '31', '21', '11', '10']
        this.queryParams.education = this.dicListToArr(this.educationOptions)
      } else {
        this.queryParams.education = []
      }
    },
    selectAllPolitics(val) {
      if (val) {
        this.queryParams.politics = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13']
        this.queryParams.politics = this.dicListToArr(this.statusOptions)
      } else {
        this.queryParams.politics = []
      }
    },
    selectAllAgeStr(val) {
      if (val) {
        this.queryParams.ageStr = ['18-29', '30-39', '40-49', '50-59', '60-69', '69-999']
        this.queryParams.ageStr = this.dicListToArr(this.ageStrOptions)
      } else {
        this.queryParams.ageStr = []
      }
    },
    selectAllArchivesStatus(val) {
      if (val) {
        this.queryParams.archivesStatus = ['0', '1']
        this.queryParams.archivesStatus = this.dicListToArr(this.archivesStatusOptions)
      } else {
        this.queryParams.archivesStatus = []
      }
    },
    selectAllInsuranceType(val) {
      if (val) {
        this.queryParams.insuranceType = ['1', '2', '3', '4', '5']
        this.queryParams.insuranceType = this.dicListToArr(this.insuranceTypeOptions)
      } else {
        this.queryParams.insuranceType = []
      }
    },
    selectAllEmpType(val) {
      if (val) {
        this.queryParams.insuranceType = ['1', '2']
        this.queryParams.empType = this.dicListToArr(this.empTypeOptions)
      } else {
        this.queryParams.insuranceType = []
        this.queryParams.empType = []
      }
    },
    selectAllEmpStatus(val) {
@@ -2657,7 +2708,7 @@
    },
    selectAllDimissionType(val) {
      if (val) {
        this.queryParams.inOutType = ['1', '2', '3', '4', '5', '6']
        this.queryParams.inOutType = this.dicListToArr(this.dimissionTypeOptions)
      } else {
        this.queryParams.inOutType = []
      }
@@ -2792,6 +2843,10 @@
          return '调休假'
      }
    },
    transDimissionDate(val) {
      var dimissDate = new Date(val)
      return dimissDate.getFullYear() === 1900 ? '' : val
    },
    transPhysicalExamType(physicalExamType) {
      switch (physicalExamType) {
        case '1':
@@ -2892,6 +2947,11 @@
        case 3:
          return '调动'
      }
    },
    changeSort(val) {
      this.sort.field = val.prop
      this.sort.order = val.order
      this.search()
    }
  }
}