From a7977aac3851fa49a83f0a389221e6b3825dcb0b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 22 四月 2024 19:11:48 +0800
Subject: [PATCH] feat: 将劳资案件改为仲裁案件

---
 src/views/user/search.vue |  492 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 314 insertions(+), 178 deletions(-)

diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 7942bd4..0fa493a 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -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,7 +59,7 @@
               <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>
@@ -193,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>
@@ -235,13 +235,39 @@
               </tr>
               <tr>
                 <td class="td">入离职类型:</td>
-                <td class="td-group" />
+                <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>
             <el-col :span="21" style="line-height: 50px;">
-              已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
+              已为您搜索出<span style="color:#ff0000">{{ total }}</span>条符合条件的记录
             </el-col>
             <el-col :span="3" style="text-align: right;padding-right: 10px">
               <el-button class="hr-but-all" type="success" @click.native="showDcyg(0)">
@@ -257,28 +283,35 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 100%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="sex" label="性别" width="60" :formatter="sexFormat" />
-            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
-            <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
+            <el-table-column show-overflow-tooltip prop="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="education" label="学历" width="100" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" width="80" :formatter="nativePlaceFormat" />
             <el-table-column show-overflow-tooltip prop="empType" label="员工类型" width="100" :formatter="empTypeFormat" />
             <el-table-column show-overflow-tooltip prop="telePhone" label="电话" width="120" />
-            <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
+            <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
               <template slot-scope="{row}">
                 {{ transEmpStatus(row.empStatus) }}
               </template>
             </el-table-column>
-            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" />
-            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" />
+            <el-table-column show-overflow-tooltip prop="dimissionType" label="入离职类型" width="120" :formatter="dimissionTypFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
+              <template slot-scope="{row}">
+                {{ transDimissionDate(row.dimissionDate) }}
+              </template>
+            </el-table-column>
           </el-table>
-          <el-dialog title="导出员工    请勾选需要导出的字段" :visible.sync="dialogShowDcyg" width="40%">
+          <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;">
@@ -304,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>
@@ -400,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>
@@ -424,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>
@@ -442,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>
@@ -508,14 +559,15 @@
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             :data="workExperienceData"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="220" />
-            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" :formatter="sexFormat" />
+            <el-table-column show-overflow-tooltip prop="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" />
+            <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>
@@ -554,8 +606,12 @@
           <el-row style="margin-bottom: 10px;">
             <el-col :span="4">体检类型:
               <el-select v-model="queryParams.physicalExamType" style="width:140px">
-                <el-option value="1" label="入职体检" />
-                <el-option value="2" label="员工体检" />
+                <el-option
+                  v-for="dict in physicalExamTypeOptions"
+                  :key="dict.dicItemCode"
+                  :label="dict.dicItemName"
+                  :value="dict.dicItemCode"
+                />
               </el-select>
             </el-col>
             <el-col :span="4">心电图:
@@ -605,16 +661,17 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" />
             <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="100" />
-            <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+            <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="100" :formatter="typeFormat" />
             <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="80" />
             <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
@@ -674,10 +731,16 @@
             <el-col :span="9">合同状态:
               <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">
@@ -714,18 +777,20 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="160" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <!-- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="180" /> -->
-            <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="180" />
-            <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="180" />
+            <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
             <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="120" :formatter="contractStatusFormat" />
             <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="180" />
+            <el-table-column show-overflow-tooltip prop="remark" label="备注" width="180" />
           </el-table>
         </div>
 
@@ -808,13 +873,14 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-            <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="120" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
             <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班(天)" width="100" />
             <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班(小时)" width="120" />
@@ -823,9 +889,9 @@
             <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工(天)" width="100" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" />
 
-            <!-- <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位名称" width="180" />
-            <el-table-column prop="empName" label="员工姓名" width="180" />
+            <!-- <el-table-column prop="allDeptName" label="护卫点" width="180" />
+            <el-table-column prop="jobName" label="岗位" width="180" />
+            <el-table-column prop="empName" label="姓名" width="180" />
             <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="180" /> -->
           </el-table>
@@ -864,21 +930,28 @@
             </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">
@@ -916,17 +989,18 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-            <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" />
-            <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
-            <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="100" :formatter="leaveTypeFormat" />
-            <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="150" />
+            <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="120" :formatter="leaveTypeFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" />
           </el-table>
@@ -963,7 +1037,6 @@
             </el-col>
           </el-row>
           <el-row>
-
             <el-col :span="6">辞职事由:
               <el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:262px" />
             </el-col>
@@ -1001,14 +1074,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-            <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="160" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" />
             <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -1083,14 +1157,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-            <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="180" />
             <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
             <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
@@ -1131,12 +1206,12 @@
           <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">
@@ -1173,14 +1248,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="150" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-            <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="100" />
             <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" width="100" :formatter="insuranceGaersFormat" />
             <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
