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/archivesChange.vue |  846 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 522 insertions(+), 324 deletions(-)

diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 9798d61..689b9d8 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -4,6 +4,7 @@
       :title="title"
       width="100%"
       height="100vh"
+      center
       fullscreen="true"
       :close-on-click-modal="false"
       :visible.sync="isVisible"
@@ -26,7 +27,7 @@
             </el-upload>
             <!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
             <div class="title-da">
-              {{ empBaseInfoForm.empNumb }}
+              档案号:{{ empBaseInfoForm.archivesNumb }}
             </div>
           </div>
           <ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -152,7 +153,7 @@
               <div class="item-node" />
               <div>
                 <a href="javascript:void(0)" :class="item=='lzaj'?'light':''" @click="goAnchor('lzaj')">
-                  劳资案件
+                  仲裁案件
                 </a>
               </div>
             </li>
@@ -190,12 +191,12 @@
             <div class="jbxxTitle">
               基本信息
               <el-button
-                style="position:absolute;right: 40px"
+                style="position:absolute;right: 20px"
                 class="filter-item"
                 type="primary"
                 @click="ExportSavePdf"
               >
-                导出
+                导出档案
               </el-button>
             </div>
 
@@ -203,8 +204,8 @@
               <el-form ref="empBaseInfoForm" :model="empBaseInfoForm" class="formjbxx" label-width="150px">
                 <el-row style="width: 100%;">
                   <el-col :span="8">
-                    <el-form-item label="档案号" prop="archivesNumb">
-                      <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
+                    <el-form-item label="编号" prop="empNumb">
+                      <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -212,6 +213,18 @@
                       <el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="身份证号码" prop="certificateNumb">
+                      <el-input
+                        v-model="empBaseInfoForm.certificateNumb"
+                        :disabled="readon ? false : true"
+                        @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
+                      />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="性别" prop="sex">
                       <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
@@ -224,8 +237,6 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="部门(护卫点)" prop="deptId">
                       <treeselect
@@ -251,6 +262,9 @@
                       />
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="员工类别" prop="empType">
                       <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
@@ -263,11 +277,9 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="民族" prop="nation">
-                      <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="readon ? false : true">
+                      <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族" :disabled="readon ? false : true">
                         <el-option
                           v-for="dict in nationOptions"
                           :key="dict.dicItemCode"
@@ -282,6 +294,9 @@
                       <el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="婚姻状态" prop="marriage">
                       <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
@@ -294,8 +309,6 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="身份证有效期" prop="certificateValidity">
                       <el-date-picker
@@ -312,6 +325,9 @@
                       <el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="政治面貌" prop="politics">
                       <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
@@ -324,8 +340,6 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="出生日期" prop="birthdate">
                       <el-date-picker
@@ -349,9 +363,12 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="籍贯" prop="nativePlaceName">
-                      <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="readon ? false : true">
+                      <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择籍贯" :disabled="readon ? false : true">
                         <el-option
                           v-for="dict in nativePlaceOptions"
                           :key="dict.dicItemCode"
@@ -361,8 +378,6 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="户籍地址" prop="censusAddress">
                       <el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true" />
@@ -373,13 +388,14 @@
                       <el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="保安员回执" prop="returnReceipt">
                       <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="保安员证号" prop="guardNumb">
                       <el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true" />
@@ -397,13 +413,14 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="银行名称" prop="bankName">
                       <el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="银行账号" prop="bankNumb">
                       <el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true" />
@@ -414,6 +431,9 @@
                       <el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="入职日期" prop="entryDate">
                       <el-date-picker
@@ -426,11 +446,9 @@
                       />
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
-                    <el-form-item label="保险类型" prop="insuranceType">
-                      <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
+                    <el-form-item label="社保档位" prop="insuranceType">
+                      <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位" :disabled="readon ? false : true">
                         <el-option
                           v-for="dict in insuranceTypeOptions"
                           :key="dict.dicItemCode"
@@ -445,13 +463,14 @@
                       <el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
+
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="招聘介绍人" prop="introducer">
                       <el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row>
                   <el-col :span="8">
                     <el-form-item label="入司工龄" prop="seniority">
                       <el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true" />
@@ -469,15 +488,16 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="家庭成员及关系" prop="family">
-                      <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
-                    </el-form-item>
-                  </el-col>
+
                 </el-row>
                 <el-row>
                   <el-col :span="8">
-                    <el-form-item label="紧急联系电话" prop="urgencyPhone">
+                    <el-form-item label="家庭成员及关系1" prop="family">
+                      <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
                       <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
