From d6f1a0ecac66466fcd373e471f0ac2c460efee6c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 05 五月 2024 21:25:47 +0800
Subject: [PATCH] feat: 意外险案件、工伤案件、超龄员工统计修改

---
 src/views/user/search.vue | 1778 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 1,269 insertions(+), 509 deletions(-)

diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 905ea8c..83bda1c 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -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>
@@ -43,7 +43,7 @@
             <span :class="thisShowIndex===10?'selectedTimeline':''">工伤案件</span>
           </el-timeline-item>
           <el-timeline-item @click.native="isShow(showArr[11].show, 11)">
-            <span :class="thisShowIndex===11?'selectedTimeline':''">劳资案件</span>
+            <span :class="thisShowIndex===11?'selectedTimeline':''">仲裁案件</span>
           </el-timeline-item>
           <el-timeline-item @click.native="isShow(showArr[12].show, 12)">
             <span :class="thisShowIndex===12?'selectedTimeline':''">不良记录</span>
@@ -59,26 +59,29 @@
               <br>
             </el-col>
             <el-col :span="7">
-              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
+              <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>
@@ -192,7 +193,7 @@
                 </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>
@@ -232,14 +233,44 @@
                   </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="21">
-              已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
+          <el-row>
+            <el-col :span="21" style="line-height: 50px;">
+              已为您搜索出<span style="color:#ff0000">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3" style="text-align: right;padding-right: 10px">
-              <el-button size="mini" class="hr-but" type="success" @click.native="showDcyg(0)">
+              <el-button class="hr-but-all" type="success" @click.native="showDcyg(0)">
                 导出EXCEL
               </el-button>
             </el-col>
@@ -248,30 +279,39 @@
             ref="empBaseInfoTable"
             :data="basicInformationData"
             stripe
-            :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+            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="员工编号" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" />
-            <el-table-column show-overflow-tooltip prop="jobName" label="岗位" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
-            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="50" />
-            <el-table-column show-overflow-tooltip prop="education" label="学历" :formatter="educationFormat" />
-            <el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" :formatter="nativePlaceFormat" />
-            <el-table-column show-overflow-tooltip prop="empType" label="员工类型" :formatter="empTypeFormat" />
-            <el-table-column show-overflow-tooltip prop="telePhone" label="电话" />
-            <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态">
+            <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%">
+          <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;">
@@ -297,7 +337,7 @@
                 <tr>
                   <td>部门(护卫点)</td>
                   <td>
-                    <el-checkbox label="deptName"><span /></el-checkbox>
+                    <el-checkbox label="allDeptName"><span /></el-checkbox>
                   </td>
                   <td>所属岗位</td>
                   <td>
@@ -393,11 +433,25 @@
                   </td>
                 </tr>
                 <tr>
+                  <td>家庭成员及关系1</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>社保档位</td>
                   <td>
                     <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
                   </td>
@@ -417,15 +471,15 @@
                   </td>
                   <td>工作证</td>
                   <td>
-                    <el-checkbox label="empCardStatus"><span /></el-checkbox>
+                    <el-checkbox label="empCardStatusName"><span /></el-checkbox>
                   </td>
                 </tr>
                 <tr>
                   <td>相关证件</td>
                   <td>
-                    <el-checkbox label="certificateList"><span /></el-checkbox>
+                    <el-checkbox label="certificateListName"><span /></el-checkbox>
                   </td>
-                  <td>紧急联系电话</td>
+                  <td>家庭成员及关系2</td>
                   <td>
                     <el-checkbox label="urgencyPhone"><span /></el-checkbox>
                   </td>
@@ -435,14 +489,18 @@
                   </td>
                 </tr>
                 <tr>
-                  <td>家庭成员及关系</td>
+                  <td>入职类型</td>
                   <td>
-                    <el-checkbox label="family"><span /></el-checkbox>
+                    <el-checkbox label="entryTypeName"><span /></el-checkbox>
                   </td>
-                  <td />
-                  <td />
-                  <td />
-                  <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>
@@ -454,12 +512,12 @@
         </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" />
@@ -467,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>
@@ -477,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">
-                导出EXCEL
+              <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" :formatter="sexFormat" />
-            <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" />
@@ -506,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">体检日期:
@@ -524,14 +602,20 @@
                 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-select v-model="queryParams.ecg" style="width:140px">
                 <el-option
                   v-for="dict in ecgOptions"
                   :key="dict.dicItemCode"