@@ -1287,14 +1363,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
-            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
             <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
             <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
@@ -1415,14 +1492,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
-            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
             <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
             <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
@@ -1435,7 +1513,6 @@
             <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
             <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
             <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
-            <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
             <el-table-column show-overflow-tooltip prop="hrDoDate" label="人事处理时间" width="120" />
             <el-table-column show-overflow-tooltip prop="settleStatus" label="状态" width="80" :formatter="settleStatusFormat" />
             <el-table-column show-overflow-tooltip prop="settleDate" label="结案时间" width="100" />
@@ -1530,20 +1607,21 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" width="100" :formatter="arbitrationTypeFormat" />
             <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
             <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" />
             <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付(元)" width="120" />
             <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
-            <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" />
+            <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
           </el-table></div>
 
         <div v-show="showArr[12].show">
@@ -1614,14 +1692,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
-            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="140" />
-            <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" width="300" />
             <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" />
 
@@ -1639,7 +1718,7 @@
               <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
             </el-col>
             <el-col :span="4">(部门)护卫点:
-              <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
+              <el-input v-model="queryParams.allDeptName" size="small" maxlength="20" style="width:100px" />
             </el-col>
             <el-col :span="9">备注日期:
               <el-date-picker
@@ -1695,13 +1774,14 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
-            <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="220" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="140" />
             <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
-            <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+            <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
           </el-table>
         </div>
@@ -1780,17 +1860,19 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="selection" width="55" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <!-- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" /> -->
-            <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+            <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
-            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
-            <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" />
-            <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" />
-            <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
+            <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="changeTypeName" label="调岗类型" />
+            <!--            <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />-->
             <el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由描述" width="380" />
           </el-table>
         </div>
@@ -1840,7 +1922,7 @@
                 style="width: 350px;"
               />
             </el-col>
-            <el-col :span="4">离职类型:
+            <el-col :span="4">入离职类型:
               <el-select v-model="queryParams.dimissionType" style="width:150px">
                 <el-option
                   v-for="dict in dimissionTypeOptions"
@@ -1884,14 +1966,15 @@
             :cell-style="{padding:'7px 0','text-align':'center'}"
             :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
             style="width: 100%;height: 70%;"
+            @sort-change="changeSort"
           >
             <el-table-column type="selection" width="55" />
-            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
-            <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="200" />
+            <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="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" />
-            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
-            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
+            <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+            <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
             <el-table-column show-overflow-tooltip prop="selfLeaveDay" label="自离天数" />
             <el-table-column show-overflow-tooltip prop="reporter" label="报告人" />
             <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
@@ -1917,13 +2000,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: [],
@@ -1932,7 +2016,15 @@
         archivesStatus: [],
         insuranceType: [],
         empStatus: [],
-        empType: []
+        empType: [],
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        certificateNumb: '',
+        jobContent: '',
+        inOutType: [],
+        certificateList: [],
+        deptName: ''
       }, // 查询参数
       sort: {}, // 排序
       pagination: { // 分页参数
@@ -2288,7 +2380,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 => {
@@ -2377,6 +2469,14 @@
     arbitrationStatusFormat(row, column) {
       return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
     },
+    dimissionTypFormat(row, column) {
+      switch (row.empStatus) {
+        case '0':
+          return row.entryTypeName
+        case '1':
+          return row.dimissionTypeName
+      }
+    },
     handleCheckedCitiesChange(value) {
       const checkedCount = value.length
       this.checkAll = checkedCount === this.cityOptions.length
@@ -2409,18 +2509,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
@@ -2440,10 +2549,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() {
@@ -2474,147 +2581,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) {
@@ -2622,6 +2738,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 = {}) {
@@ -2706,7 +2829,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
@@ -2741,11 +2864,7 @@
         case '0':
           return '在职'
         case '1':
-          return '正常离职'
-        case '2':
-          return '自动离职'
-        case '3':
-          return '公司辞退'
+          return '离职'
       }
     },
     transLeaveType(leaveType) {
@@ -2757,6 +2876,10 @@
         case '3':
           return '调休假'
       }
+    },
+    transDimissionDate(val) {
+      var dimissDate = new Date(val)
+      return dimissDate.getFullYear() === 1900 ? '' : val
     },
     transPhysicalExamType(physicalExamType) {
       switch (physicalExamType) {
@@ -2858,6 +2981,18 @@
         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()
     }
   }
 }
@@ -2891,9 +3026,10 @@
   #dcygTable td {
     width: 160px;
     text-align: center;
-    height: 36px;
-    line-height: 36px;
+    height: 35px;
+    line-height: 35px;
     font-size: 15px;
+    font-weight: 400;
   }
   .el-container {
     height: 86.7vh;

--
Gitblit v1.8.0