@@ -494,24 +514,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="相关证件" prop="certificateList">
-                      <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
-                        <el-option
-                          v-for="dict in certificateListOptions"
-                          :key="dict.dicItemCode"
-                          :label="dict.dicItemName"
-                          :value="dict.dicItemCode"
-                        />
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="身份证号码" prop="certificateNumb">
-                      <el-input
-                        v-model="empBaseInfoForm.certificateNumb"
-                        :disabled="readon ? false : true"
-                        @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
-                      />
+                    <el-form-item label="相关证件" prop="certificateListName">
+                      <el-input v-model="empBaseInfoForm.certificateListName" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -529,20 +533,22 @@
                 :key="tableKey"
                 :data="workExperienceData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 :highlight-current-row="true"
                 @selection-change="onworkExperienceDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="workExperienceId" label="工作单位" />
-                <el-table-column show-overflow-tooltip="true" prop="beginDate" label="开始日期" />
-                <el-table-column show-overflow-tooltip="true" prop="endDate" label="结束日期" />
-                <el-table-column show-overflow-tooltip="true" prop="workUnit" label="工作单位" />
-                <el-table-column show-overflow-tooltip="true" prop="jobContent" label="主要工作内容" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="workExperienceId" label="工作单位" />
+                <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" />
+                <el-table-column show-overflow-tooltip prop="endDate" label="结束日期" />
+                <el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" />
+                <el-table-column show-overflow-tooltip prop="jobContent" label="主要工作内容" />
               </el-table>
               <pagination
                 v-show="workExperienceDatatotal>0"
@@ -563,25 +569,27 @@
                 ref="physicalExamTable"
                 :data="physicalExamData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onphysicalExamDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="physicalExamId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="100" :formatter="typeFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="100" :formatter="ecgNameFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
-                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="physicalExamId" label="" />
+                <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="150" />
+                <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140" />
+                <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
+                <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="140" />
+                <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="140" />
+                <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
+                <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" />
+                <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" width="140" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="physicalExamDatatotal>0"
@@ -602,21 +610,24 @@
                 ref="contractInfoTable"
                 :data="contractInfoData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="oncontractInfoDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="contractId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="contractStatus" label="合同状态" width="100" :formatter="contractStatusFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="transactor" label="合同办理人" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="contractId" label="" />
+                <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
+                <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" />
+                <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" />
+                <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
+                <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="contractInfoDatatotal>0"
@@ -636,21 +647,24 @@
                 ref="jobChangeTable"
                 :data="jobChangeData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column show-overflow-tooltip="true" prop="newDeptName" label="现部门" />
-                <el-table-column show-overflow-tooltip="true" prop="newJobName" label="现岗位" />
-                <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="oldDeptName" label="原部门" />
-                <el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位" />
-                <el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗日期" />
-                <el-table-column show-overflow-tooltip="true" prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
+                <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门" />
+                <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="oldDeptName" label="原部门" />
+                <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="changeReason" label="调岗理由" />
               </el-table>
               <pagination
                 v-show="jobChangeDatatotal>0"
@@ -671,23 +685,25 @@
                 ref="leaveInfoTable"
                 :data="leaveInfoData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onleaveInfoDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="leaveId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="beginTime" label="开始时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假天数" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="leaveType" label="请假类型" :formatter="leaveTypeFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="returnDate" label="到岗时间" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="leaveId" label="" />
+                <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="180" />
+                <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="180" />
+                <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
+                <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" :formatter="leaveTypeFormat" />
+                <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="180" />
+                <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="leaveInfoDatatotal>0"
@@ -708,20 +724,22 @@
                 ref="resignTable"
                 :data="resignData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onresignDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="resignId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="resignId" label="" />
+                <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" />
+                <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" />
+                <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="resignDatatotal>0"
@@ -742,24 +760,26 @@
                 ref="dimissionAttendTable"
                 :data="dimissionAttendData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="ondimissionAttendDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="dimissionAttendId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班(天)" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班(小时)" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假(天)" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工(天)" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="dimissionAttendId" label="" />
+                <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" />
+                <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="150" />
+                <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班(天)" width="150" />
+                <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班(小时)" />
+                <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="180" />
+                <el-table-column show-overflow-tooltip prop="leaveDay" label="请假(天)" />
+                <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工(天)" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="dimissionAttendDatatotal>0"
@@ -779,20 +799,23 @@
                 ref="dimissionLogTable"
                 :data="dimissionLogData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>EmpLeaveInfo
                 </el-table-column>
-                <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
-                <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" />
-                <el-table-column show-overflow-tooltip="true" prop="dimissionType" label="离职类型" :formatter="dimissionTypeFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="selfLeaveDay" label="自离天数" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column show-overflow-tooltip prop="deptName" label="部门/护卫点" />
+                <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="dimissionType" label="离职类型" :formatter="dimissionTypeFormat" />
+                <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="备注" />
               </el-table>
               <pagination
                 v-show="dimissionLogDatatotal>0"
