From 0a2bfc15af5a729c1d001b3320a1c4cc70786664 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期一, 17 五月 2021 22:40:27 +0800
Subject: [PATCH] 智搜-工作经历性别不显示修复,离职记录修改为部门全称,合同增加显示备注字段

---
 src/views/user/search.vue | 2067 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 1,481 insertions(+), 586 deletions(-)

diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index b9288d6..1b03cdd 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-container>
-      <el-aside width="200px">
-        <el-timeline>
+      <el-aside width="175px">
+        <el-timeline style="padding-left: 15px">
           <el-timeline-item @click.native="isShow(showArr[0].show, 0)">
             <span :class="thisShowIndex===0?'selectedTimeline':''">基本信息</span>
           </el-timeline-item>
@@ -22,7 +22,7 @@
             <span :class="thisShowIndex===15?'selectedTimeline':''">入离职记录</span>
           </el-timeline-item>
           <el-timeline-item @click.native="isShow(showArr[4].show, 4)">
-            <span :class="thisShowIndex===4?'selectedTimeline':''">考勤情况</span>
+            <span :class="thisShowIndex===4?'selectedTimeline':''">离职当月考勤</span>
           </el-timeline-item>
           <el-timeline-item @click.native="isShow(showArr[5].show, 5)">
             <span :class="thisShowIndex===5?'selectedTimeline':''">请假记录</span>
@@ -59,26 +59,29 @@
               <br>
             </el-col>
             <el-col :span="7">
-              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
-              <el-button type="primary" @click="vagueSearch">查询</el-button>
-              <el-button type="danger" @click="advancedQueryShowMethods">高级查询</el-button>
+              <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:200px" />
+              <span class="search-btn" @click="vagueSearch">查询</span>
+              <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
             </el-col>
           </el-row>
           <div v-show="advancedQueryShow">
             <el-row style="margin-bottom: 10px;">
-              <el-col :span="3">员工编号:
-                <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+              <el-col :span="4">编号:
+                <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
               </el-col>
-              <el-col :span="3">姓名:
+              <el-col :span="4">姓名:
                 <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
               </el-col>
               <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="9">入职日期:
+
+            </el-row>
+            <el-row style="margin-bottom: 10px;">
+              <el-col :span="8">入职日期:
                 <el-date-picker
                   v-model="queryParams.entryDateStr"
                   size="small"
@@ -90,12 +93,10 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   :picker-options="pickerOptions"
-                  style="width: 400px;"
+                  style="width: 350px;"
                 />
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="9">离职日期:
+              <el-col :span="8">离职日期:
                 <el-date-picker
                   v-model="queryParams.dimissionDateStr"
                   size="small"
@@ -107,11 +108,11 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   :picker-options="pickerOptions"
-                  style="width: 400px;"
+                  style="width: 350px;"
                 />
               </el-col>
               <el-col :span="8">
-                <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
+                <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
                 <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
               </el-col>
             </el-row>
@@ -121,8 +122,13 @@
                 <td class="td-group">
                   <el-checkbox-group v-model="queryParams.sex" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllSex">全部</el-checkbox>
-                    <el-checkbox label="1">男性</el-checkbox>
-                    <el-checkbox label="2">女性</el-checkbox>
+                    <el-checkbox
+                      v-for="data in sexOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
@@ -131,16 +137,13 @@
                 <td class="td-group">
                   <el-checkbox-group v-model="queryParams.education" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllEducation">全部</el-checkbox>
-                    <el-checkbox label="91">无学历</el-checkbox>
-                    <el-checkbox label="81">小学</el-checkbox>
-                    <el-checkbox label="71">初中</el-checkbox>
-                    <el-checkbox label="61">高中</el-checkbox>
-                    <el-checkbox label="42">中技</el-checkbox>
-                    <el-checkbox label="41">中专</el-checkbox>
-                    <el-checkbox label="31">大学专科</el-checkbox>
-                    <el-checkbox label="21">大学本科</el-checkbox>
-                    <el-checkbox label="11">硕士</el-checkbox>
-                    <el-checkbox label="10">博士</el-checkbox>
+                    <el-checkbox
+                      v-for="data in educationOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
@@ -149,19 +152,13 @@
                 <td class="td-group">
                   <el-checkbox-group v-model="queryParams.politics" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllPolitics">全部</el-checkbox>
-                    <el-checkbox label="01">党员</el-checkbox>
-                    <el-checkbox label="02">预备</el-checkbox>
-                    <el-checkbox label="03">共青</el-checkbox>
-                    <el-checkbox label="04">民革</el-checkbox>
-                    <el-checkbox label="05">民盟</el-checkbox>
-                    <el-checkbox label="06">民建</el-checkbox>
-                    <el-checkbox label="07">民进</el-checkbox>
-                    <el-checkbox label="08">农工</el-checkbox>
-                    <el-checkbox label="09">致公</el-checkbox>
-                    <el-checkbox label="10">九三</el-checkbox>
-                    <el-checkbox label="11">台盟</el-checkbox>
-                    <el-checkbox label="12">民主</el-checkbox>
-                    <el-checkbox label="13">群众</el-checkbox>
+                    <el-checkbox
+                      v-for="data in statusOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
@@ -170,12 +167,13 @@
                 <td class="td-group">
                   <el-checkbox-group v-model="queryParams.ageStr" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllAgeStr">全部</el-checkbox>
-                    <el-checkbox label="18-29">18-29</el-checkbox>
-                    <el-checkbox label="30-39">30-39</el-checkbox>
-                    <el-checkbox label="40-49">40-49</el-checkbox>
-                    <el-checkbox label="50-59">50-59</el-checkbox>
-                    <el-checkbox label="60-69">60-69</el-checkbox>
-                    <el-checkbox label="69-999">69及以上</el-checkbox>
+                    <el-checkbox
+                      v-for="data in ageStrOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
@@ -184,21 +182,28 @@
                 <td class="td-group">
                   <el-checkbox-group v-model="queryParams.archivesStatus" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllArchivesStatus">全部</el-checkbox>
-                    <el-checkbox label="0">已移交</el-checkbox>
-                    <el-checkbox label="1">未移交</el-checkbox>
+                    <el-checkbox
+                      v-for="data in archivesStatusOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
               <tr>
-                <td class="td">保险类型:</td>
+                <td class="td">社保档位:</td>
                 <td class="td-group">
                   <el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox>
-                    <el-checkbox label="1">深户(五险一档)</el-checkbox>
-                    <el-checkbox label="2">非深户(五险一档)</el-checkbox>
-                    <el-checkbox label="3">非深户(五险二档)</el-checkbox>
-                    <el-checkbox label="4">非深户(五险三档)</el-checkbox>
-                    <el-checkbox label="5">非深户(四险三档)</el-checkbox>
+                    <el-checkbox
+                      v-for="data in insuranceTypeOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
@@ -208,53 +213,311 @@
                   <el-checkbox-group v-model="queryParams.empStatus" class="fj-checkbox">
                     <el-checkbox label="" @change="selectAllEmpStatus">全部</el-checkbox>
                     <el-checkbox label="0">在职</el-checkbox>