@@ -540,48 +624,68 @@
                 />
               </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">
+              <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="empNumb" label="员工编号" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
-            <el-table-column prop="jobName" label="岗位" />
-            <el-table-column prop="empName" label="姓名" width="100" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="sex" label="性别" width="50" :formatter="sexFormat" />
-            <el-table-column prop="hospital" label="体检医院" width="150" />
-            <el-table-column prop="physicalExamDate" label="体检日期" width="100" />
-            <el-table-column prop="physicalExamType" label="体检类型" :formatter="typeFormat" />
-            <el-table-column prop="bloodPressure" label="血压" />
-            <el-table-column prop="transaminase" label="转氨酶" />
-            <el-table-column prop="ecg" label="心电图" :formatter="ecgNameFormat" />
-            <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" />
@@ -589,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">合同签订日期:
@@ -608,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"
@@ -625,48 +729,75 @@
               />
             </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="到期" />
-                <el-option :value="3" label="续签" />
-                <el-option :value="4" label="存档" />
+                <!--                <el-option :value="1" label="有效" />-->
+                <!--                <el-option :value="2" label="到期" />-->
+                <!--                <el-option :value="3" label="续签" />-->
+                <!--                <el-option :value="4" label="存档" />-->
+                <el-option
+                  v-for="dict in contractStatusOptions"
+                  :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="htexportExcel">
+              <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="empName" label="姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="180" />
-            <!-- <el-table-column prop="jobName" 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" :formatter="contractStatusFormat" />
-            <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" />
@@ -674,11 +805,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-col :span="2.5">考勤年月
-              <el-select v-model="queryParams.attendYear" style="width:100px">
+            <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"
@@ -686,7 +817,7 @@
                   :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" />
@@ -701,53 +832,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">
+              <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
+            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="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-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 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" />
@@ -755,9 +908,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"
@@ -775,58 +930,86 @@
             </el-col>
             <el-col :span="4">请假类型:
               <el-select v-model="queryParams.leaveType" style="width:100px">
+                <!--                <el-option value="" 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-option value="" 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-option
+                  v-for="dict in leaveTypeOptions"
+                  :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="qjexportExcel">
+              <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="100" />
-            <el-table-column prop="empName" label="姓名" width="100" />
-            <el-table-column prop="beginTime" label="开始时间" width="180" />
-            <el-table-column prop="endTime" label="结束时间" width="180" />
-            <el-table-column prop="leaveDay" label="请假天数" />
-            <el-table-column prop="leaveType" label="请假类型" width="180" :formatter="leaveTypeFormat" />
-            <el-table-column prop="returnDate" label="到岗时间" width="180" />
-            <el-table-column prop="reporter" label="报备人" width="180" />
-            <el-table-column prop="remark" label="备注" width="280" />
+            <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" />
@@ -834,7 +1017,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">辞职申请日期:
@@ -852,52 +1035,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">
+              <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="empNumb" label="员工编号" width="150" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位" width="100" />
-            <el-table-column prop="empName" label="姓名" width="150" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="applayDate" label="辞职申请日期" width="180" />
-            <el-table-column prop="reason" label="辞职事由" width="200" />
-            <el-table-column prop="reporter" label="汇报人" width="150" />
-            <el-table-column prop="remark" label="备注" width="200" />
+          <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"
@@ -916,40 +1123,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">
+              <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="120" />
-            <el-table-column prop="jobName" label="岗位" width="120" />
-            <el-table-column prop="empNumb" label="员工编号" width="150" />
-            <el-table-column prop="empName" label="姓名" width="120" />
-            <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="280" />
+          <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" />
@@ -957,7 +1184,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">社保申请日期:
@@ -975,51 +1202,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">
+              <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="150" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
-            <el-table-column prop="empName" label="姓名" width="150" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="applayDate" label="社保申请日期" width="150" />
-            <el-table-column prop="proposer" label="申请人" />
-            <el-table-column prop="insuranceGaers" label="社保档位" width="180" :formatter="insuranceGaersFormat" />
-            <el-table-column prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
-            <el-table-column prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
-            <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" />
@@ -1027,7 +1277,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">受伤日期:
@@ -1045,6 +1295,8 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="9">人事处理时间:
               <el-date-picker
                 v-model="queryParams.hrDoDateStr"