@@ -813,21 +836,23 @@
                 ref="unemploymentTable"
                 :data="unemploymentData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onunemploymentDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="unemploymentId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="失业金申请日期" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="applayReason" label="申报事由" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="unemploymentId" label="" />
+                <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
+                <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
+                <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
+                <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="unemploymentDatatotal>0"
@@ -848,23 +873,25 @@
                 ref="insuranceTable"
                 :data="insuranceData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="oninsuranceDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="insuranceId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="applayDate" label="社保申请日期" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="proposer" label="申请人" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="reportStatus" label="是否已报告" :formatter="reportStatusFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="applayStatus" label="状态" :formatter="applayStatusFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="insuranceId" label="" />
+                <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="180" />
+                <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="180" />
+                <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
+                <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" :formatter="reportStatusFormat" />
+                <el-table-column show-overflow-tooltip prop="applayStatus" label="状态" :formatter="applayStatusFormat" />
+                <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="insuranceDatatotal>0"
@@ -885,30 +912,33 @@
                 ref="accidentCasesTable"
                 :data="accidentCasesData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onaccidentCasesDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="accidentId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="意外险诊断" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="60" :formatter="hospitalizatioFlagFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
-                <el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="innsureFee" label="保险赔付费用" width="100" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="accidentId" label="" />
+                <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+                <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
+                <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+                <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
+                <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100" />
+                <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100" />
+                <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
+                <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+                <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+                <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="100" />
+                <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+                <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="100" />
+                <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="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
               </el-table>
               <pagination
                 v-show="accidentCasesDatatotal>0"
@@ -929,30 +959,33 @@
                 ref="occupationalTable"
                 :data="occupationalData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onoccupationalDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="occupationalId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" />
-                <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" />
-                <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
-                <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="100" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="occupationalId" label="" />
+                <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" />
+                <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
+                <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="100" />
+                <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="140" />
+                <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80" />
+                <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="120" />
+                <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
+                <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+                <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="80" />
+                <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="100" />
+                <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+                <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
+                <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+                <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="120" />
+                <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
               </el-table>
               <pagination
                 v-show="occupationalDatatotal>0"
@@ -965,7 +998,7 @@
           </div>
           <div ref="lzaj" class="lzaj">
             <div class="jbxxTitle">
-              劳资案件
+              仲裁案件
             </div>
 
             <div class="jbxxCon">
@@ -973,24 +1006,26 @@
                 ref="laborTroubleTable"
                 :data="laborTroubleData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onlaborTroubleDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="arbitrationId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="arbitrationDate" label="仲裁日期" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="arbitrationType" label="仲裁类型" :formatter="arbitrationTypeFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="arbitrationReason" label="仲裁事由" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
-                <el-table-column show-overflow-tooltip="true" prop="arbitrationPay" label="仲裁赔付(元)" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="100" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="arbitrationId" label="" />
+                <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
+                <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" :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="180" />
+                <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
+                <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
               </el-table>
               <pagination
                 v-show="laborTroubleDatatotal>0"
@@ -1011,20 +1046,22 @@
                 ref="badRecordTable"
                 :data="badRecordData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onbadRecordDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="badId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="badDate" label="不良记录日期" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="badContent" label="不良记录描述" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="badId" label="" />
+                <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="180" />
+                <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+                <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
+                <el-table-column show-overflow-tooltip prop="remark" label="备注" />
               </el-table>
               <pagination
                 v-show="badRecordDatatotal>0"
@@ -1045,18 +1082,20 @@
                 ref="remarkInfoTable"
                 :data="remarkInfoData"
                 stripe
-                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+                border
+                :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+                :cell-style="{padding:'7px 0','text-align':'center'}"
                 style="width: 100%;"
                 @selection-change="onremarkInfoDataselection"
               >
-                <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+                <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
                   <template slot-scope="scope">
                     <span v-text="getIndex(scope.$index)" />
                   </template>
                 </el-table-column>
-                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="remarkId" label="" />
-                <el-table-column show-overflow-tooltip="true" prop="remarkDate" label="备注日期" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="remarkContent" label="备注信息" />
+                <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="remarkId" label="" />
+                <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+                <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
               </el-table>
               <pagination
                 v-show="remarkInfoDatatotal>0"
@@ -1069,32 +1108,35 @@
           </div>
 
           <div ref="jljt" class="jljt">
-            <div class="jbxxTitle">
-              上传附件
+            <div class="jbxxTitle2">
+              <el-col :span="18">
+                上传附件
+              </el-col>
+              <el-col :span="6" class="search">
+                <el-input
+                  v-model="fileName"
+                  maxlength="20"
+                  minlength="1"
+                  clearable
+                  placeholder="请输入文件名"
+                  show-word-limit
+                  style="width:290px;margin-right: 10px;"
+                />
+                <el-button type="primary" @click="findFileByFileName()">查询</el-button>
+              </el-col>
             </div>
             <div class="jbxxCon">
               <div class="zs-main">
