From 0eb8d716ee0f9a952ada4e0e15a96aa2c9866156 Mon Sep 17 00:00:00 2001
From: [1124498879] <[kongxf@daryun.com]>
Date: 星期一, 07 六月 2021 14:42:17 +0800
Subject: [PATCH] ..

---
 src/views/user/archivesChange.vue |  351 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 186 insertions(+), 165 deletions(-)

diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index c1532cd..54a4e87 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -27,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">
@@ -204,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">
@@ -368,7 +368,7 @@
                 <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"
@@ -447,8 +447,8 @@
                     </el-form-item>
                   </el-col>
                   <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"
@@ -514,15 +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 label="相关证件" prop="certificateListName">
+                      <el-input v-model="empBaseInfoForm.certificateListName" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -546,16 +539,16 @@
                 :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"
@@ -582,21 +575,21 @@
                 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="150" />
-                <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="140" />
-                <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="140" />
-                <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="140" />
-                <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
-                <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
-                <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="140" />
-                <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"
@@ -623,17 +616,18 @@
                 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="合同签订日期" />
-                <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" />
-                <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" />
-                <el-table-column show-overflow-tooltip="true" prop="contractStatus" label="合同状态" :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"
@@ -658,19 +652,19 @@
                 :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="true" prop="changeReason" label="调岗理由" />
+                <el-table-column show-overflow-tooltip prop="newDeptName" 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"
@@ -697,19 +691,19 @@
                 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="180" />
-                <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="180" />
-                <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"
@@ -736,16 +730,16 @@
                 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="辞职申请日期" />
-                <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" />
-                <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" />
-                <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"
@@ -772,20 +766,20 @@
                 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="离职考勤月份" />
-                <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="150" />
-                <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班(天)" width="150" />
-                <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班(小时)" />
-                <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="180" />
-                <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假(天)" />
-                <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工(天)" />
-                <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"
@@ -810,17 +804,17 @@
                 :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="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"
@@ -847,17 +841,17 @@
                 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"
@@ -884,19 +878,19 @@
                 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"
@@ -923,27 +917,27 @@
                 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="受伤日期" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" width="120" />
-                <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="80" :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="120" />
-                <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="120" />
-                <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
+                <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"
@@ -970,27 +964,27 @@
                 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="受伤日期" width="120" />
-                <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="受伤经过描述" width="140" />
-                <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="100" />
-                <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="80" />
-                <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="80" />
-                <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
-                <el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="120" />
-                <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
+                <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"
@@ -1017,20 +1011,20 @@
                 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"
@@ -1057,16 +1051,16 @@
                 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"
@@ -1093,14 +1087,14 @@
                 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"
@@ -1237,21 +1231,34 @@
                     <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>
@@ -2700,7 +2707,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' }],
@@ -2781,10 +2788,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: {
@@ -3211,6 +3218,8 @@
         empStatus: 0,
         version: ''
       },
+      srcList: [],
+      getImg: pages.getAccessoryImage,
       resignForm: {
         resignId: '',
         empId: '',
@@ -3542,7 +3551,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 => {
@@ -3652,6 +3661,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':
@@ -3763,6 +3776,12 @@
             })
           }
         })
+      }
+    },
+    clickImg(node) {
+      this.srcList = []
+      if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
+        this.srcList.push(this.getImg + node.accessoryid)
       }
     },
     delFile() {
@@ -3962,6 +3981,7 @@
       })
     },
     setArchives(val) {
+      debugger
       let certificateList = []
       if (val.certificateList && typeof val.certificateList === 'string') {
         certificateList = val.certificateList.split(',')
@@ -4035,6 +4055,8 @@
       params.empId = this.empBaseInfoForm.empId
       params.dimissionType = ''
       params.delFlag = '0'
+      params.field = 'entryDate'
+      params.order = 'ascending'
       this.$get('hr/empDimissionlog/list', {
         ...params
       }).then((r) => {
@@ -4862,7 +4884,6 @@
       this.remarkInfoForm.version = ''
     },
     dialogIsShow() {
-      debugger
       this.workExperienceModal = false
       this.isAdd = true
       this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]

--
Gitblit v1.8.0