@@ -1061,7 +1313,7 @@
               />
             </el-col>
             <el-col :span="4">是否住院:
-              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
+              <el-select v-model="queryParams.hospitalizatioFlag" style="width:120px">
                 <el-option
                   v-for="dict in hospitalizatioFlagOptions"
                   :key="dict.dicItemCode"
@@ -1071,59 +1323,79 @@
               </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">
+              <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="150" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="120" />
-            <el-table-column prop="jobName" label="岗位" width="120" />
-            <el-table-column prop="empName" label="姓名" width="120" />
-            <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="100" :formatter="hospitalizatioFlagFormat" />
-            <el-table-column prop="bedNumb" label="床号" />
-            <el-table-column prop="reprotTime" label="报案时间" width="150" />
-            <el-table-column prop="submitTime" label="递交资料时间" width="150" />
-            <el-table-column prop="sbumitBy" label="递交人" width="120" />
-            <el-table-column prop="expensesFee" label="医疗总费用" width="180" />
-            <el-table-column prop="innsureFee" label="保险赔付费用" width="180" />
-            <el-table-column prop="expenseReport" label="保单" width="180" />
-            <el-table-column prop="hrDoDate" label="人事处理时间" width="180" />
-            <el-table-column prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
-            <el-table-column prop="settleDate" label="结案时间" width="150" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="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" />
@@ -1131,7 +1403,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">受伤日期:
@@ -1149,6 +1421,8 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="9">人事处理时间:
               <el-date-picker
                 v-model="queryParams.hrDoDateStr"
@@ -1165,7 +1439,7 @@
               />
             </el-col>
             <el-col :span="4">是否住院:
-              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
+              <el-select v-model="queryParams.hospitalizatioFlag" style="width:120px">
                 <el-option
                   v-for="dict in hospitalizatioFlagOptions"
                   :key="dict.dicItemCode"
@@ -1175,7 +1449,7 @@
               </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
                   v-for="dict in settleStatusOptions"
                   :key="dict.dicItemCode"
@@ -1184,52 +1458,83 @@
                 />
               </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">
+              <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="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
-            <el-table-column prop="jobName" label="岗位" width="150" />
-            <el-table-column prop="empName" label="姓名" width="150" />
-            <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="100" :formatter="hospitalizatioFlagFormat" />
-            <el-table-column prop="bedNumb" label="床号" width="100" />
-            <el-table-column prop="reportTime" label="报案时间" width="150" />
-            <el-table-column prop="submitTime" label="递交资料时间" width="150" />
-            <el-table-column prop="sbumitBy" label="递交人" width="180" />
-            <el-table-column prop="expensesFee" label="医疗总费用" width="100" />
-            <el-table-column prop="innsureFee" label="保险赔付费用" width="100" />
-            <el-table-column prop="hrDoDate" label="人事处理时间" width="150" />
-            <el-table-column prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
-            <el-table-column prop="settleDate" label="结案时间" width="150" />
+            <el-table-column label="操作" width="130">
+              <template slot-scope="scope">
+                <span
+                  style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
+                  @click="showDetailInfo(scope.row,10)"
+                >详情</span>
+              </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="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="otherCompensated" label="报销费用" width="100" />
+            <el-table-column show-overflow-tooltip prop="socialDisability" label="一次性伤残补助金" width="150" />
+            <el-table-column show-overflow-tooltip prop="socialSubsidy" label="一次性医疗补助金" width="150" />
+            <el-table-column show-overflow-tooltip prop="socialCompensation" label="社保赔偿总费用" width="150" />
+            <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" />
@@ -1237,7 +1542,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">仲裁日期:
@@ -1255,8 +1560,10 @@
                 style="width: 400px;"
               />
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="4">仲裁类型:
-              <el-select v-model="queryParams.arbitrationType" style="width:100px">
+              <el-select v-model="queryParams.arbitrationType" style="width:120px">
                 <el-option
                   v-for="dict in arbitrationTypeOptions"
                   :key="dict.dicItemCode"
@@ -1269,7 +1576,7 @@
               <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-select v-model="queryParams.arbitrationStatus" style="width:120px">
                 <el-option
                   v-for="dict in settleStatusOptions"
                   :key="dict.dicItemCode"
@@ -1278,8 +1585,19 @@
                 />
               </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>