-                <el-row class="search-title">
-                  <el-col :span="18" class="title">
-                    <!--                  <div class="zs-title">上传附件</div>-->
-                    <p />
-                  </el-col>
-                  <el-col :span="6" class="search">
-                    <el-input
-                      v-model="fileName"
-                      maxlength="20"
-                      minlength="1"
-                      clearable
-                      placeholder="请输入文件名"
-                      show-word-limit
-                      style="width:200px"
-                    />
-                    <el-button type="primary" @click="findFileByFileName()">查询</el-button>
-                  </el-col>
-                </el-row>
+                <!--                <el-row class="search-title">-->
+                <!--                  <el-col :span="18" class="title">-->
+                <!--                    &lt;!&ndash;                  <div class="zs-title">上传附件</div>&ndash;&gt;-->
+                <!--                    <p />-->
+                <!--                  </el-col>-->
+
+                <!--                </el-row>-->
                 <el-container style="background-color: #fff;">
-                  <el-aside width="210px" style="background-color: #fff;text-align: center;">
-                    <h4>{{ empBaseInfoForm.empName }}:{{ empBaseInfoForm.deptName }}</h4>
+                  <el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
+                    <h4 style="margin-top: 0">{{ empBaseInfoForm.empName }}:{{ empBaseInfoForm.deptName }}</h4>
                     <el-timeline>
                       <el-timeline-item
                         v-for="(activity, index) in activities"
@@ -1115,6 +1157,14 @@
                   </el-aside>
                   <el-container>
                     <el-header class="text-header">
+                      <el-row>
+                        <el-col :span="24">
+                          <i
+                            class="el-icon-bell"
+                            style=" color: #a32c30; margin-right: 10px;"
+                          />提示:文件不要超过10个,单个文件大小不超过50M,单击或者拖动文件到下面区域,支持单个或批量文件的上传。
+                        </el-col>
+                      </el-row>
                       <el-row style="background-color: rgba(0,0,0,0.2);">
                         <el-col :span="16">
                           <el-checkbox
@@ -1133,6 +1183,17 @@
                             @click="download()"
                           >下载
                           </el-button>
+                          <el-button
+                            class="pri-del-btn"
+                            type="primary"
+                            icon="el-icon-search"
+                            size="mini"
+                            @click="delFile()"
+                          >删除
+                          </el-button>
+                          <el-popconfirm title="是否移动附件?" @onConfirm="mvdialogFormVisible = true">
+                            <el-button slot="reference" type="danger">转存</el-button>
+                          </el-popconfirm>
                         </el-col>
                       </el-row>
                     </el-header>
@@ -1171,24 +1232,56 @@
                     <el-main style="background-color: #fff;margin-top: 5%;">
                       <el-row v-for="(data, index) in filesUploadData" :key="index">
                         <template v-for="(node, nodeIndex) in data.node">
-                          <el-col v-if="node.isUpload === false" :key="node.filesid" :span="3">
+                          <el-col v-if="node.isUpload === false" :key="node.accessoryid" :span="3">
                             <el-card
                               shadow="never"
                               @click.native="clickCard(index * 8 + nodeIndex)"
                             >
-                              <img
+                              <el-image
+                                v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1"
                                 :src="showFileImg(node.filesformat)"
                                 class="uploading-image"
-                              >
-                              <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
+                                :preview-src-list="srcList"
+                                @click="clickImg(node)"
+                              />
+                              <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
+                                <div style="padding-top: 14px;text-align: center">
+                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
+                                </div>
+                              </el-tooltip>
+                              <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
                                 <div style="padding-top: 14px;">
-                                  <el-checkbox
-                                    v-model="checkedArr[index * 8 + nodeIndex].isChecked"
-                                    class="myRedCheckBox"
-                                  >{{ node.filesname }}
+                                  <el-image
+                                    style="width: 100px; height: 80px;margin-top: -10px;"
+                                    :src="getImg+node.accessoryid"
+                                    :preview-src-list="srcList"
+                                    @click="clickImg(node)"
+                                  />
+                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">
+                                    {{ node.filesid }}
+                                    {{ node.filesname }}
                                   </el-checkbox>
                                 </div>
                               </el-tooltip>
+                            </el-card>
+                          </el-col>
+                          <el-col v-if="node.isUpload" :key="node.filesid" :span="3">
+                            <el-card shadow="never">
+                              <el-upload
+                                class="avatar-uploader"
+                                :action="uploadSinglePath"
+                                :show-file-list="false"
+                                :before-upload="beforeAvatarUpload"
+                                :headers="headers()"
+                                :data="fileDate"
+                                :on-success="handleAvatarSuccess"
+                                :on-error="handleAvatarError"
+                                :multiple="true"
+                                :limit="10"
+                                drag
+                              >
+                                <i class="el-icon-upload" />
+                              </el-upload>
                             </el-card>
                           </el-col>
                         </template>
