From d6f69af30f85add247d5e7e2ee8a9c1b7368d6cf Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期六, 20 二月 2021 12:02:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/user/search.vue | 1091 +++++++++++++++++++++++++++------------------------------
 1 files changed, 518 insertions(+), 573 deletions(-)

diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 71ba630..cadbb94 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -44,112 +44,129 @@
           </el-timeline-item>
           <el-timeline-item @click.native="isShow(showArr[13].show, 13)">
             <span :class="thisShowIndex===13?'selectedTimeline':''">备注信息</span>
+          </el-timeline-item>
+          <el-timeline-item @click.native="isShow(showArr[14].show, 14)">
+            <span :class="thisShowIndex===14?'selectedTimeline':''">调岗记录</span>
+          </el-timeline-item>
+          <el-timeline-item @click.native="isShow(showArr[15].show, 15)">
+            <span :class="thisShowIndex===15?'selectedTimeline':''">入离职记录</span>
           </el-timeline-item>
         </el-timeline>
       </el-aside>
       <el-main>
         <div v-show="showArr[0].show">
           <el-row>
-            <el-col :span="3">员工编号:
-              <el-input v-model="queryParams.empNumb" size="small" maxlength="20" style="width:85px" />
+            <el-col :span="17">
+              <br>
             </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.entryDateStr"
-                size="small"
-                type="daterange"
-                align="right"
-                unlink-panels
-                range-separator="至"
-                value-format="yyyy-MM-dd"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :picker-options="pickerOptions"
-                style="width: 400px;"
-              />
+            <el-col :span="7">
+              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
+              <el-button type="primary" @click="vagueSearch">查询</el-button>
+              <el-button type="danger" @click="advancedQueryShowMethods">高级查询</el-button>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="9">离职日期:
-              <el-date-picker
-                v-model="queryParams.dimissionDateStr"
-                size="small"
-                type="daterange"
-                align="right"
-                unlink-panels
-                range-separator="至"
-                value-format="yyyy-MM-dd"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :picker-options="pickerOptions"
-                style="width: 400px;"
-              />
-            </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>
-          <table class="searchTable">
-            <tr>
-              <td>性别:</td>
-              <td>
-                <el-radio-group v-model="queryParams.sex">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio label="1">男性</el-radio>
-                  <el-radio label="2">女性</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>最高学历:</td>
-              <td>
-                <el-radio-group v-model="queryParams.education">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio label="91">无学历</el-radio>
-                  <el-radio label="81">小学</el-radio>
-                  <el-radio label="71">初中</el-radio>
-                  <el-radio label="61">高中</el-radio>
-                  <el-radio label="42">中技</el-radio>
-                  <el-radio label="41">中专</el-radio>
-                  <el-radio label="31">大学专科</el-radio>
-                  <el-radio label="21">大学本科</el-radio>
-                  <el-radio label="11">硕士</el-radio>
-                  <el-radio label="10">博士</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>政治面貌:</td>
-              <td>
-                <el-radio-group v-model="queryParams.politics">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio label="01">中共党员</el-radio>
-                  <el-radio label="02">预备党员</el-radio>
-                  <el-radio label="03">共青团员</el-radio>
-                  <el-radio label="04">民革会员</el-radio>
-                  <el-radio label="05">民盟盟员</el-radio>
-                  <el-radio label="06">民建会员</el-radio>
-                  <el-radio label="07">民进会员</el-radio>
-                  <el-radio label="08">农工党员</el-radio>
-                  <el-radio label="09">致公党员</el-radio>
-                  <el-radio label="10">九三社员</el-radio>
-                  <el-radio label="11">台盟盟员</el-radio>
-                  <el-radio label="12">民主人士</el-radio>
-                  <el-radio label="13">群众</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <!-- <tr>
+          <div v-show="advancedQueryShow">
+            <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.entryDateStr"
+                  size="small"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  value-format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
+                  style="width: 400px;"
+                />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="9">离职日期:
+                <el-date-picker
+                  v-model="queryParams.dimissionDateStr"
+                  size="small"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  value-format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
+                  style="width: 400px;"
+                />
+              </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>
+            <table class="searchTable">
+              <tr>
+                <td>性别:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.sex">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio label="1">男性</el-radio>
+                    <el-radio label="2">女性</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+              <tr>
+                <td>最高学历:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.education">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio label="91">无学历</el-radio>
+                    <el-radio label="81">小学</el-radio>
+                    <el-radio label="71">初中</el-radio>
+                    <el-radio label="61">高中</el-radio>
+                    <el-radio label="42">中技</el-radio>
+                    <el-radio label="41">中专</el-radio>
+                    <el-radio label="31">大学专科</el-radio>
+                    <el-radio label="21">大学本科</el-radio>
+                    <el-radio label="11">硕士</el-radio>
+                    <el-radio label="10">博士</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+              <tr>
+                <td>政治面貌:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.politics">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio label="01">中共党员</el-radio>
+                    <el-radio label="02">预备党员</el-radio>
+                    <el-radio label="03">共青团员</el-radio>
+                    <el-radio label="04">民革会员</el-radio>
+                    <el-radio label="05">民盟盟员</el-radio>
+                    <el-radio label="06">民建会员</el-radio>
+                    <el-radio label="07">民进会员</el-radio>
+                    <el-radio label="08">农工党员</el-radio>
+                    <el-radio label="09">致公党员</el-radio>
+                    <el-radio label="10">九三社员</el-radio>
+                    <el-radio label="11">台盟盟员</el-radio>
+                    <el-radio label="12">民主人士</el-radio>
+                    <el-radio label="13">群众</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+              <!-- <tr>
               <td>入职日期:</td>
               <td>
                 <el-radio-group v-model="radio">