@@ -1288,32 +1606,40 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="lzexportExcel">
+              <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="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
-            <el-table-column prop="empName" label="姓名" width="150" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="arbitrationDate" label="仲裁日期" width="150" />
-            <el-table-column prop="arbitrationType" label="仲裁类型" width="150" :formatter="arbitrationTypeFormat" />
-            <el-table-column prop="arbitrationReason" label="仲裁事由" width="150" />
-            <el-table-column prop="reporter" label="汇报人" width="150" />
-            <el-table-column prop="remark" label="备注" width="200" />
-            <el-table-column prop="arbitrationPay" label="仲裁赔付(元)" width="100" />
-            <el-table-column prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
-            <el-table-column prop="settleDate" label="案结日期" width="150" />
-          </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" />
@@ -1321,7 +1647,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">不良记录日期:
@@ -1339,11 +1665,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>
@@ -1352,28 +1691,37 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="blexportExcel">
+              <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="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="140" />
-            <el-table-column prop="empName" label="姓名" width="140" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="badDate" label="不良记录日期" width="140" />
-            <el-table-column prop="badContent" label="不良记录描述" width="280" />
-            <el-table-column prop="reporter" label="汇报人" width="100" />
-            <el-table-column prop="remark" label="备注" width="280" />
-          </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" />
@@ -1381,8 +1729,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
@@ -1399,11 +1747,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>
@@ -1412,24 +1773,33 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="bzexportExcel">
+              <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="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="(部门)护卫点" width="140" />
-            <el-table-column prop="jobName" label="岗位" width="140" />
-            <el-table-column prop="empName" label="姓名" width="140" />
-            <el-table-column prop="remarkDate" label="备注日期" width="180" />
-            <el-table-column prop="remarkContent" label="备注信息" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="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">姓名:
@@ -1442,8 +1812,8 @@
               <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"
@@ -1455,7 +1825,7 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :picker-options="pickerOptions"
-                style="width: 500px;"
+                style="width: 350px;"
               />
             </el-col>
             <el-col :span="6">调岗类型:
@@ -1469,7 +1839,18 @@
               </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>
@@ -1478,29 +1859,39 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="tgexportExcel">
+              <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="调岗类型" :formatter="changeTypeFormat" />
-            <el-table-column prop="changeReason" label="调岗理由描述" width="380" />
+            <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" />
@@ -1508,7 +1899,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">入职日期:
@@ -1526,7 +1917,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"
@@ -1538,11 +1931,11 @@
                 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-col :span="4">入离职类型:
+              <el-select v-model="queryParams.dimissionType" style="width:150px">
                 <el-option
                   v-for="dict in dimissionTypeOptions"
                   :key="dict.dicItemCode"
@@ -1551,8 +1944,19 @@
                 />
               </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>
@@ -1561,22 +1965,31 @@
               已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="rlzexportExcel">
+              <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="newDeptName" label="(部门)护卫点" width="180" />
-            <el-table-column prop="newJobName" label="岗位" />
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <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="备注" width="280" />
+            <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
@@ -1588,7 +2001,195 @@
         />
       </el-main>
     </el-container>