@@ -1235,8 +1328,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="workExperienceForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="workExperienceForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="workExperienceForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="workExperienceForm.jobName" />
@@ -1282,7 +1375,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putWorkExperience('workExperienceForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="体检信息" append-to-body :visible.sync="dialogshowArr[2].show" width="50%">
@@ -1337,8 +1430,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="physicalExamForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="physicalExamForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="physicalExamForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="physicalExamForm.jobName" />
@@ -1386,7 +1479,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putPhysicalExam('physicalExamForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="合同信息" append-to-body :visible.sync="dialogshowArr[3].show" width="50%">
@@ -1446,8 +1539,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="contractInfoForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="contractInfoForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="contractInfoForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="contractInfoForm.jobName" />
@@ -1475,7 +1568,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putContractInfo('contractInfoForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="离职当月考勤" append-to-body :visible.sync="dialogshowArr[4].show" width="50%">
@@ -1528,8 +1621,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="dimissionAttendForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="dimissionAttendForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="dimissionAttendForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="dimissionAttendForm.jobName" />
@@ -1557,7 +1650,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="请假记录" append-to-body :visible.sync="dialogshowArr[5].show" width="50%">
@@ -1617,8 +1710,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="leaveInfoForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="leaveInfoForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="leaveInfoForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="leaveInfoForm.jobName" />
@@ -1658,7 +1751,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putLeaveInfo('leaveInfoForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="辞职申请" append-to-body :visible.sync="dialogshowArr[6].show" width="50%">
@@ -1696,8 +1789,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="resignForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="resignForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="resignForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="resignForm.jobName" />
@@ -1724,7 +1817,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putResign('resignForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="失业金领取" append-to-body :visible.sync="dialogshowArr[7].show" width="50%">
@@ -1771,8 +1864,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="unemploymentForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="unemploymentForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="unemploymentForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="unemploymentForm.jobName" />
@@ -1796,7 +1889,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putUnemployment('unemploymentForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="社保申请" append-to-body :visible.sync="dialogshowArr[8].show" width="50%">
@@ -1860,8 +1953,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="insuranceForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="insuranceForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="insuranceForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="insuranceForm.jobName" />
@@ -1894,7 +1987,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putInsurance('insuranceForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="意外险案件" append-to-body :visible.sync="dialogshowArr[9].show" width="50%">
@@ -1941,8 +2034,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="accidentCasesForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="accidentCasesForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="accidentCasesForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="accidentCasesForm.jobName" />
@@ -2046,7 +2139,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
@@ -2093,8 +2186,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="occupationalForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="occupationalForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="occupationalForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="occupationalForm.jobName" />
@@ -2243,10 +2336,10 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
-      <el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
+      <el-dialog title="仲裁案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
         <el-form
           ref="laborTroubleForm"
           :model="laborTroubleForm"
@@ -2285,7 +2378,7 @@
               <el-form-item label="汇报人" prop="reporter">
                 <el-input v-model="laborTroubleForm.reporter" />
               </el-form-item>
-              <el-form-item label="状态" prop="arbitrationStatus">
+              <el-form-item label="是否结案" prop="arbitrationStatus">
                 <el-select v-model="laborTroubleForm.arbitrationStatus" placeholder="">
                   <el-option
                     v-for="dict in settleStatusOptions"
@@ -2300,8 +2393,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="laborTroubleForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="laborTroubleForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="laborTroubleForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="laborTroubleForm.jobName" />
@@ -2350,7 +2443,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putLaborTrouble('laborTroubleForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="不良记录" append-to-body :visible.sync="dialogshowArr[12].show" width="50%">
@@ -2394,8 +2487,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="badRecordForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="badRecordForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="badRecordForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="badRecordForm.jobName" />
@@ -2422,7 +2515,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
       <el-dialog title="备注信息" append-to-body :visible.sync="dialogshowArr[13].show" width="50%">
@@ -2466,8 +2559,8 @@
               <el-form-item label="员工编号" prop="empNumb">
                 <el-input v-model="remarkInfoForm.empNumb" />
               </el-form-item>
-              <el-form-item label="部门(护卫点)" prop="deptName">
-                <el-input v-model="remarkInfoForm.deptName" />
+              <el-form-item label="部门(护卫点)" prop="allDeptName">
+                <el-input v-model="remarkInfoForm.allDeptName" />
               </el-form-item>
               <el-form-item label="岗位" prop="jobName">
                 <el-input v-model="remarkInfoForm.jobName" />
@@ -2484,7 +2577,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="putRemarkInfo('remarkInfoForm')">保 存</el-button>
-          <el-button @click="dialogIsShow()">取 消</el-button>
+
         </div>
       </el-dialog>
     </el-dialog>
@@ -2499,7 +2592,7 @@
 import { pages } from '@/settings'
 
 export default {
-  name: 'ArchivesChange',
+  name: 'ArchivesEdit',
   components: { Treeselect, Pagination },
   props: {
     dialogVisible: {
@@ -2600,7 +2693,7 @@
           message: this.$t('rules.noMoreThan20'),
           trigger: 'blur'
         }],
-        empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+        empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
           { min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
         empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
           { min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -2615,7 +2708,7 @@
           message: '长度不超过36个字符',
           trigger: 'blur'
         }],
-        insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
+        insuranceType: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
         entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
         seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
         archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
@@ -2696,10 +2789,10 @@
           pattern: /^\d{1,2}(\.\d{1,1})?$/,
           message: '出勤天数精确到1位小数'
         }],
-        overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班(天)精确到1位小数' }],
-        overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班(小时)精确到1位小数' }],
-        leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假(天)精确到1位小数' }],
-        absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工(天)精确到1位小数' }],
+        overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班(天)精确到1位小数' }],
+        overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班(小时)精确到1位小数' }],
+        leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假(天)精确到1位小数' }],
+        absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工(天)精确到1位小数' }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
       },
       leaveInfoRules: {
@@ -3126,6 +3219,8 @@
         empStatus: 0,
         version: ''
       },
+      srcList: [],
+      getImg: pages.getAccessoryImage,
       resignForm: {
         resignId: '',
         empId: '',
@@ -3457,7 +3552,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 => {
@@ -3519,6 +3614,9 @@
     arbitrationStatusFormat(row, column) {
       return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
     },
+    settleStatusFormat(row, column) {
+      return this.selectDictLabel(this.settleStatusOptions, row.settleStatus)
+    },
     beforeAvatarUpload(file) {
       this.fileDate.labelid = this.activities[this.beforeIndex].id
       const isLt50M = file.size / 1024 / 1024 < 50
@@ -3564,6 +3662,10 @@
     },
     showFileImg(type) {
       switch (type) {
+        case 'xls':
+          return require('../../assets/uploading/xls.png')
+        case 'xlsx':
+          return require('../../assets/uploading/xls.png')
         case 'txt':
           return require('../../assets/uploading/txt.png')
         case 'apk':
@@ -3675,6 +3777,12 @@
             })
           }
         })
+      }
+    },
+    clickImg(node) {
+      this.srcList = []
+      if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
+        this.srcList.push(this.getImg + node.accessoryid)
       }
     },
     delFile() {
@@ -3874,6 +3982,12 @@
       })
     },
     setArchives(val) {
+      debugger
+      let certificateList = []
+      if (val.certificateList && typeof val.certificateList === 'string') {
+        certificateList = val.certificateList.split(',')
+        val.certificateList = certificateList
+      }
       this.empBaseInfoForm = { ...val }
       this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
       this.fileDate.empId = this.empBaseInfoForm.empId
@@ -3902,7 +4016,7 @@
       this.initunemploymentData() // 失业金领取
       this.initinsuranceData() // 社保申请
       this.initremarkInfoData() // 备注
-      this.initlaborTroubleData() // 劳资案件
+      this.initlaborTroubleData() // 仲裁案件
       this.initoccupationalData() // 工伤案件
       this.initbadRecordData() // 不良记录
       this.initaccidentCasesData() // 意外险案件
@@ -3911,7 +4025,7 @@
     initphysicalExamData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empPhysicalExam/list', {
         ...params
@@ -3924,7 +4038,8 @@
     initjobChangeData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.empStatus = 1
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empJobChange/list', {
         ...params
@@ -3937,8 +4052,12 @@
     initdimissionLogData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
+      params.empStatus = this.empBaseInfoForm.empStatus
+      params.empId = this.empBaseInfoForm.empId
       params.dimissionType = ''
       params.delFlag = '0'
+      params.field = 'entryDate'
+      params.order = 'ascending'
       this.$get('hr/empDimissionlog/list', {
         ...params
       }).then((r) => {
@@ -3950,7 +4069,7 @@
     initcontractInfoData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empContractInfo/list', {
         ...params
@@ -3964,6 +4083,10 @@
       this.readon = true
     },
     gzupdate1() {
+      const empBaseInfoForm = this.empBaseInfoForm
+      if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
+        this.empBaseInfoForm.imagePath = ''
+      }
       this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
         this.$message({
           message: this.$t('tips.updateSuccess'),
@@ -3972,18 +4095,28 @@
       })
     },
     ExportSavePdf(params = {}) {
-      params.pageSize = this.pagination.size
-      params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
-
-      this.$download('hr/pdf/contract', {
-        ...params
-      }, `${this.empBaseInfoForm.empName}.pdf`)
+      this.$confirm('是否确定要导出档案,请耐心等待?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        params.pageSize = this.pagination.size
+        params.pageNum = this.pagination.num
+        params.certificateNumb = this.empBaseInfoForm.certificateNumb
+        this.$download('hr/pdf/contract', {
+          ...params
+        }, `${this.empBaseInfoForm.empName}.pdf`)
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
     },
     initleaveInfoData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empLeaveInfo/list', {
         ...params
@@ -3996,7 +4129,8 @@
     initresignData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.empStatus = this.empBaseInfoForm.empStatus
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empResign/list', {
         ...params
@@ -4009,7 +4143,8 @@
     initunemploymentData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.empStatus = this.empBaseInfoForm.empStatus
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empUnemployment/list', {
         ...params
@@ -4022,7 +4157,7 @@
     initinsuranceData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empInsurance/list', {
         ...params
@@ -4035,7 +4170,8 @@
     initremarkInfoData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.empStatus = this.empBaseInfoForm.empStatus
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empRemarkInfo/list', {
         ...params
@@ -4048,7 +4184,7 @@
     initlaborTroubleData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empLaborTrouble/list', {
         ...params
@@ -4061,7 +4197,7 @@
     initoccupationalData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empOccupational/list', {
         ...params
@@ -4074,7 +4210,8 @@
     initbadRecordData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.empStatus = this.empBaseInfoForm.empStatus
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empBadRecord/list', {
         ...params
@@ -4090,7 +4227,7 @@
     initaccidentCasesData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empAccidentCases/list', {
         ...params
@@ -4103,7 +4240,7 @@
     initdimissionAttendData(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empDimissionAttend/list', {
         ...params
@@ -4116,7 +4253,7 @@
     initList(params = {}) {
       params.pageSize = this.pagination.size
       params.pageNum = this.pagination.num
-      params.empNumb = this.empBaseInfoForm.empNumb
+      params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
       this.$get('hr/empWorkExperience/list', {
         ...params
@@ -4825,6 +4962,7 @@
       this.workExperienceForm.modifier = row.modifier
       this.workExperienceForm.delFlag = row.delFlag
       this.workExperienceForm.version = row.version
+      this.thisShowIndex = 1
       this.dialogshowArr[1].show = true
     },
     editPhysicalExam(row) {
@@ -4854,7 +4992,7 @@
       this.physicalExamForm.modifier = row.modifier
       this.physicalExamForm.delFlag = row.delFlag
       this.physicalExamForm.version = row.version
-
+      this.thisShowIndex = 2
       this.dialogshowArr[2].show = true
     },
     editContractInfo(row) {
@@ -4883,7 +5021,7 @@
       this.contractInfoForm.modifier = row.modifier
       this.contractInfoForm.delFlag = row.delFlag
       this.contractInfoForm.version = row.version
-
+      this.thisShowIndex = 3
       this.dialogshowArr[3].show = true
     },
     editDimissionAttend(row) {
@@ -4911,6 +5049,7 @@
       this.dimissionAttendForm.delFlag = row.delFlag
       this.dimissionAttendForm.version = row.version
       this.dimissionAttendForm.remark = row.remark
+      this.thisShowIndex = 4
       this.dialogshowArr[4].show = true
     },
     editLeaveInfo(row) {
@@ -4939,7 +5078,7 @@
       this.leaveInfoForm.delFlag = row.delFlag
       this.leaveInfoForm.version = row.version
       this.leaveInfoForm.remark = row.remark
-
+      this.thisShowIndex = 5
       this.dialogshowArr[5].show = true
     },
     editResign(row) {
@@ -4965,7 +5104,7 @@
       this.resignForm.delFlag = row.delFlag
       this.resignForm.version = row.version
       this.resignForm.remark = row.remark
-
+      this.thisShowIndex = 6
       this.dialogshowArr[6].show = true
     },
     editUnemployment(row) {
@@ -4992,7 +5131,7 @@
       this.unemploymentForm.modifier = row.modifier
       this.unemploymentForm.delFlag = row.delFlag
       this.unemploymentForm.version = row.version
-
+      this.thisShowIndex = 7
       this.dialogshowArr[7].show = true
     },
     editInsurance(row) {
@@ -5020,7 +5159,7 @@
       this.insuranceForm.delFlag = row.delFlag
       this.insuranceForm.version = row.version
       this.insuranceForm.remark = row.remark
-
+      this.thisShowIndex = 8
       this.dialogshowArr[8].show = true
     },
     editAccidentCases(row) {
@@ -5061,7 +5200,7 @@
       this.accidentCasesForm.modifier = row.modifier
       this.accidentCasesForm.delFlag = row.delFlag
       this.accidentCasesForm.version = row.version
-
+      this.thisShowIndex = 9
       this.dialogshowArr[9].show = true
     },
     editOccupational(row) {
@@ -5111,7 +5250,7 @@
       this.occupationalForm.delFlag = row.delFlag
       this.occupationalForm.version = row.version
       this.occupationalForm.remark = row.remark
-
+      this.thisShowIndex = 10
       this.dialogshowArr[10].show = true
     },
     editLaborTrouble(row) {
@@ -5141,7 +5280,7 @@
       this.laborTroubleForm.delFlag = row.delFlag
       this.laborTroubleForm.version = row.version
       this.laborTroubleForm.remark = row.remark
-
+      this.thisShowIndex = 11
       this.dialogshowArr[11].show = true
     },
     editBadRecord(row) {
@@ -5166,6 +5305,7 @@
       this.badRecordForm.delFlag = row.delFlag
       this.badRecordForm.version = row.version
       this.badRecordForm.remark = row.remark
+      this.thisShowIndex = 12
       this.dialogshowArr[12].show = true
     },
     editRemarkInfo(row) {
@@ -5188,7 +5328,7 @@
       this.remarkInfoForm.modifier = row.modifier
       this.remarkInfoForm.delFlag = row.delFlag
       this.remarkInfoForm.version = row.version
-
+      this.thisShowIndex = 13
       this.dialogshowArr[13].show = true
     },
     gzadd(index) {
@@ -5519,11 +5659,11 @@
       }
 
       .title-da {
-        margin-left: -102px;
-        text-align: center;
-        padding: 10px;
-        padding-bottom: 7px;
-        margin-bottom: 19px;
+        padding-top: 8px;
+        font-weight: 700;
+        color: #333;
+        height: 30px;
+        line-height: 30px;
       }
 
     }
@@ -5535,19 +5675,32 @@
       height: 90vh;
       overflow-y: scroll;
 
-      .jbxxTitle {
+      .jbxxTitle,.jbxxTitle2 {
         height: 30px;
         line-height: 30px;
         padding-left: 15px;
-        border-left: 4px solid #a00515;
-        margin: 40px 0 20px;
+        //border-left: 4px solid #a00515;
+        margin: 30px 0 20px;
         color: #000;
-        font-weight: 700;
         position: relative;
       }
 
       .jbxx .jbxxTitle {
         margin: 20px 0;
+      }
+
+      .jbxxTitle::before,
+      .jbxxTitle2::before{
+        content: '';
+        position: absolute;
+        left: -10px;
+        top: 50%;
+        transform: translateY(-50%);
+        background-color: #a00515;
+        border-radius: 50%;
+        display: inline-block;
+        height: 15px;
+        width: 15px;
       }
 
       .jbxxTitle::after {
@@ -5678,9 +5831,10 @@
     }
 
     .uploading-image {
-      width: 100%;
-      height: 100%;
+      width: 70%;
+      height: 70%;
       display: block;
+      margin: 0 auto;
     }
   }
 
@@ -5714,6 +5868,13 @@
   /* 设置鼠标经过对勾框,对勾框边框的颜色 */
   .myRedCheckBox .el-checkbox__inner:hover {
     border-color: #a32c30;
+  }
+
+  .myRedCheckBox .el-checkbox__label {
+    width: 90%;
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
   }
 
   .avatar-uploader .el-upload {
@@ -5756,7 +5917,7 @@
   .table-button {
     color: #a00515;
     display: inline-block;
-    width: 50%;
+    width: 45%;
     cursor: pointer;
   }
 
@@ -5767,7 +5928,7 @@
   }
 
   .jbxx-ul {
-    margin: 0;
+    margin-top: 10px;
     font-size: 14px;
     list-style: none;
     padding-left: 10px !important;
@@ -5833,6 +5994,32 @@
 </style>
 <style lang="scss">
   .da-dialog {
+    button.el-dialog__headerbtn {
+      height: 30px;
+      width: 30px;
+      background-color: #a00515;
+      opacity: 0.8;
+      line-height: 30px;
+      border-radius: 50%;
+      i {
+        color: #fff !important;
+      }
+      &:hover {
+        opacity: 0.5;
+      }
+    }
+    .el-pagination {
+      width: 98%;
+      text-align: right;
+    }
+    .el-aside {
+      height: 750px;
+      overflow: hidden;
+    }
+    li.el-timeline-item {
+      padding-bottom: 1px;
+      height: 35px;
+    }
     .el-dialog__title {
       font-weight: 700;
     }
@@ -5843,5 +6030,16 @@
   .el-dialog.is-fullscreen {
     overflow: hidden;
   }
+
+  .formjbxx {
+    .el-input.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      color: #333 !important;
+    }
+  }
+  .pri-del-btn {
+    background-color: rgb(64, 158, 255);
+    border-color: rgb(64, 158, 255);
+  }
 </style>
 

--
Gitblit v1.8.0