@@ -157,82 +174,71 @@
                 </el-radio-group>
               </td>
             </tr> -->
-            <tr>
-              <td>年龄:</td>
-              <td>
-                <el-radio-group v-model="queryParams.ageStr">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio label="18-29">18-29</el-radio>
-                  <el-radio label="30-39">30-39</el-radio>
-                  <el-radio label="40-49">40-49</el-radio>
-                  <el-radio label="50-59">50-59</el-radio>
-                  <el-radio label="60-69">60-69</el-radio>
-                  <el-radio label="69-999">69及以上</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>档案情况:</td>
-              <td>
-                <el-radio-group v-model="queryParams.archivesStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio label="0">已移交</el-radio>
-                  <el-radio label="1">未移交</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>保险类型:</td>
-              <td>
-                <el-radio-group v-model="queryParams.insuranceType">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">深户(五险一档)</el-radio>
-                  <el-radio :label="2">非深户(五险一档)</el-radio>
-                  <el-radio :label="3">非深户(五险二档)</el-radio>
-                  <el-radio :label="4">非深户(五险三档)</el-radio>
-                  <el-radio :label="5">非深户(四险三档)</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
+              <tr>
+                <td>年龄:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.ageStr">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio label="18-29">18-29</el-radio>
+                    <el-radio label="30-39">30-39</el-radio>
+                    <el-radio label="40-49">40-49</el-radio>
+                    <el-radio label="50-59">50-59</el-radio>
+                    <el-radio label="60-69">60-69</el-radio>
+                    <el-radio label="69-999">69及以上</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+              <tr>
+                <td>档案情况:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.archivesStatus">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio label="0">已移交</el-radio>
+                    <el-radio label="1">未移交</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+              <tr>
+                <td>保险类型:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.insuranceType">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio :label="1">深户(五险一档)</el-radio>
+                    <el-radio :label="2">非深户(五险一档)</el-radio>
+                    <el-radio :label="3">非深户(五险二档)</el-radio>
+                    <el-radio :label="4">非深户(五险三档)</el-radio>
+                    <el-radio :label="5">非深户(四险三档)</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+              <tr>
+                <td>员工状态:</td>
+                <td>
+                  <el-radio-group v-model="queryParams.empStatus">
+                    <el-radio label="">全部</el-radio>
+                    <el-radio :label="1">在职</el-radio>
+                    <el-radio :label="2">正常离职</el-radio>
+                    <el-radio :label="3">自动离职</el-radio>
+                    <el-radio :label="4">公司辞退</el-radio>
+                  </el-radio-group>
+                </td>
+              </tr>
+            </table>
+          </div>
           <el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="" label="照片" width="60" />