-                    <el-checkbox label="1">正常离职</el-checkbox>
-                    <el-checkbox label="2">自动离职</el-checkbox>
-                    <el-checkbox label="3">公司辞退</el-checkbox>
+                    <el-checkbox label="1">离职</el-checkbox>
+                    <el-checkbox label="2">退休</el-checkbox>
+                  </el-checkbox-group>
+                </td>
+              </tr>
+              <tr>
+                <td class="td">员工类型:</td>
+                <td class="td-group">
+                  <el-checkbox-group v-model="queryParams.empType" class="fj-checkbox">
+                    <el-checkbox label="" @change="selectAllEmpType">全部</el-checkbox>
+                    <el-checkbox
+                      v-for="data in empTypeOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </td>
+              </tr>
+              <tr>
+                <td class="td">入离职类型:</td>
+                <td class="td-group">
+                  <el-checkbox-group v-model="queryParams.inOutType" class="fj-checkbox">
+                    <el-checkbox label="" @change="selectAllDimissionType">全部</el-checkbox>
+                    <el-checkbox
+                      v-for="data in dimissionTypeOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </td>
+              </tr>
+              <tr>
+                <td class="td">相关证件:</td>
+                <td class="td-group">
+                  <el-checkbox-group v-model="queryParams.certificateList" class="fj-checkbox">
+                    <el-checkbox label="" @change="selectAllCertificateList">全部</el-checkbox>
+                    <el-checkbox
+                      v-for="data in certificateListOptions"
+                      :key="data.dicItemName"
+                      :label="data.dicItemCode"
+                    >
+                      {{ data.dicItemName }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </td>
               </tr>
             </table>
           </div>
-          <el-row style="margin-bottom: 10px;">
-            <el-col :span="22">
-              <p />
+          <el-row>
+            <el-col :span="21" style="line-height: 50px;">
+              已为您搜索出<span style="color:#ff0000">{{ total }}</span>条符合条件的记录
             </el-col>
-            <el-col :span="2">
-              <el-button size="mini" class="hr-but" type="success" @click.native="exportExcel">
-                {{ $t('table.export') }}
+            <el-col :span="3" style="text-align: right;padding-right: 10px">
+              <el-button class="hr-but-all" type="success" @click.native="showDcyg(0)">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="empNumb" label="员工编号" />
-            <el-table-column prop="deptName" label="护卫点" />
-            <el-table-column prop="jobName" label="岗位" />
-            <el-table-column prop="empName" label="姓名" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="sexName" label="性别" width="50" />
-            <el-table-column prop="age" label="年龄" width="50" />
-            <el-table-column prop="educationName" label="学历" />
-            <el-table-column prop="nativePlaceName" label="籍贯" />
-            <el-table-column prop="telePhone" label="电话" />
-            <el-table-column prop="empStatus" label="员工状态">
+          <el-table
+            ref="empBaseInfoTable"
+            :data="basicInformationData"
+            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%;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="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" 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="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="120" sortable="custom" :sort-orders="['ascending', 'descending']">
               <template slot-scope="{row}">
                 {{ transEmpStatus(row.empStatus) }}
               </template>
             </el-table-column>
-            <el-table-column prop="entryDate" label="入职日期" />
-            <el-table-column prop="dimissionDate" label="离职日期" />
+            <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>
+            <table id="dcygTable" width="100%">
+              <tr>
+                <td colspan="6" style="text-align: left;">
+                  <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange" />
+                  全部字段
+                </td>
+              </tr>
+              <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+                <tr>
+                  <td>档案号</td>
+                  <td>
+                    <el-checkbox label="archivesNumb"><span /></el-checkbox>
+                  </td>
+                  <td>姓名</td>
+                  <td>
+                    <el-checkbox label="empName"><span /></el-checkbox>
+                  </td>
+                  <td>性别</td>
+                  <td>
+                    <el-checkbox label="sexName"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>部门(护卫点)</td>
+                  <td>
+                    <el-checkbox label="allDeptName"><span /></el-checkbox>
+                  </td>
+                  <td>所属岗位</td>
+                  <td>
+                    <el-checkbox label="jobName"><span /></el-checkbox>
+                  </td>
+                  <td>员工类别</td>
+                  <td>
+                    <el-checkbox label="empTypeName"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>民族</td>
+                  <td>
+                    <el-checkbox label="nationName"><span /></el-checkbox>
+                  </td>
+                  <td>身份证号码</td>
+                  <td>
+                    <el-checkbox label="certificateNumb"><span /></el-checkbox>
+                  </td>
+                  <td>年龄</td>
+                  <td>
+                    <el-checkbox label="age"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>婚姻状况</td>
+                  <td>
+                    <el-checkbox label="marriageName"><span /></el-checkbox>
+                  </td>
+                  <td>身份证有效期</td>
+                  <td>
+                    <el-checkbox label="certificateValidity"><span /></el-checkbox>
+                  </td>
+                  <td>身高</td>
+                  <td>
+                    <el-checkbox label="stature"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>政治面貌</td>
+                  <td>
+                    <el-checkbox label="politicsName"><span /></el-checkbox>
+                  </td>
+                  <td>出生日期</td>
+                  <td>
+                    <el-checkbox label="birthdate"><span /></el-checkbox>
+                  </td>
+                  <td>最高学历</td>
+                  <td>
+                    <el-checkbox label="educationName"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>籍贯</td>
+                  <td>
+                    <el-checkbox label="nativePlaceName"><span /></el-checkbox>
+                  </td>
+                  <td>户籍地址</td>
+                  <td>
+                    <el-checkbox label="censusAddress"><span /></el-checkbox>
+                  </td>
+                  <td>现住址</td>
+                  <td>
+                    <el-checkbox label="currentAddress"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>保安员证号</td>
+                  <td>
+                    <el-checkbox label="guardNumb"><span /></el-checkbox>
+                  </td>
+                  <td>保安员回执</td>
+                  <td>
+                    <el-checkbox label="returnReceipt"><span /></el-checkbox>
+                  </td>
+                  <td>档案情况</td>
+                  <td>
+                    <el-checkbox label="archivesStatusName"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>银行名称</td>
+                  <td>
+                    <el-checkbox label="bankName"><span /></el-checkbox>
+                  </td>
+                  <td>银行账号</td>
+                  <td>
+                    <el-checkbox label="bankNumb"><span /></el-checkbox>
+                  </td>
+                  <td>电话号码</td>
+                  <td>
+                    <el-checkbox label="telePhone"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>家庭成员及关系</td>
+                  <td>
+                    <el-checkbox label="family"><span /></el-checkbox>
+                  </td>
+                  <td>员工状态</td>
+                  <td>
+                    <el-checkbox label="empStatusName"><span /></el-checkbox>
+                  </td>
+                  <td>离职日期</td>
+                  <td>
+                    <el-checkbox label="dimissionDate"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>入职日期</td>
+                  <td>
+                    <el-checkbox label="entryDate"><span /></el-checkbox>
+                  </td>
+                  <td>社保档位</td>
+                  <td>
+                    <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
+                  </td>
+                  <td>社保电脑号</td>
+                  <td>
+                    <el-checkbox label="socialNumb"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>招聘介绍人</td>
+                  <td>
+                    <el-checkbox label="introducer"><span /></el-checkbox>
+                  </td>
+                  <td>入司工龄</td>
+                  <td>
+                    <el-checkbox label="seniority"><span /></el-checkbox>
+                  </td>
+                  <td>工作证</td>
+                  <td>
+                    <el-checkbox label="empCardStatusName"><span /></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <td>相关证件</td>
+                  <td>
+                    <el-checkbox label="certificateListName"><span /></el-checkbox>
+                  </td>
+                  <td>紧急联系电话</td>
+                  <td>
+                    <el-checkbox label="urgencyPhone"><span /></el-checkbox>
+                  </td>
+                  <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>
+            </table>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="showDcyg(1)">取 消</el-button>
+              <el-button type="primary" @click="showDcyg(2)">确 定</el-button>
+            </div>
+          </el-dialog>
         </div>
 
         <div v-show="showArr[1].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
-              <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
+              <el-input v-model="queryParams.empName" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="4">身份证号:
               <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
@@ -262,8 +525,19 @@
             <el-col :span="5">主要工作内容:
               <el-input v-model="queryParams.jobContent" size="small" maxlength="18" style="width:140px" />
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="3">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
@@ -272,28 +546,37 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="gzjlexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="gzjlexportExcel">
+                导出Excel
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="workExperienceTable" :data="workExperienceData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="empNumb" label="员工编号" width="100" />
-            <el-table-column prop="empName" label="员工姓名" width="100" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="170" />
-            <el-table-column prop="sex" label="性别" width="50" />
-            <el-table-column prop="workUnit" label="工作单位" width="220" />
-            <el-table-column prop="beginDate" label="开始日期" width="100" />
-            <el-table-column prop="endDate" label="结束日期" width="100" />
-            <el-table-column prop="jobContent" label="主要工作内容" />
+          <el-table
+            ref="workExperienceTable"
+            stripe
+            border
+            :cell-style="{padding:'7px 0','text-align':'center'}"
+            :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" 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" />
+            <el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" width="220" />
+            <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>
         </div>
 
         <div v-show="showArr[2].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -301,7 +584,7 @@
             <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="9">体检日期:
@@ -319,67 +602,90 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="4">体检类型:
-              <el-select v-model="queryParams.physicalExamType" style="width:100px">
-                <el-option value="1" label="入职体检" />
-                <el-option value="2" label="员工体检" />
+              <el-select v-model="queryParams.physicalExamType" style="width:140px">
+                <el-option
+                  v-for="dict in physicalExamTypeOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
             <el-col :span="4">心电图:
-              <el-select v-model="queryParams.ecg" style="width:100px">
-                <el-option label="正常" value="1" />
-                <el-option label="异常" value="0" />
+              <el-select v-model="queryParams.ecg" style="width:140px">
+                <el-option
+                  v-for="dict in ecgOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
-            <el-col :span="3">体检结论:
-              <el-input v-model="queryParams.conclusion" size="small" maxlength="20" style="width:100px" />
+            <el-col :span="4">体检结论:
+              <el-input v-model="queryParams.conclusion" size="small" maxlength="20" style="width:120px" />
+            </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
             </el-col>
             <el-col :span="3">
               <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="tjexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="tjexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="physicalExamTable" :data="physicalExamData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" />
-            <el-table-column prop="empNumb" label="员工编号" />
-            <el-table-column prop="empName" label="员工姓名" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="sex" label="性别" width="50" />
-            <el-table-column prop="hospital" label="体检医院" />
-            <el-table-column prop="physicalExamDate" label="体检日期" />
-            <el-table-column prop="physicalExamType" label="体检类型">
-              <template slot-scope="{row}">
-                {{ transPhysicalExamType(row.physicalExamType) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="bloodPressure" label="血压" />
-            <el-table-column prop="transaminase" label="转氨酶" />
-            <el-table-column prop="ecg" label="心电图">
-              <template slot-scope="{row}">
-                {{ transEcg(row.ecg) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="conclusion" label="体检结论" />
-            <el-table-column prop="reviewRecord" label="复查记录" />
-            <el-table-column prop="remark" label="备注" />
+          <el-table
+            ref="physicalExamTable"
+            :data="physicalExamData"
+            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%;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" 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" 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="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" />
+            <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="80" :formatter="ecgNameFormat" />
+            <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" />
+            <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" />
+            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
           </el-table>
         </div>
 
         <div v-show="showArr[3].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -387,7 +693,7 @@
             <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="9">合同签订日期:
@@ -406,7 +712,7 @@
               />
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="9">合同结束日期:
               <el-date-picker
                 v-model="queryParams.endDateStr"
@@ -423,7 +729,7 @@
               />
             </el-col>
             <el-col :span="9">合同状态:
-              <el-select v-model="queryParams.contractStatus" style="width:100px">
+              <el-select v-model="queryParams.contractStatus" style="width:200px">
                 <el-option value="" label="全部" />
                 <el-option :value="1" label="有效" />
                 <el-option :value="2" label="到期" />
@@ -431,44 +737,61 @@
                 <el-option :value="4" label="存档" />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="htexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="htexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="contractInfoTable" :data="contractInfoData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <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="signingDate" label="合同签订日期" width="180" />
-            <el-table-column prop="endDate" label="合同结束日期" width="180" />
-            <el-table-column prop="contractPeriod" label="合同期限(年)" width="180" />
-            <el-table-column prop="contractStatus" label="合同状态" width="180">
-              <template slot-scope="{row}">
-                {{ transContractStatus(row.contractStatus,row.endDate) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="transactor" label="合同办理人" width="180" />
+          <el-table
+            ref="contractInfoTable"
+            :data="contractInfoData"
+            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%;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" 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="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" />
+            <el-table-column show-overflow-tooltip prop="remark" label="备注" width="180" />
           </el-table>
         </div>
 
         <div v-show="showArr[4].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -476,17 +799,19 @@
             <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="2.5">考勤年月
-              <el-select v-model="queryParams.attendYear" style="width:100px">
-                <el-option label="2021" value="2021" />
-                <el-option label="2020" value="2020" />
-                <el-option label="2019" value="2019" />
-                <el-option label="2018" value="2018" />
+            <el-col :span="8">考勤年月
+              <el-select v-model="queryParams.attendYear" style="width:120px;margin-right: 10px">
+                <el-option
+                  v-for="dict in attendYearOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
-              <el-select v-model="queryParams.attendMonth" style="width:100px">
+              <el-select v-model="queryParams.attendMonth" style="width:120px">
                 <el-option label="12" value="12" />
                 <el-option label="11" value="11" />
                 <el-option label="10" value="10" />
@@ -501,48 +826,75 @@
                 <el-option label="1" value="1" />
               </el-select>
             </el-col>
+
+          </el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="5">有无代扣款项:
               <el-input v-model="queryParams.deductStr" size="small" maxlength="10" style="width:110px" />
             </el-col>
-          </el-row>
-          <el-row>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
+
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="kqexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="kqexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="dimissionAttendTable" :data="dimissionAttendData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <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="attendMonth" label="离职考勤月份" width="180" />
-            <el-table-column prop="attendDays" label="出勤天数" width="180" />
-            <el-table-column prop="overtimeDay" label="加班(天)" width="180" />
-            <el-table-column prop="overtimeHour" label="加班(小时)" width="180" />
-            <el-table-column prop="deduct" label="有无代扣款项" width="180" />
-            <el-table-column prop="leaveDay" label="请假(天)" width="180" />
-            <el-table-column prop="absenteeism" label="旷工(天)" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
+          <el-table
+            ref="dimissionAttendTable"
+            :data="dimissionAttendData"
+            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%;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" 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="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" />
+            <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="120" />
+            <el-table-column show-overflow-tooltip prop="leaveDay" label="请假(天)" width="100" />
+            <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工(天)" width="100" />
+            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+
+            <!-- <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>
         </div>
 
         <div v-show="showArr[5].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -550,9 +902,11 @@
             <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-row>
+          <el-row>
             <el-col :span="8">请假日期:
               <el-date-picker
                 v-model="queryParams.leaveDateStr"
@@ -571,50 +925,78 @@
             <el-col :span="4">请假类型:
               <el-select v-model="queryParams.leaveType" style="width:100px">
                 <el-option value="" label="全部" />
-                <el-option value="1" label="事假" />
-                <el-option value="2" label="病假" />
-                <el-option value="3" label="调休假" />
+                <el-option value="05" label="事假" />
+                <el-option value="06" label="病假" />
+                <el-option value="07" label="公假" />
+                <el-option value="08" label="婚假" />
+                <el-option value="09" label="孕假" />
+                <el-option value="10" label="产假" />
+                <el-option value="11" label="陪产假" />
+                <el-option value="12" label="探亲假" />
+                <el-option value="13" label="探配偶假" />
+                <el-option value="14" label="丧假" />
+                <el-option value="15" label="工伤假" />
+                <el-option value="16" label="节育假" />
+                <el-option value="17" label="年休假" />
+                <el-option value="18" label="其它假" />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="qjexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="qjexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;height: 70%;">
+          <el-table
+            v-show="showArr[5].show"
+            ref="leaveInfoTable"
+            :data="leaveInfoData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <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="beginTime" label="开始时间" width="180" />
-            <el-table-column prop="endTime" label="结束时间" width="180" />
-            <el-table-column prop="leaveDay" label="请假天数" width="180" />
-            <el-table-column prop="leaveType" label="请假类型" width="180">
-              <template slot-scope="{row}">
-                {{ transLeaveType(row.leaveType) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="returnDate" label="到岗时间" width="180" />
-            <el-table-column prop="reporter" label="报备人" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
+            <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="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="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>
         </div>
 
         <div v-show="showArr[6].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -622,7 +1004,7 @@
             <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="9">辞职申请日期:
@@ -640,52 +1022,76 @@
                 style="width: 400px;"
               />
             </el-col>
-            <el-col :span="4">辞职事由:
-              <el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:140px" />
+          </el-row>
+          <el-row>
+            <el-col :span="6">辞职事由:
+              <el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:262px" />
+            </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
             </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="czexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="czexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位名" width="180" />
-            <el-table-column prop="empNumb" 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="reason" label="辞职事由" width="180" />
-            <el-table-column prop="reporter" label="汇报人" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
+          <el-table
+            ref="resignTable"
+            :data="resignData"
+            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%;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" 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="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="备注" />
           </el-table>
         </div>
 
         <div v-show="showArr[7].show">
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="4">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:140px" />
+            </el-col>
+            <el-col :span="4">姓名:
+              <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:140px" />
+            </el-col>
+            <el-col :span="5">身份证号:
+              <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:160px" />
+            </el-col>
+            <el-col :span="5">(部门)护卫点:
+              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:160px" />
+            </el-col>
+          </el-row>
           <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
-            </el-col>
-            <el-col :span="3">姓名:
-              <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
-            </el-col>
-            <el-col :span="4">身份证号:
-              <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
-            </el-col>
-            <el-col :span="3">护卫点:
-              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
-            </el-col>
             <el-col :span="9">失业金领取日期:
               <el-date-picker
                 v-model="queryParams.applayDateStr"
@@ -704,40 +1110,60 @@
             <el-col :span="4">申报事由:
               <el-input v-model="queryParams.applayReason" size="small" maxlength="20" style="width:100px" />
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="syjexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="syjexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="unemploymentTable" :data="unemploymentData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位名称" width="180" />
-            <el-table-column prop="empNumb" 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="applayReason" label="申报事由" width="180" />
-            <el-table-column prop="reporter" label="汇报人" width="180" />
-            <el-table-column prop="auditor" label="审核人" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
+          <el-table
+            ref="unemploymentTable"
+            :data="unemploymentData"
+            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%;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" 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="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" />
+            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
           </el-table>
         </div>
 
         <div v-show="showArr[8].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -745,7 +1171,7 @@
             <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="9">社保申请日期:
@@ -763,63 +1189,74 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="4">社保档位:
               <el-select v-model="queryParams.insuranceGaers" style="width:100px">
-                <el-option value="" label="全部" />
-                <el-option value="1" label="深户(五险一档)" />
-                <el-option value="2" label="非深户(五险一档)" />
-                <el-option value="3" label="非深户(五险二档)" />
-                <el-option value="4" label="非深户(五险三档)" />
-                <el-option value="5" label="非深户(四险三档)" />
+                <el-option
+                  v-for="dict in insuranceTypeOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="sbexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="sbexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="deptName" 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">
-              <template slot-scope="{row}">
-                {{ transInsuranceGaers(row.insuranceGaers) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="reportStatus" label="是否已报告" width="180">
-              <template slot-scope="{row}">
-                {{ transReportStatus(row.reportStatus) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="applayStatus" label="状态" width="180">
-              <template slot-scope="{row}">
-                {{ transApplayStatus(row.applayStatus) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="auditor" label="审核人" width="180" />
-            <el-table-column prop="remark" label="备注" width="280" />
+          <el-table
+            ref="insuranceTable"
+            :data="insuranceData"
+            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%;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" 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="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" />
+            <el-table-column show-overflow-tooltip prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
+            <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
+            <el-table-column show-overflow-tooltip prop="remark" label="备注" />
           </el-table>
         </div>
 
         <div v-show="showArr[9].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -827,7 +1264,7 @@
             <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="9">受伤日期:
@@ -845,6 +1282,8 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="9">人事处理时间:
               <el-date-picker
                 v-model="queryParams.hrDoDateStr"
@@ -861,71 +1300,89 @@
               />
             </el-col>
             <el-col :span="4">是否住院:
-              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
-                <el-option value="" label="全部" />
-                <el-option value="1" label="是" />
-                <el-option value="2" label="否" />
+              <el-select v-model="queryParams.hospitalizatioFlag" style="width:120px">
+                <el-option
+                  v-for="dict in hospitalizatioFlagOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
             <el-col :span="4">案结状态:
-              <el-select v-model="queryParams.settleStatus" style="width:100px">
+              <el-select v-model="queryParams.settleStatus" style="width:120px">
                 <el-option value="" label="全部" />
                 <el-option value="1" label="已结案" />
                 <el-option value="0" label="未结案" />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="ywxexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="ywxexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="accidentCasesTable" :data="accidentCasesData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="accidentCasesTable"
+            :data="accidentCasesData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <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="injuredTime" label="受伤日期" width="180" />
-            <el-table-column prop="injuredAddress" label="受伤地点" width="180" />
-            <el-table-column prop="injuredPart" label="受伤部位" width="180" />
-            <el-table-column prop="injuredDescribe" label="受伤经过描述" width="180" />
-            <el-table-column prop="injuredDiacrisis" label="意外险诊断" width="180" />
-            <el-table-column prop="hospitalName" label="就诊医院" width="180" />
-            <el-table-column prop="treatmentName" label="就诊科室" width="180" />
-            <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180">
-              <template slot-scope="{row}">
-                {{ transHospitalizatioFlag(row.hospitalizatioFlag) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="bedNumb" label="床号" width="180" />
-            <el-table-column prop="reprotTime" label="报案时间" width="180" />
-            <el-table-column prop="submitTime" label="递交资料时间" width="180" />
-            <el-table-column prop="sbumitBy" label="递交人" width="180" />
-            <el-table-column prop="expensesFee" label="医疗总费用" width="180" />
-            <el-table-column prop="settleStatus" label="案结状态" width="180">
-              <template slot-scope="{row}">
-                {{ transArbitrationStatus(row.settleStatus) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="innsureFee" label="保险赔付费用" width="180" />
+            <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="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" />
+            <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100" />
+            <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="80" />
+            <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />
+            <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+            <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+            <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="100" />
+            <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="expenseReport" label="保单" width="80" />
+            <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" />
           </el-table>
         </div>
 
         <div v-show="showArr[10].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -933,7 +1390,7 @@
             <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="9">受伤日期:
@@ -951,6 +1408,8 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="9">人事处理时间:
               <el-date-picker
                 v-model="queryParams.hrDoDateStr"
@@ -967,72 +1426,90 @@
               />
             </el-col>
             <el-col :span="4">是否住院:
-              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
-                <el-option value="" label="全部" />
-                <el-option value="1" label="是" />
-                <el-option value="2" label="否" />
+              <el-select v-model="queryParams.hospitalizatioFlag" style="width:120px">
+                <el-option
+                  v-for="dict in hospitalizatioFlagOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
             <el-col :span="4">案结状态:
-              <el-select v-model="queryParams.settleStatus" style="width:100px">
-                <el-option value="" label="全部" />
-                <el-option value="1" label="已结案" />
-                <el-option value="0" label="未结案" />
+              <el-select v-model="queryParams.settleStatus" style="width:120px">
+                <el-option
+                  v-for="dict in settleStatusOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row style="margin-bottom: 10px;">
             <el-col :span="21" style="line-height: 50px;">
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="gsexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="gsexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="occupationalTable" :data="occupationalData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="occupationalTable"
+            :data="occupationalData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位" width="180" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="injuredTime" label="受伤日期" width="180" />
-            <el-table-column prop="injuredAddress" label="受伤地点" width="180" />
-            <el-table-column prop="injuredPart" label="受伤部位" width="180" />
-            <el-table-column prop="injuredDescribe" label="受伤经过描述" width="180" />
-            <el-table-column prop="injuredDiacrisis" label="工伤诊断" width="180" />
-            <el-table-column prop="hospitalName" label="就诊医院" width="180" />
-            <el-table-column prop="treatmentName" label="就诊科室" width="180" />
-            <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180">
-              <template slot-scope="{row}">
-                {{ transHospitalizatioFlag(row.hospitalizatioFlag) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="bedNumb" label="床号" width="180" />
-            <el-table-column prop="reportTime" label="报案时间" width="180" />
-            <el-table-column prop="submitTime" label="递交资料时间" width="180" />
-            <el-table-column prop="sbumitBy" label="递交人" width="180" />
-            <el-table-column prop="expensesFee" label="医疗总费用" width="180" />
-            <el-table-column prop="compensated" label="已赔付医药费用" width="180" />
-            <el-table-column prop="settleStatus" label="状态" width="180">
-              <template slot-scope="{row}">
-                {{ transArbitrationStatus(row.settleStatus) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="settleDate" label="案结日期" width="180" />
+            <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="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" />
+            <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80" />
+            <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100" />
+            <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
+            <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+            <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+            <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="100" />
+            <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="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" />
           </el-table>
         </div>
 
         <div v-show="showArr[11].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -1040,7 +1517,7 @@
             <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="9">仲裁日期:
@@ -1058,26 +1535,44 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="4">仲裁类型:
-              <el-select v-model="queryParams.arbitrationType" style="width:100px">
-                <el-option value="" label="全部" />
-                <el-option label="劳资纠纷" value="01" />
-                <el-option label="民事纠纷" value="02" />
-                <el-option label="合同纠纷" value="03" />
+              <el-select v-model="queryParams.arbitrationType" style="width:120px">
+                <el-option
+                  v-for="dict in arbitrationTypeOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
             <el-col :span="4">仲裁事由:
               <el-input v-model="queryParams.arbitrationReason" size="small" maxlength="18" style="width:140px" />
             </el-col>
             <el-col :span="4">案结状态:
-              <el-select v-model="queryParams.arbitrationStatus" style="width:100px">
-                <el-option value="" label="全部" />
-                <el-option value="1" label="已结案" />
-                <el-option value="0" label="未结案" />
+              <el-select v-model="queryParams.arbitrationStatus" style="width:120px">
+                <el-option
+                  v-for="dict in settleStatusOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="4">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
@@ -1086,40 +1581,40 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="lzexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="lzexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="laborTroubleTable" :data="laborTroubleData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="laborTroubleTable"
+            :data="laborTroubleData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
-            <el-table-column prop="arbitrationType" label="仲裁类型" width="180">
-              <template slot-scope="{row}">
-                {{ transArbitrationType(row.arbitrationType) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="arbitrationReason" label="仲裁事由" width="180" />
-            <el-table-column prop="reporter" label="汇报人" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
-            <el-table-column prop="arbitrationPay" label="仲裁赔付(元)" width="180" />
-            <el-table-column prop="arbitrationStatus" label="状态" width="180">
-              <template slot-scope="{row}">
-                {{ transArbitrationStatus(row.arbitrationStatus) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="settleDate" label="案结日期" width="180" />
-          </el-table>
-        </div>
+            <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" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          </el-table></div>
 
         <div v-show="showArr[12].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -1127,7 +1622,7 @@
             <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="9">不良记录日期:
@@ -1145,11 +1640,24 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="5">不良记录描述:
               <el-input v-model="queryParams.badContent" size="small" maxlength="18" style="width:140px" />
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="3.5">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
@@ -1158,28 +1666,37 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="blexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="blexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="badRecordTable" :data="badRecordData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="badRecordTable"
+            :data="badRecordData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="badDate" label="不良记录日期" width="180" />
-            <el-table-column prop="badContent" label="不良记录描述" width="180" />
-            <el-table-column prop="reporter" label="汇报人" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
-          </el-table>
-        </div>
+            <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="备注" />
+
+          </el-table></div>
 
         <div v-show="showArr[13].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -1187,8 +1704,8 @@
             <el-col :span="4">身份证号:
               <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
             </el-col>
-            <el-col :span="3">护卫点:
-              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
+            <el-col :span="4">(部门)护卫点:
+              <el-input v-model="queryParams.allDeptName" size="small" maxlength="20" style="width:100px" />
             </el-col>
             <el-col :span="9">备注日期:
               <el-date-picker
@@ -1205,11 +1722,24 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="4">备注信息:
               <el-input v-model="queryParams.remarkContent" size="small" maxlength="18" style="width:140px" />
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="3.5">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
@@ -1218,23 +1748,33 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="bzexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="bzexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="remarkInfoTable" :data="remarkInfoData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="remarkInfoTable"
+            :data="remarkInfoData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="remarkDate" label="备注日期" width="180" />
-            <el-table-column prop="remarkContent" label="备注信息" width="400" />
+            <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" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
           </el-table>
         </div>
         <div v-show="showArr[14].show">
           <el-row style="margin-bottom: 10px;">
-            <el-col :span="6">员工编号:
+            <el-col :span="6">编号:
               <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:200px" />
             </el-col>
             <el-col :span="6">姓名:
@@ -1243,12 +1783,12 @@
             <el-col :span="6">身份证号:
               <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:200px" />
             </el-col>
-            <el-col :span="6">护卫点:
+            <el-col :span="6">(部门)护卫点:
               <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:200px" />
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">调岗日期:
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="9">调岗日期:
               <el-date-picker
                 v-model="queryParams.changeDateStr"
                 size="small"
@@ -1260,17 +1800,32 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :picker-options="pickerOptions"
-                style="width: 500px;"
+                style="width: 350px;"
               />
             </el-col>
             <el-col :span="6">调岗类型:
               <el-select v-model="queryParams.changeType" size="small" style="width:200px">
-                <el-option label="升职" value="2" />
-                <el-option label="调动" value="3" />
+                <el-option
+                  v-for="dict in changeTypeOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
             <el-col :span="6">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
+            <el-col :span="3">
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
@@ -1279,32 +1834,39 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="tgexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="tgexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="jobChangeTable" :data="jobChangeData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="jobChangeTable"
+            :data="jobChangeData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="newDeptName" label="现部门" />
-            <el-table-column prop="newJobName" label="现岗位" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="oldDeptName" label="原部门" />
-            <el-table-column prop="oldJobName" label="原岗位" />
-            <el-table-column prop="changeDate" label="调岗日期" />
-            <el-table-column prop="changeType" label="调岗类型">
-              <template slot-scope="{row}">
-                {{ row.changeType==='3'?'调动':'升职' }}
-              </template>
-            </el-table-column>
+            <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="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" 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="调岗日期" 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>
         <div v-show="showArr[15].show">
-          <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+          <el-row style="margin-bottom: 10px;">
+            <el-col :span="3">编号:
+              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:110px" />
             </el-col>
             <el-col :span="3">姓名:
               <el-input v-model="queryParams.empName" size="small" maxlength="10" style="width:110px" />
@@ -1312,7 +1874,7 @@
             <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="9">入职日期:
@@ -1330,7 +1892,9 @@
                 style="width: 400px;"
               />
             </el-col>
-            <el-col :span="9">离职日期:
+          </el-row>
+          <el-row>
+            <el-col :span="8">离职日期:
               <el-date-picker
                 v-model="queryParams.dimissionDateStr"
                 size="small"
@@ -1342,21 +1906,32 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :picker-options="pickerOptions"
-                style="width: 400px;"
+                style="width: 350px;"
               />
             </el-col>
-            <el-col :span="3">离职类型:
-              <el-select v-model="queryParams.dimissionType" style="width:100px">
-                <el-option label="全部" value="" />
-                <el-option label="正常离职" value="1" />
-                <el-option label="自动离职" value="2" />
-                <el-option label="公司劝退" value="3" />
-                <el-option label="公司辞退" value="4" />
-                <el-option label="试用期内" value="5" />
+            <el-col :span="4">离职类型:
+              <el-select v-model="queryParams.dimissionType" style="width:150px">
+                <el-option
+                  v-for="dict in dimissionTypeOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
+            <el-col :span="6">
+              <el-col :span="6" style="line-height: 30px;">
+                员工状态:
+              </el-col>
+              <el-col :span="16" style="line-height: 30px;">
+                <el-checkbox-group v-model="queryParams.empStatus">
+                  <el-checkbox :label="0">在职</el-checkbox>
+                  <el-checkbox :label="1">离职</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </el-col>
             <el-col :span="3.5">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>
@@ -1365,22 +1940,31 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="rlzexportExcel">
-                {{ $t('table.export') }}
+              <el-button class="hr-but-all" type="success" @click.native="rlzexportExcel">
+                导出EXCEL
               </el-button>
             </el-col>
           </el-row>
-          <el-table ref="dimissionLogTable" :data="dimissionLogData" style="width: 100%;height: 70%;">
+          <el-table
+            ref="dimissionLogTable"
+            :data="dimissionLogData"
+            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%;height: 70%;"
+            @sort-change="changeSort"
+          >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="newDeptName" label="现部门" />
-            <el-table-column prop="newJobName" label="现岗位" />
-            <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="entryDate" label="入职日期" />
-            <el-table-column prop="dimissionDate" label="离职日期" />
-            <el-table-column prop="selfLeaveDay" label="自离天数" />
-            <el-table-column prop="reporter" label="报备人" />
-            <el-table-column prop="remark" 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="newJobName" 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" />
           </el-table>
         </div>
         <pagination
@@ -1403,8 +1987,14 @@
   },
   data() {
     return {
+      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', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb'],
+      dialogShowDcyg: false,
+      isIndeterminate: false,
+      checkedCities: [],
+      checkAll: false,
       total: 0, // 总数量
       queryParams: {
+        allDeptName: '',
         vague: '',
         sex: [],
         education: [],
@@ -1412,11 +2002,19 @@
         ageStr: [],
         archivesStatus: [],
         insuranceType: [],
-        empStatus: []
+        empStatus: [],
+        empType: [],
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        certificateNumb: '',
+        jobContent: '',
+        inOutType: [],
+        certificateList: []
       }, // 查询参数
       sort: {}, // 排序
       pagination: { // 分页参数
-        size: 10,
+        size: 15,
         num: 1
       },
       tableUrl: '',
@@ -1682,29 +2280,241 @@
             }
           }
         ]
-      }
+      },
+      statusOptions: [],
+      empTypeOptions: [],
+      nationOptions: [],
+      marriageOptions: [],
+      educationOptions: [],
+      nativePlaceOptions: [],
+      archivesStatusOptions: [],
+      insuranceTypeOptions: [],
+      empCardStatusOptions: [],
+      handbookStatusOptions: [],
+      ecgOptions: [],
+      certificateListOptions: [],
+      physicalExamTypeOptions: [],
+      contractStatusOptions: [],
+      leaveTypeOptions: [],
+      insuranceGaersOptions: [],
+      applayStatusOptions: [],
+      reportStatusOptions: [],
+      hospitalizatioFlagOptions: [],
+      settleStatusOptions: [],
+      arbitrationTypeOptions: [],
+      changeTypeOptions: [],
+      dimissionTypeOptions: [],
+      ageStrOptions: [],
+      attendYearOptions: [],
+      sexOptions: []
     }
   },
   mounted() {
     this.thisShowIndex = 1
     this.isShow(false, 0)
+    this.getDicts('ageStr').then(response => {
+      this.ageStrOptions = response.data
+    })
+    this.getDicts('PLITICAL').then(response => {
+      this.statusOptions = response.data
+    })
+    this.getDicts('attendYear').then(response => {
+      this.attendYearOptions = response.data
+    })
+    this.getDicts('sex').then(response => {
+      this.sexOptions = response.data
+    })
+    this.getDicts('empType').then(response => {
+      this.empTypeOptions = response.data
+    })
+    this.getDicts('NATION').then(response => {
+      this.nationOptions = response.data
+    })
+    this.getDicts('MARRIAGE').then(response => {
+      this.marriageOptions = response.data
+    })
+    this.getDicts('EDUCATION').then(response => {
+      this.educationOptions = response.data
+    })
+    this.getDicts('NATIVEPLACE').then(response => {
+      this.nativePlaceOptions = response.data
+    })
+    this.getDicts('archivesStatus').then(response => {
+      this.archivesStatusOptions = response.data
+    })
+    this.getDicts('INSURANCETYPE').then(response => {
+      this.insuranceTypeOptions = response.data
+    })
+    this.getDicts('empCardStatus').then(response => {
+      this.empCardStatusOptions = response.data
+    })
+    this.getDicts('handbookStatus').then(response => {
+      this.handbookStatusOptions = response.data
+    })
+    this.getDicts('certificateList').then(response => {
+      this.certificateListOptions = response.data
+    })
+    this.getDicts('PHYSICALEXAMTYPE').then(response => {
+      this.physicalExamTypeOptions = response.data
+    })
+    this.getDicts('ECG').then(response => {
+      this.ecgOptions = response.data
+    })
+    this.getDicts('CONTRACTSTATUS').then(response => {
+      this.contractStatusOptions = response.data
+    })
+    this.getDicts('LEAVETYPE').then(response => {
+      this.leaveTypeOptions = response.data
+    })
+    this.getDicts('INSURANCETYPE').then(response => {
+      this.insuranceGaersOptions = response.data
+    })
+    this.getDicts('applayStatus').then(response => {
+      this.applayStatusOptions = response.data
+    })
+    this.getDicts('reportStatus').then(response => {
+      this.reportStatusOptions = response.data
+    })
+    this.getDicts('hospitalizatioFlag').then(response => {
+      this.hospitalizatioFlagOptions = response.data
+    })
+    this.getDicts('settleStatus').then(response => {
+      this.settleStatusOptions = response.data
+    })
+    this.getDicts('ZCTYPE').then(response => {
+      this.arbitrationTypeOptions = response.data
+    })
+    this.getDicts('changeType').then(response => {
+      this.changeTypeOptions = response.data
+    })
+    this.getDicts('LZTYPE').then(response => {
+      this.dimissionTypeOptions = response.data
+    })
   },
   methods: {
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.physicalExamTypeOptions, row.physicalExamType)
+    },
+    empTypeFormat(row, column) {
+      return this.selectDictLabel(this.empTypeOptions, row.empType)
+    },
+    sexFormat(row, column) {
+      return this.selectDictLabel(this.sexOptions, row.sex)
+    },
+    nationFormat(row, column) {
+      return this.selectDictLabel(this.nationOptions, row.nation)
+    },
+    marriageFormat(row, column) {
+      return this.selectDictLabel(this.marriageOptions, row.marriage)
+    },
+    politicsFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.politics)
+    },
+    nativePlaceFormat(row, column) {
+      return this.selectDictLabel(this.nativePlaceOptions, row.nativePlace)
+    },
+    educationFormat(row, column) {
+      return this.selectDictLabel(this.educationOptions, row.education)
+    },
+    insuranceTypeFormat(row, column) {
+      return this.selectDictLabel(this.insuranceTypeOptions, row.insuranceType)
+    },
+    ecgNameFormat(row, column) {
+      return this.selectDictLabel(this.ecgOptions, row.ecg)
+    },
+    contractStatusFormat(row, column) {
+      return this.selectDictLabel(this.contractStatusOptions, row.contractStatus)
+    },
+    changeTypeFormat(row, column) {
+      return this.selectDictLabel(this.changeTypeOptions, row.changeType)
+    },
+    leaveTypeFormat(row, column) {
+      return this.selectDictLabel(this.leaveTypeOptions, row.leaveType)
+    },
+    dimissionTypeFormat(row, column) {
+      return this.selectDictLabel(this.dimissionTypeOptions, row.dimissionType)
+    },
+    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)
+    },
+    hospitalizatioFlagFormat(row, column) {
+      return this.selectDictLabel(this.hospitalizatioFlagOptions, row.hospitalizatioFlag)
+    },
+    settleStatusFormat(row, column) {
+      return this.selectDictLabel(this.settleStatusOptions, row.settleStatus)
+    },
+    arbitrationTypeFormat(row, column) {
+      return this.selectDictLabel(this.arbitrationTypeOptions, row.arbitrationType)
+    },
+    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
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.cityOptions.length
+    },
+    handleCheckAllChange(val) {
+      this.checkedCities = val ? this.cityOptions : []
+      this.isIndeterminate = false
+    },
+    showDcyg(operate) {
+      switch (operate) {
+        case 0:
+          this.dialogShowDcyg = true
+          break
+        case 1:
+          this.dialogShowDcyg = false
+          break
+        case 2:
+          var params = this.queryParams
+          params.exportField = this.checkedCities.join(',')
+          this.$download('hr/empBaseInfo/exportWithField', { ...params }, '在职员工列表.xls').then(() => {
+            this.$message({
+              message: '下载成功!',
+              type: 'success'
+            })
+          })
+          break
+      }
+    },
     resetSearch() {
       this.queryParams = {
         delFlag: 0,
-        vague: '',
         sex: [],
         education: [],
         politics: [],
         ageStr: [],
         archivesStatus: [],
         insuranceType: [],
-        empStatus: []
+        empStatus: [],
+        empType: [],
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        certificateNumb: '',
+        jobContent: '',
+        inOutType: [],
+        certificateList: []
       }
       this.search()
     },
     search() {
+      this.queryParams.baseKey = ''
       this.fetch({
         ...this.queryParams,
         ...this.sort
@@ -1724,10 +2534,8 @@
     },
     vagueSearch() {
       this.fetch({
-        empNumb: this.queryParams.vague,
-        empName: this.queryParams.vague,
-        deptName: this.queryParams.vague,
-        delFlag: 0
+        baseKey: this.queryParams.baseKey
+        // delFlag: 0
       })
     },
     dialogIsShow() {
@@ -1758,140 +2566,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.empType = this.dicListToArr(this.empTypeOptions)
+      } else {
+        this.queryParams.empType = []
       }
     },
     selectAllEmpStatus(val) {
@@ -1899,6 +2723,13 @@
         this.queryParams.empStatus = ['0', '1', '2', '3']
       } else {
         this.queryParams.empStatus = []
+      }
+    },
+    selectAllDimissionType(val) {
+      if (val) {
+        this.queryParams.inOutType = this.dicListToArr(this.dimissionTypeOptions)
+      } else {
+        this.queryParams.inOutType = []
       }
     },
     exportExcel(params = {}) {
@@ -2018,11 +2849,7 @@
         case '0':
           return '在职'
         case '1':
-          return '正常离职'
-        case '2':
-          return '自动离职'
-        case '3':
-          return '公司辞退'
+          return '离职'
       }
     },
     transLeaveType(leaveType) {
@@ -2034,6 +2861,10 @@
         case '3':
           return '调休假'
       }
+    },
+    transDimissionDate(val) {
+      var dimissDate = new Date(val)
+      return dimissDate.getFullYear() === 1900 ? '' : val
     },
     transPhysicalExamType(physicalExamType) {
       switch (physicalExamType) {
@@ -2123,29 +2954,70 @@
     transHospitalizatioFlag(hospitalizatioFlag) {
       switch (hospitalizatioFlag) {
         case 1:
-          return '是'
-        case 2:
-          return '否'
+          return '已住院'
+        case 0:
+          return '未住院'
       }
+    },
+    transChangeType(changeType) {
+      switch (changeType) {
+        case 2:
+          return '升职'
+        case 3:
+          return '调动'
+      }
+    },
+    selectAllCertificateList(val) {
+      if (val) {
+        this.queryParams.certificateList = this.dicListToArr(this.certificateListOptions)
+      } else {
+        this.queryParams.certificateList = []
+      }
+    },
+    changeSort(val) {
+      this.sort.field = val.prop
+      this.sort.order = val.order
+      this.search()
     }
   }
 }
 </script>
 <style lang="scss">
 
-.fj-checkbox{
-  .el-checkbox__input.is-checked .el-checkbox__inner {
+  .fj-checkbox{
+    .el-checkbox__input.is-checked .el-checkbox__inner {
       border-color: #a32c30;;
       background: #a32c30;;
+    }
+    .el-checkbox__label {
+      color: #000 !important;
+    }
   }
-  .el-checkbox__label {
-    color: #000 !important;
-  }
-}
 </style>
 <style lang="scss" scoped>
+  #dcygTable {
+    border-collapse: collapse;
+    tr {
+      width: 100%;
+      border-bottom: 1px dashed #ccc;
+      >td:nth-child(even) {
+        width: 100px;
+        text-align: left;
+      }
+    }
+
+  }
+
+  #dcygTable td {
+    width: 160px;
+    text-align: center;
+    height: 35px;
+    line-height: 35px;
+    font-size: 15px;
+    font-weight: 400;
+  }
   .el-container {
-    height: 100%;
+    height: 86.7vh;
     background-color: white;
 
     .el-aside {
@@ -2166,33 +3038,28 @@
     }
   }
 
- .searchTable {
-	margin-top: 10px;
-	border-collapse: collapse;
-	width: 100%;
-  margin-bottom: 15px;
-  .td {
-	background-color: #dddcdc !important;
-	width: 160px;
-	text-align: center;
+  .searchTable {
+    margin-top: 10px;
+    border-collapse: collapse;
+    width: 100%;
+    tr {
+      border-bottom: 1px dashed #d9dadb;
+    }
+
+    .td {
+      width: 90px;
+      text-align: right;
+    }
+    .td-group {
+      padding-left: 20px;
+    }
   }
-  .td-group {
-	padding-left: 20px;
-  }
-}
 
   .searchTable td,
   .searchTable th {
-    border: 1px solid #b0b0b0;
     color: #000;
-    height: 40px;
+    height: 50px;
     background-color: #fff;
-  }
-
-  .searchTable tr td:first-child {
-    background-color: #dddcdc !important;
-    width: 160px;
-    text-align: center;
   }
 
   .button-from {
@@ -2239,4 +3106,32 @@
   .el-date-editor.el-input__inner {
     width: 100%;
   }
+
+  .search-btn {
+    display: inline-block;
+    width: 3.64vw;
+    height: 3.2vh;
+    line-height: 3.2vh;
+    text-align: center;
+    background-color: #a00515;
+    color: #fff;
+    margin-left: 1vw;
+    box-sizing: border-box;
+    cursor: pointer;
+    vertical-align: middle;
+  }
+
+  .sup-search-btn {
+    display: inline-block;
+    width: 5.2vw;
+    height: 3.2vh;
+    line-height: 3.2vh;
+    text-align: center;
+    margin-left: 1vw;
+    color: #a00515;
+    border: 1px solid #a00515;
+    box-sizing: border-box;
+    cursor: pointer;
+    vertical-align: middle;
+  }
 </style>

--
Gitblit v1.8.0