+    <el-dialog title="工伤案件" :visible.sync="dialogshowArr[10].show" width="50%">
+      <el-form
+        ref="occupationalForm"
+        :model="occupationalForm"
+        :rules="occupationalRules"
+        label-position="right"
+        label-width="140px"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="empName">
+              <el-input v-model="occupationalForm.empName" suffix-icon="el-icon-search" @click.native="showXzyg()" />
+            </el-form-item>
+            <el-form-item label="身份证号码" prop="certificateNumb">
+              <el-input
+                v-model="occupationalForm.certificateNumb"
+              />
+            </el-form-item>
+            <el-form-item label="性别" prop="sex">
+              <el-input v-model="occupationalForm.sex" />
+            </el-form-item>
+            <el-form-item label="受伤时间" prop="injuredTime">
+              <el-date-picker
+                v-model="occupationalForm.injuredTime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="选择受伤时间"
+              />
+            </el-form-item>
+            <el-form-item label="受伤部位" prop="injuredPart">
+              <el-input v-model="occupationalForm.injuredPart" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="编号" prop="empNumb">
+              <el-input v-model="occupationalForm.empNumb" />
+            </el-form-item>
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="occupationalForm.allDeptName" />
+            </el-form-item>
+            <el-form-item label="岗位" prop="jobName">
+              <el-input v-model="occupationalForm.jobName" />
+            </el-form-item>
+            <el-form-item label="受伤地点" prop="injuredAddress">
+              <el-input v-model="occupationalForm.injuredAddress" />
+            </el-form-item>
+            <el-form-item label="工伤诊断" prop="injuredDiacrisis">
+              <el-input v-model="occupationalForm.injuredDiacrisis" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
+        <el-row>
+          <el-col>
+            <el-form-item label="受伤经过描述" prop="injuredDescribe">
+              <el-input v-model="occupationalForm.injuredDescribe" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="就诊医院" prop="hospitalName">
+              <el-input v-model="occupationalForm.hospitalName" />
+            </el-form-item>
+            <el-form-item label="是否住院" prop="hospitalizatioFlag">
+              <el-select v-model="occupationalForm.hospitalizatioFlag" placeholder="是否住院">
+                <el-option
+                  v-for="dict in hospitalizatioFlagOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="报案时间" prop="'reportTime">
+              <el-date-picker
+                v-model="occupationalForm.reportTime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                type="datetime"
+                placeholder="选择报案时间"
+              />
+            </el-form-item>
+            <el-form-item label="递交人" prop="'sbumitBy">
+              <el-input v-model="occupationalForm.sbumitBy" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="就诊科室" prop="'treatmentName">
+              <el-input v-model="occupationalForm.treatmentName" />
+            </el-form-item>
+            <el-form-item label="床号" prop="bedNumb">
+              <el-input v-model="occupationalForm.bedNumb" />
+            </el-form-item>
+            <el-form-item label="递交资料时间" prop="submitTime">
+              <el-date-picker
+                v-model="occupationalForm.submitTime"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="选择递交资料时间"
+              />
+            </el-form-item>
+            <el-form-item label="人事处理时间" prop="hrDoDate">
+              <el-date-picker
+                v-model="occupationalForm.hrDoDate"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="选择人事处理时间"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        社保赔偿费用
+        <el-divider />
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="医疗总费用" prop="expensesFee">
+              <el-input v-model="occupationalForm.expensesFee" />
+            </el-form-item>
+            <el-form-item label="一次性伤残补助金" prop="socialDisability">
+              <el-input v-model="occupationalForm.socialDisability" />
+            </el-form-item>
+            <el-form-item label="一次性医疗补助金" prop="socialSubsidy">
+              <el-input v-model="occupationalForm.socialSubsidy" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="剔除总额">
+              <el-input v-model="occupationalForm.eliminate" />
+            </el-form-item>
+            <el-form-item label="住院伙食补贴">
+              <el-input v-model="occupationalForm.socialAllowance" />
+            </el-form-item>
+            <el-form-item label="社保赔偿总费用">
+              <el-input v-model="occupationalForm.socialCompensation" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        公司赔偿费用
+        <el-divider />
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="已赔付医药费用" prop="compensated">
+              <el-input v-model="occupationalForm.compensated" />
+            </el-form-item>
+            <el-form-item label="一次性伤残补助金">
+              <el-input v-model="occupationalForm.companylDisability" />
+            </el-form-item>
+            <el-form-item label="一次性医疗补助金">
+              <el-input v-model="occupationalForm.companySubsidy" />
+            </el-form-item>
+            <el-form-item label="一次性就业补助金">
+              <el-input v-model="occupationalForm.jobSubsidy" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="其他赔偿报销">
+              <el-input v-model="occupationalForm.otherCompensated" />
+            </el-form-item>
+            <el-form-item label="工伤生活补贴">
+              <el-input v-model="occupationalForm.companyAllowance" />
+            </el-form-item>
+            <el-form-item label="公司赔偿总费用" prop="companyCompensation">
+              <el-input v-model="occupationalForm.companyCompensation" />
+            </el-form-item>
+            <el-form-item label="是否结案" prop="settleStatus">
+              <el-select v-model="occupationalForm.settleStatus" placeholder="">
+                <el-option
+                  v-for="dict in settleStatusOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col>
+            <el-form-item label="备注">
+              <el-input v-model="occupationalForm.remark" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogIsShow()">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1599,13 +2200,14 @@
   },
   data() {
     return {
-      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family'],
+      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: [],
@@ -1614,11 +2216,19 @@
         archivesStatus: [],
         insuranceType: [],
         empStatus: [],
-        empType: []
+        empType: [],
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        certificateNumb: '',
+        jobContent: '',
+        inOutType: [],
+        certificateList: [],
+        deptName: ''
       }, // 查询参数
       sort: {}, // 排序
       pagination: { // 分页参数
-        size: 10,
+        size: 15,
         num: 1
       },
       tableUrl: '',
@@ -1910,7 +2520,56 @@
       dimissionTypeOptions: [],
       ageStrOptions: [],
       attendYearOptions: [],
-      sexOptions: []
+      sexOptions: [],
+      occupationalForm: {
+        occupationalId: '',
+        empId: '',
+        empNumb: '',
+        empName: '',
+        sex: '',
+        sexName: '',
+        certificateNumb: '',
+        deptId: '',
+        deptName: '',
+        allDeptName: '',
+        JobId: '',
+        jobName: '',
+        injuredTime: '',
+        injuredAddress: '',
+        injuredPart: '',
+        injuredDiacrisis: '',
+        injuredDescribe: '',
+        hospitalName: '',
+        treatmentName: '',
+        hospitalizatioFlag: '',
+        bedNumb: '',
+        reportTime: '',
+        submitTime: '',
+        sbumitBy: '',
+        hrDoDate: '',
+        expensesFee: '',
+        eliminate: '',
+        socialDisability: '',
+        socialAllowance: '',
+        socialSubsidy: '',
+        socialCompensation: '',
+        compensated: '',
+        otherCompensated: '',
+        companylDisability: '',
+        companyAllowance: '',
+        companySubsidy: '',
+        companyCompensation: '',
+        jobSubsidy: '',
+        settleStatus: '',
+        createTime: '',
+        creator: '',
+        modifyTime: '',
+        modifier: '',
+        delFlag: '',
+        version: '',
+        empStatus: 0,
+        remark: ''
+      }
     }
   },
   mounted() {
@@ -1970,7 +2629,7 @@
     this.getDicts('LEAVETYPE').then(response => {
       this.leaveTypeOptions = response.data
     })
-    this.getDicts('insuranceGaers').then(response => {
+    this.getDicts('INSURANCETYPE').then(response => {
       this.insuranceGaersOptions = response.data
     })
     this.getDicts('applayStatus').then(response => {
@@ -2059,6 +2718,66 @@
     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
+      }
+    },
+    showDetailInfo(row, index) {
+      switch (index){
+        case 10:
+          this.occupationalForm.occupationalId = row.occupationalId
+          this.occupationalForm.empId = row.empId
+          this.occupationalForm.empNumb = row.empNumb
+          this.occupationalForm.empName = row.empName
+          this.occupationalForm.sex = row.sex
+          this.occupationalForm.certificateNumb = row.certificateNumb
+          this.occupationalForm.deptId = row.deptId
+          this.occupationalForm.deptName = row.deptName
+          this.occupationalForm.allDeptName = row.allDeptName
+          this.occupationalForm.JobId = row.JobId
+          this.occupationalForm.jobName = row.jobName
+          this.occupationalForm.injuredTime = row.injuredTime
+          this.occupationalForm.injuredAddress = row.injuredAddress
+          this.occupationalForm.injuredPart = row.injuredPart
+          this.occupationalForm.injuredDiacrisis = row.injuredDiacrisis
+          this.occupationalForm.injuredDescribe = row.injuredDescribe
+          this.occupationalForm.hospitalName = row.hospitalName
+          this.occupationalForm.treatmentName = row.treatmentName
+          this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag + ''
+          this.occupationalForm.bedNumb = row.bedNumb
+          this.occupationalForm.reportTime = row.reportTime
+          this.occupationalForm.submitTime = row.submitTime
+          this.occupationalForm.sbumitBy = row.sbumitBy
+          this.occupationalForm.hrDoDate = row.hrDoDate
+          this.occupationalForm.expensesFee = row.expensesFee
+          this.occupationalForm.eliminate = row.eliminate
+          this.occupationalForm.socialDisability = row.socialDisability
+          this.occupationalForm.socialAllowance = row.socialAllowance
+          this.occupationalForm.socialSubsidy = row.socialSubsidy
+          this.occupationalForm.socialCompensation = row.socialCompensation
+          this.occupationalForm.compensated = row.compensated
+          this.occupationalForm.otherCompensated = row.otherCompensated
+          this.occupationalForm.companylDisability = row.companylDisability
+          this.occupationalForm.companyAllowance = row.companyAllowance
+          this.occupationalForm.companySubsidy = row.companySubsidy
+          this.occupationalForm.companyCompensation = row.companyCompensation
+          this.occupationalForm.jobSubsidy = row.jobSubsidy
+          this.occupationalForm.settleStatus = row.settleStatus + ''
+          this.occupationalForm.createTime = row.createTime
+          this.occupationalForm.creator = row.creator
+          this.occupationalForm.modifyTime = row.modifyTime
+          this.occupationalForm.modifier = row.modifier
+          this.occupationalForm.delFlag = row.delFlag
+          this.occupationalForm.version = row.version
+          this.occupationalForm.remark = row.remark
+          break;
+      }
+      this.dialogshowArr[index].show = true
+    },
     handleCheckedCitiesChange(value) {
       const checkedCount = value.length
       this.checkAll = checkedCount === this.cityOptions.length
@@ -2091,18 +2810,27 @@
     resetSearch() {
       this.queryParams = {
         delFlag: 0,
-        vague: '',
         sex: [],
         education: [],
         politics: [],
         ageStr: [],
         archivesStatus: [],
         insuranceType: [],
-        empStatus: []
+        empStatus: [],
+        empType: [],
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        deptName: '',
+        certificateNumb: '',
+        jobContent: '',
+        inOutType: [],
+        certificateList: []
       }
       this.search()
     },
     search() {
+      this.queryParams.baseKey = ''
       this.fetch({
         ...this.queryParams,
         ...this.sort
@@ -2122,10 +2850,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() {
@@ -2156,147 +2882,156 @@
           this.tableUrl = 'hr/empBaseInfo/zslist'
           this.tableDataName = 'basicInformationData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 1:
           this.tableUrl = 'hr/empWorkExperience/list'
           this.tableDataName = 'workExperienceData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 2:
           this.tableUrl = 'hr/empPhysicalExam/list'
           this.tableDataName = 'physicalExamData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 3:
           this.tableUrl = 'hr/empContractInfo/list'
           this.tableDataName = 'contractInfoData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 4:
           this.tableUrl = 'hr/empDimissionAttend/list'
           this.tableDataName = 'dimissionAttendData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 5:
           this.tableUrl = 'hr/empLeaveInfo/list'
           this.tableDataName = 'leaveInfoData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 6:
           this.tableUrl = 'hr/empResign/list'
           this.tableDataName = 'resignData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 7:
           this.tableUrl = 'hr/empUnemployment/list'
           this.tableDataName = 'unemploymentData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 8:
           this.tableUrl = 'hr/empInsurance/list'
           this.tableDataName = 'insuranceData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 9:
           this.tableUrl = 'hr/empAccidentCases/list'
           this.tableDataName = 'accidentCasesData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 10:
           this.tableUrl = 'hr/empOccupational/list'
           this.tableDataName = 'occupationalData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 11:
           this.tableUrl = 'hr/empLaborTrouble/list'
           this.tableDataName = 'laborTroubleData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 12:
           this.tableUrl = 'hr/empBadRecord/list'
           this.tableDataName = 'badRecordData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 13:
           this.tableUrl = 'hr/empRemarkInfo/list'
           this.tableDataName = 'remarkInfoData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 14:
           this.tableUrl = 'hr/empJobChange/list'
           this.tableDataName = 'jobChangeData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
         case 15:
           this.tableUrl = 'hr/empDimissionlog/list'
           this.tableDataName = 'dimissionLogData'
           this.queryParams.delFlag = 0
-          this.search()
+          this.resetSearch()
           break
       }
     },
+    // dic列表转为数组
+    dicListToArr(dicList) {
+      var arr = []
+      for (var i = 0; i < dicList.length; i++) {
+        var dic = dicList[i]
+        arr.push(dic.dicItemCode)
+      }
+      return arr
+    },
     selectAllSex(val) {
       if (val) {
-        this.queryParams.sex = ['1', '2']
+        this.queryParams.sex = this.dicListToArr(this.sexOptions)
       } else {
         this.queryParams.sex = []
       }
     },
     selectAllEducation(val) {
       if (val) {
-        this.queryParams.education = ['91', '81', '71', '61', '42', '41', '31', '21', '11', '10']
+        this.queryParams.education = this.dicListToArr(this.educationOptions)
       } else {
         this.queryParams.education = []
       }
     },
     selectAllPolitics(val) {
       if (val) {
-        this.queryParams.politics = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13']
+        this.queryParams.politics = this.dicListToArr(this.statusOptions)
       } else {
         this.queryParams.politics = []
       }
     },
     selectAllAgeStr(val) {
       if (val) {
-        this.queryParams.ageStr = ['18-29', '30-39', '40-49', '50-59', '60-69', '69-999']
+        this.queryParams.ageStr = this.dicListToArr(this.ageStrOptions)
       } else {
         this.queryParams.ageStr = []
       }
     },
     selectAllArchivesStatus(val) {
       if (val) {
-        this.queryParams.archivesStatus = ['0', '1']
+        this.queryParams.archivesStatus = this.dicListToArr(this.archivesStatusOptions)
       } else {
         this.queryParams.archivesStatus = []
       }
     },
     selectAllInsuranceType(val) {
       if (val) {
-        this.queryParams.insuranceType = ['1', '2', '3', '4', '5']
+        this.queryParams.insuranceType = this.dicListToArr(this.insuranceTypeOptions)
       } else {
         this.queryParams.insuranceType = []
       }
     },
     selectAllEmpType(val) {
       if (val) {
-        this.queryParams.insuranceType = ['1', '2']
+        this.queryParams.empType = this.dicListToArr(this.empTypeOptions)
       } else {
-        this.queryParams.insuranceType = []
+        this.queryParams.empType = []
       }
     },
     selectAllEmpStatus(val) {
@@ -2304,6 +3039,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 = {}) {
@@ -2388,7 +3130,7 @@
       params.pageNum = this.pagination.num
       this.$download('hr/empLaborTrouble/export', {
         ...params, ...this.queryParams
-      }, `劳资案件_${new Date().getTime()}.xlsx`)
+      }, `仲裁案件_${new Date().getTime()}.xlsx`)
     },
     blexportExcel(params = {}) {
       params.pageSize = this.pagination.size
@@ -2423,11 +3165,7 @@
         case '0':
           return '在职'
         case '1':
-          return '正常离职'
-        case '2':
-          return '自动离职'
-        case '3':
-          return '公司辞退'
+          return '离职'
       }
     },
     transLeaveType(leaveType) {
@@ -2439,6 +3177,10 @@
         case '3':
           return '调休假'
       }
+    },
+    transDimissionDate(val) {
+      var dimissDate = new Date(val)
+      return dimissDate.getFullYear() === 1900 ? '' : val
     },
     transPhysicalExamType(physicalExamType) {
       switch (physicalExamType) {
@@ -2540,34 +3282,56 @@
         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;
-}
+  #dcygTable {
+    border-collapse: collapse;
+    tr {
+      width: 100%;
+      border-bottom: 1px dashed #ccc;
+      >td:nth-child(even) {
+        width: 100px;
+        text-align: left;
+      }
+    }
 
-#dcygTable td {
-  width: 130px;
-  text-align: center;
-  border: 1px solid darkgray;
-  height: 30px;
-  font-size: 15px;
-}
+  }
+
+  #dcygTable td {
+    width: 160px;
+    text-align: center;
+    height: 35px;
+    line-height: 35px;
+    font-size: 15px;
+    font-weight: 400;
+  }
   .el-container {
     height: 86.7vh;
     background-color: white;
@@ -2590,32 +3354,28 @@
     }
   }
 
- .searchTable {
-   margin-top: 10px;
-   border-collapse: collapse;
-   width: 100%;
-   tr {
-     border-bottom: 1px dashed #d9dadb;
-   }
+  .searchTable {
+    margin-top: 10px;
+    border-collapse: collapse;
+    width: 100%;
+    tr {
+      border-bottom: 1px dashed #d9dadb;
+    }
 
-  .td {
-    width: 90px;
-    text-align: right;
+    .td {
+      width: 90px;
+      text-align: right;
+    }
+    .td-group {
+      padding-left: 20px;
+    }
   }
-  .td-group {
-	padding-left: 20px;
-  }
-}
 
   .searchTable td,
   .searchTable th {
     color: #000;
     height: 50px;
     background-color: #fff;
-  }
-
-  .searchTable tr td:first-child {
-    background-color: #dddcdc !important;
   }
 
   .button-from {
@@ -2663,31 +3423,31 @@
     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;
-}
+  .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;
-}
+  .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