-            <el-table-column prop="empNumb" label="员工编号" width="100" />
-            <el-table-column prop="empName" label="姓名" width="100" />
-            <el-table-column prop="deptName" label="护卫点" width="100" />
-            <el-table-column prop="jobName" label="岗位" width="100" />
-            <el-table-column prop="empTypeName" label="员工类别" width="100" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="empNumb" label="员工编号" />
+            <el-table-column prop="deptName" label="护卫点" />
+            <el-table-column prop="jobName" label="岗位" />
+            <el-table-column prop="empName" label="姓名" />
+            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column prop="sexName" label="性别" width="50" />
-            <el-table-column prop="nationName" label="民族" width="100" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="marriageName" label="婚姻状况" width="80" />
-            <el-table-column prop="politicsName" label="政治面貌" width="100" />
-            <el-table-column prop="educationName" label="最高学历" width="100" />
-            <el-table-column prop="entryDate" label="入职日期" width="100" />
-            <el-table-column prop="insuranceType" label="保险类型" width="100" />
-            <el-table-column prop="socialNumb" label="社保电脑号" width="150" />
-            <el-table-column prop="guardNumb" label="保安员证号" width="100" />
-            <el-table-column prop="archivesNumb" label="档案编号" width="100" />
-            <el-table-column prop="archivesStatusName" label="档案情况" width="100" />
+            <el-table-column prop="educationName" label="学历" />
+            <el-table-column prop="nativePlace" label="籍贯" />
+            <el-table-column prop="telePhone" label="电话" />
+            <el-table-column prop="empStatus" label="员工状态" />
+            <el-table-column prop="entryDate" label="入职日期" />
+            <el-table-column prop="dimissionDate" label="离职日期" />
           </el-table>
         </div>
 
@@ -246,15 +252,9 @@
             </el-col>
             <el-col :span="4">身份证号:
               <el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
-            </el-col>
-            <el-col :span="5">员工状态:
-              <el-select v-model="queryParams.empStatus" style="width:100px">
-                <el-option label="全部" value="" />
-                <el-option label="在职" value="1" />
-                <el-option label="离职" value="2" />
-                <el-option label="自动离职" value="3" />
-                <el-option label="公司辞退" value="4" />
-              </el-select>
+            </el-col>
+            <el-col :span="5">主要工作类容:
+              <el-input v-model="queryParams.jobContent" size="small" maxlength="18" style="width:140px" />
             </el-col>
             <el-col :span="3">
               <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
@@ -262,19 +262,14 @@
             </el-col>
           </el-row>
           <el-table ref="workExperienceTable" :data="workExperienceData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editWorkExperience(scope.row)">编辑
-                </el-button>
-              </template>
-            </el-table-column>
-            <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="workUnit" label="工作单位" width="180" />
-            <el-table-column prop="beginDate" label="开始日期" width="180" />
-            <el-table-column prop="endDate" label="结束日期" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="empNumb" label="员工编号" />
+            <el-table-column prop="empName" label="员工姓名" />
+            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+            <el-table-column prop="sex" label="性别" width="50" />
+            <el-table-column prop="workUnit" label="工作单位" />
+            <el-table-column prop="beginDate" label="开始日期" />
+            <el-table-column prop="endDate" label="结束日期" />
             <el-table-column prop="jobContent" label="主要工作内容" width="180" />
           </el-table>
         </div>
@@ -293,7 +288,7 @@
             <el-col :span="3">护卫点:
               <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
             </el-col>
-            <el-col :span="8">体检日期:
+            <el-col :span="9">体检日期:
               <el-date-picker
                 v-model="queryParams.physicalExamDateStr"
                 size="small"
@@ -307,58 +302,43 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <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>
+            </el-col>
+            <el-col :span="4">心电图:
+              <el-select v-model="queryParams.ecg" style="width:100px">
+                <el-option label="正常" value="1" />
+                <el-option label="异常" value="0" />
+              </el-select>
+            </el-col>
+            <el-col :span="3">体检结论:
+              <el-input v-model="queryParams.conclusion" size="small" maxlength="20" style="width:100px" />
             </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>
-          <table class="searchTable">
-            <tr>
-              <td>体检类型:</td>
-              <td>
-                <el-radio-group v-model="queryParams.physicalExamType">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">入职体检</el-radio>
-                  <el-radio :label="2">员工体检</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="physicalExamTable" :data="physicalExamData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editPhysicalExam(scope.row)">编辑
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="empName" label="员工姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
-            <el-table-column prop="jobName" label="岗位" width="180" />
-            <el-table-column prop="hospital" label="体检医院" width="180" />
-            <el-table-column prop="physicalExamDate" label="体检日期" width="180" />
-            <el-table-column prop="physicalExamType" label="体检类型" width="180" />
-            <el-table-column prop="bloodPressure" label="血压" width="180" />
-            <el-table-column prop="transaminase" label="转氨酶" width="180" />
-            <el-table-column prop="ecg" label="心电图" width="180" />
-            <el-table-column prop="conclusion" label="体检结论" width="180" />
-            <el-table-column prop="reviewRecord" label="复查记录" width="180" />
-            <el-table-column prop="remark" label="备注" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="deptName" label="护卫点" />
+            <el-table-column prop="empNumb" label="员工编号" />
+            <el-table-column prop="empName" label="员工姓名" />
+            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+            <el-table-column prop="sex" label="性别" width="50" />
+            <el-table-column prop="hospital" label="体检医院" />
+            <el-table-column prop="physicalExamDate" label="体检日期" />
+            <el-table-column prop="physicalExamType" label="体检类型" />
+            <el-table-column prop="bloodPressure" label="血压" />
+            <el-table-column prop="transaminase" label="转氨酶" />
+            <el-table-column prop="ecg" label="心电图" />
+            <el-table-column prop="conclusion" label="体检结论" />
+            <el-table-column prop="reviewRecord" label="复查记录" />
+            <el-table-column prop="remark" label="备注" />
           </el-table>
         </div>
 
@@ -407,46 +387,23 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="9">合同状态:
+              <el-select v-model="queryParams.contractStatus" 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-select>
             </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>合同状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.contractStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">有效</el-radio>
-                  <el-radio :label="2">到期</el-radio>
-                  <el-radio :label="3">续签</el-radio>
-                  <el-radio :label="4">存档</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="contractInfoTable" :data="contractInfoData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editContractInfo(scope.row)">编辑
-                </el-button>
-              </template>
-            </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位" width="180" />
@@ -495,43 +452,21 @@
                 <el-option label="2" value="2" />
                 <el-option label="1" value="1" />
               </el-select>
+            </el-col>
+            <el-col :span="5">有无代扣款项:
+              <el-select v-model="queryParams.deductStr" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option :value="1" label="有代扣项" />
+                <el-option :value="2" label="无代扣项" />
+              </el-select>
             </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>有无代扣款项:</td>
-              <td>
-                <el-radio-group v-model="queryParams.deductStr">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">有代扣项</el-radio>
-                  <el-radio :label="2">无代扣项</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="dimissionAttendTable" :data="dimissionAttendData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editDimissionAttend(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位名称" width="180" />
@@ -576,44 +511,22 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="4">请假类型:
+              <el-select v-model="queryParams.leaveType" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option value="1" label="事假" />
+                <el-option value="2" label="病假" />
+                <el-option value="3" label="调休假" />
+              </el-select>
             </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>请假类型:</td>
-              <td>
-                <el-radio-group v-model="queryParams.leaveType">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">事假</el-radio>
-                  <el-radio :label="2">病假</el-radio>
-                  <el-radio :label="3">调休假</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editLeaveInfo(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位名称" width="180" />
@@ -657,6 +570,9 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="4">辞职事由:
+              <el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:140px" />
             </el-col>
             <el-col :span="4">
               <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
@@ -664,12 +580,7 @@
             </el-col>
           </el-row>
           <el-table ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editResign(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位名" width="180" />
             <el-table-column prop="empNumb" label="员工编号" width="180" />
@@ -710,6 +621,9 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="4">申报事由:
+              <el-input v-model="queryParams.applayReason" size="small" maxlength="20" style="width:100px" />
             </el-col>
             <el-col :span="4">
               <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
@@ -717,15 +631,10 @@
             </el-col>
           </el-row>
           <el-table ref="unemploymentTable" :data="unemploymentData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editUnemployment(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位名称" width="180" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="empName" label="姓名" width="180" />
             <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column prop="applayDate" label="失业金申请日期" width="180" />
@@ -750,7 +659,7 @@
             <el-col :span="3">护卫点:
               <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
             </el-col>
-            <el-col :span="9">入职日期:
+            <el-col :span="9">社保申请日期:
               <el-date-picker
                 v-model="queryParams.applayDateStr"
                 size="small"
@@ -764,61 +673,28 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <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-select>
             </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>社保档位:</td>
-              <td>
-                <el-radio-group v-model="queryParams.insuranceGaers">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">深户(五险一档)</el-radio>
-                  <el-radio :label="2">非深户(五险一档)</el-radio>
-                  <el-radio :label="3">非深户(五险二档)</el-radio>
-                  <el-radio :label="4">非深户(五险三档)</el-radio>
-                  <el-radio :label="5">非深户(四险三档)</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>是否已报告:</td>
-              <td>
-                <el-radio-group v-model="queryParams.reportStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="0">已报告</el-radio>
-                  <el-radio :label="1">未报告</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editInsurance(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位名称" width="180" />
-            <el-table-column prop="empName" label="姓名" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
+            <el-table-column prop="empName" label="姓名" width="180" />
             <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+            <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="applayDate" label="社保申请日期" width="180" />
             <el-table-column prop="proposer" label="申请人" width="180" />
             <el-table-column prop="insuranceGaers" label="社保档位" width="180" />
@@ -872,53 +748,28 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="4">是否住院:
+              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option value="1" label="是" />
+                <el-option value="2" label="否" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">案结状态:
+              <el-select v-model="queryParams.settleStatus" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option value="1" label="已结案" />
+                <el-option value="0" label="未结案" />
+              </el-select>
             </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>是否住院:</td>
-              <td>
-                <el-radio-group v-model="queryParams.hospitalizatioFlag">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">是</el-radio>
-                  <el-radio :label="0">否</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>案结状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.settleStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">已结案</el-radio>
-                  <el-radio :label="0">未结案</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="accidentCasesTable" :data="accidentCasesData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editAccidentCases(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位名称" width="180" />
@@ -984,56 +835,31 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="4">是否住院:
+              <el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option value="1" label="是" />
+                <el-option value="2" label="否" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">案结状态:
+              <el-select v-model="queryParams.settleStatus" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option value="1" label="已结案" />
+                <el-option value="0" label="未结案" />
+              </el-select>
             </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>是否住院:</td>
-              <td>
-                <el-radio-group v-model="queryParams.hospitalizatioFlag">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">是</el-radio>
-                  <el-radio :label="0">否</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>案结状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.settleStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">已结案</el-radio>
-                  <el-radio :label="0">未结案</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="occupationalTable" :data="occupationalData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editOccupational(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
-            <el-table-column prop="deptName" label="护卫点" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
+            <el-table-column prop="deptName" label="护卫点" width="180" />
             <el-table-column prop="jobName" label="岗位" width="180" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="empName" label="姓名" width="180" />
             <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column prop="injuredTime" label="受伤日期" width="180" />
@@ -1082,77 +908,39 @@
                 style="width: 400px;"
               />
             </el-col>
-            <el-col :span="9">案结日期:
-              <el-date-picker
-                v-model="queryParams.settleDateStr"
-                size="small"
-                type="daterange"
-                align="right"
-                unlink-panels
-                range-separator="至"
-                value-format="yyyy-MM-dd"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :picker-options="pickerOptions"
-                style="width: 400px;"
-              />
-            </el-col>
+            <el-col :span="4">仲裁类型:
+              <el-select v-model="queryParams.arbitrationType" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option label="劳资纠纷" value="01" />
+                <el-option label="民事纠纷" value="02" />
+                <el-option label="合同纠纷" value="03" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">仲裁事由:
+              <el-input v-model="queryParams.arbitrationReason" size="small" maxlength="18" style="width:140px" />
+            </el-col>
+            <el-col :span="4">案结状态:
+              <el-select v-model="queryParams.arbitrationStatus" style="width:100px">
+                <el-option value="" label="全部" />
+                <el-option value="1" label="已结案" />
+                <el-option value="0" label="未结案" />
+              </el-select>
+            </el-col>
             <el-col :span="4">
               <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>
-          <table class="searchTable">
-            <tr>
-              <td>仲裁类型:</td>
-              <td>
-                <el-radio-group v-model="queryParams.arbitrationType">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="0">劳资纠纷</el-radio>
-                  <el-radio :label="1">劳资纠纷</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>仲裁状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.arbitrationStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">已结案</el-radio>
-                  <el-radio :label="0">未结案</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td>员工状态:</td>
-              <td>
-                <el-radio-group v-model="queryParams.empStatus">
-                  <el-radio label="">全部</el-radio>
-                  <el-radio :label="1">在职</el-radio>
-                  <el-radio :label="2">正常离职</el-radio>
-                  <el-radio :label="3">自动离职</el-radio>
-                  <el-radio :label="4">公司辞退</el-radio>
-                </el-radio-group>
-              </td>
-            </tr>
-          </table>
           <el-table ref="laborTroubleTable" :data="laborTroubleData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editLaborTrouble(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位" width="180" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="empName" label="姓名" width="180" />
             <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
-            <el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
             <el-table-column prop="arbitrationType" label="仲裁类型" width="180" />
             <el-table-column prop="arbitrationReason" label="仲裁事由" width="180" />
-            <el-table-column prop="reporter" label="报备人" width="180" />
+            <el-table-column prop="reporter" label="汇报人" width="180" />
             <el-table-column prop="remark" label="备注" width="180" />
             <el-table-column prop="arbitrationPay" label="仲裁赔付(元)" width="180" />
             <el-table-column prop="arbitrationStatus" label="状态" width="180" />
@@ -1188,6 +976,9 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="5">不良记录描述:
+              <el-input v-model="queryParams.badContent" size="small" maxlength="18" style="width:140px" />
             </el-col>
             <el-col :span="3.5">
               <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
@@ -1195,16 +986,9 @@
             </el-col>
           </el-row>
           <el-table ref="badRecordTable" :data="badRecordData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editBadRecord(scope.row)">编辑
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位" width="180" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="empName" label="姓名" width="180" />
             <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column prop="badDate" label="不良记录日期" width="180" />
@@ -1242,6 +1026,9 @@
                 :picker-options="pickerOptions"
                 style="width: 400px;"
               />
+            </el-col>
+            <el-col :span="4">备注信息:
+              <el-input v-model="queryParams.remarkContent" size="small" maxlength="18" style="width:140px" />
             </el-col>
             <el-col :span="3.5">
               <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
@@ -1249,20 +1036,138 @@
             </el-col>
           </el-row>
           <el-table ref="remarkInfoTable" :data="remarkInfoData" style="width: 100%;height: 70%;">
-            <el-table-column type="selection" width="55" />
-            <el-table-column fixed="left" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="editRemarkInfo(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="empNumb" label="员工编号" width="180" />
+            <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="deptName" label="护卫点" width="180" />
-            <el-table-column prop="jobName" label="岗位" width="180" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
             <el-table-column prop="empName" label="姓名" width="180" />
-            <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
             <el-table-column prop="remarkDate" label="备注日期" width="180" />
             <el-table-column prop="remarkContent" label="备注信息" width="400" />
           </el-table>
+        </div>
+        <div v-show="showArr[14].show">
+          <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.changeDateStr"
+                size="small"
+                type="daterange"
+                align="right"
+                unlink-panels
+                range-separator="至"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+                style="width: 400px;"
+              />
+            </el-col>
+            <el-col :span="3">调岗类型:
+              <el-select v-model="queryParams.changeType" style="width:100px">
+                <el-option label="全部" value="" />
+                <el-option label="升职" value="2" />
+                <el-option label="调动" value="3" />
+              </el-select>
+            </el-col>
+            <el-col :span="3.5">
+              <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-table ref="jobChangeTable" :data="jobChangeData" style="width: 100%;height: 70%;">
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
+            <el-table-column prop="newDeptName" label="现部门" />
+            <el-table-column prop="newJobName" label="现岗位" />
+            <el-table-column prop="empName" label="姓名" width="180" />
+            <el-table-column prop="oldDeptName" label="原部门" />
+            <el-table-column prop="oldJobName" label="原岗位" />
+            <el-table-column prop="changeDate" label="调岗日期" />
+            <el-table-column prop="changeType" label="调岗类型" />
+          </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-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.entryDateStr"
+                size="small"
+                type="daterange"
+                align="right"
+                unlink-panels
+                range-separator="至"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+                style="width: 400px;"
+              />
+            </el-col>
+            <el-col :span="9">离职日期:
+              <el-date-picker
+                v-model="queryParams.dimissionDateStr"
+                size="small"
+                type="daterange"
+                align="right"
+                unlink-panels
+                range-separator="至"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+                style="width: 400px;"
+              />
+            </el-col>
+            <el-col :span="3">离职类型:
+              <el-select v-model="queryParams.dimissionType" style="width:100px">
+                <el-option label="全部" value="" />
+                <el-option label="正常离职" value="1" />
+                <el-option label="自动离职" value="2" />
+                <el-option label="公司劝退" value="3" />
+                <el-option label="公司辞退" value="4" />
+                <el-option label="试用期内" value="5" />
+              </el-select>
+            </el-col>
+            <el-col :span="3.5">
+              <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-table ref="dimissionLogTable" :data="dimissionLogData" style="width: 100%;height: 70%;">
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="empNumb" label="员工编号" width="180" />
+            <el-table-column prop="newDeptName" label="现部门" />
+            <el-table-column prop="newJobName" label="现岗位" />
+            <el-table-column prop="empName" label="姓名" width="180" />
+            <el-table-column prop="entryDate" label="入职日期" />
+            <el-table-column prop="dimissionDate" label="离职日期" />
+            <el-table-column prop="selfLeaveDay" label="自离天数" />
+            <el-table-column prop="reporter" label="报备人" />
+            <el-table-column prop="remark" label="备注" />
+          </el-table>
         </div>
         <pagination
           v-show="total>0"
@@ -1447,6 +1352,12 @@
       },
       {
         show: false
+      },
+      {
+        show: false
+      },
+      {
+        show: false
       }
       ],
       // eslint-disable-next-line no-undef
@@ -1491,9 +1402,16 @@
       },
       {
         show: false
+      },
+      {
+        show: false
+      },
+      {
+        show: false
       }
       ],
-      isAdd: false,
+      isAdd: false,
+      advancedQueryShow: false,
       physicalExamData: [],
       workExperienceData: [],
       basicInformationData: [],
@@ -1508,7 +1426,9 @@
       occupationalData: [],
       badRecordData: [],
       accidentCasesData: [],
-      dimissionAttendData: [],
+      dimissionAttendData: [],
+      jobChangeData: [],
+      dimissionLogData: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -1549,7 +1469,7 @@
   methods: {
     resetSearch() {
       this.queryParams = {
-        delFlag: 2
+        delFlag: 0
       }
       this.search()
     },
@@ -1570,11 +1490,25 @@
         this.total = data.total
         this[this.tableDataName] = data.rows
       })
+    },
+    vagueSearch() {
+      this.fetch({
+        empNumb: this.queryParams.vague,
+        empName: this.queryParams.vague,
+        deptName: this.queryParams.vague
+      })
     },
     dialogIsShow() {
       this.isAdd = true
       this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
         .show
+    },
+    advancedQueryShowMethods() {
+      if (this.advancedQueryShow) {
+        this.advancedQueryShow = false
+      } else {
+        this.advancedQueryShow = true
+      }
     },
     isShow(tableShow, index) {
       if (index === this.thisShowIndex) {
@@ -1591,90 +1525,101 @@
         case 0:
           this.tableUrl = 'hr/empBaseInfo/list'
           this.tableDataName = 'basicInformationData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 1:
           this.tableUrl = 'hr/empWorkExperience/list'
           this.tableDataName = 'workExperienceData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 2:
           this.tableUrl = 'hr/empPhysicalExam/list'
           this.tableDataName = 'physicalExamData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 3:
           this.tableUrl = 'hr/empContractInfo/list'
           this.tableDataName = 'contractInfoData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 4:
           this.tableUrl = 'hr/empDimissionAttend/list'
           this.tableDataName = 'dimissionAttendData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 5:
           this.tableUrl = 'hr/empLeaveInfo/list'
           this.tableDataName = 'leaveInfoData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 6:
           this.tableUrl = 'hr/empResign/list'
           this.tableDataName = 'resignData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 7:
           this.tableUrl = 'hr/empUnemployment/list'
           this.tableDataName = 'unemploymentData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 8:
           this.tableUrl = 'hr/empInsurance/list'
           this.tableDataName = 'insuranceData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 9:
           this.tableUrl = 'hr/empAccidentCases/list'
           this.tableDataName = 'accidentCasesData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 10:
           this.tableUrl = 'hr/empOccupational/list'
           this.tableDataName = 'occupationalData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 11:
           this.tableUrl = 'hr/empLaborTrouble/list'
           this.tableDataName = 'laborTroubleData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 12:
           this.tableUrl = 'hr/empBadRecord/list'
           this.tableDataName = 'badRecordData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
           break
         case 13:
           this.tableUrl = 'hr/empRemarkInfo/list'
           this.tableDataName = 'remarkInfoData'
-          this.queryParams.delFlag = 2
+          this.queryParams.delFlag = 0
           this.search()
-          break
+          break
+        case 14:
+          this.tableUrl = 'hr/empJobChange/list'
+          this.tableDataName = 'jobChangeData'
+          this.queryParams.delFlag = 0
+          this.search()
+          break
+        case 15:
+          this.tableUrl = 'hr/empDimissionlog/list'
+          this.tableDataName = 'dimissionLogData'
+          this.queryParams.delFlag = 0
+          this.search()
+          break
       }
     }
-
   }
 }
 </script>

--
Gitblit v1.8.0