From 6448ec15bfe0b65fb822a662105bceddc23b58d8 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期一, 06 四月 2026 21:34:44 +0800
Subject: [PATCH] feat(user): 新增员工档案管理视图组件

---
 src/views/user/archivesEdit.vue | 1343 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 986 insertions(+), 357 deletions(-)

diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 80a4800..7062ee6 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -5,7 +5,7 @@
       width="100%"
       height="100vh"
       center
-      fullscreen="true"
+      fullscreen
       :close-on-click-modal="false"
       :visible.sync="isVisible"
     >
@@ -14,17 +14,19 @@
         <div class="menu dadetails">
           <div style="height: 22vh;">
 
-            <el-upload
-              class="avatar-uploader"
-              action="#"
-              :show-file-list="false"
-              :on-change="handlePictureCardPreview"
-              :auto-upload="false"
-            >
-              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过4MB</div>
-              <img v-if="empBaseInfoImageUrl" :src="empBaseInfoImageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
+            <!-- 头像显示区域 -->
+            <div class="avatar-wrapper">
+              <img
+                v-if="empBaseInfoImageUrl"
+                :src="empBaseInfoImageUrl"
+                class="avatar"
+                @click="openUploadChoice"
+              >
+              <div v-else class="avatar-uploader-placeholder" @click="openUploadChoice">
+                <i class="el-icon-plus avatar-uploader-icon" />
+                <div class="upload-tip">点击上传照片</div>
+              </div>
+            </div>
             <!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
             <div class="title-da">
               档案号:{{ empBaseInfoForm.archivesNumb }}
@@ -153,7 +155,7 @@
               <div class="item-node" />
               <div>
                 <a href="javascript:void(0)" :class="item=='lzaj'?'light':''" @click="goAnchor('lzaj')">
-                  劳资案件
+                  仲裁案件
                 </a>
               </div>
             </li>
@@ -222,7 +224,11 @@
                 <el-row style="width: 100%;">
                   <el-col :span="8">
                     <el-form-item label="编号" prop="empNumb">
-                      <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
+                      <el-input
+                        v-model="empBaseInfoForm.empNumb"
+                        style="width: 100%;"
+                        :disabled="readon ? false : true"
+                      />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -244,7 +250,11 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="性别" prop="sex">
-                      <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.sex"
+                        placeholder="请选择性别"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in sexOptions"
                           :key="dict.dicItemCode"
@@ -284,7 +294,11 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="员工类别" prop="empType">
-                      <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.empType"
+                        placeholder="请选择员工类型"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in empTypeOptions"
                           :key="dict.dicItemCode"
@@ -296,7 +310,12 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="民族" prop="nation">
-                      <el-select v-model="empBaseInfoForm.nation" filterable 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"
@@ -316,7 +335,11 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="婚姻状态" prop="marriage">
-                      <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.marriage"
+                        placeholder="请选择婚姻状态"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in marriageOptions"
                           :key="dict.dicItemCode"
@@ -347,7 +370,11 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="政治面貌" prop="politics">
-                      <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.politics"
+                        placeholder="请选择政治面貌"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in statusOptions"
                           :key="dict.dicItemCode"
@@ -370,7 +397,11 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="最高学历" prop="education">
-                      <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.education"
+                        placeholder="请选择最高学历"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in educationOptions"
                           :key="dict.dicItemCode"
@@ -385,7 +416,11 @@
                 <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"
@@ -420,7 +455,11 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="档案情况" prop="archivesStatus">
-                      <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.archivesStatus"
+                        placeholder="请选择档案情况"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in archivesStatusOptions"
                           :key="dict.dicItemCode"
@@ -464,8 +503,12 @@
                     </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"
@@ -495,7 +538,11 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="工作证" prop="empCardStatus">
-                      <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.empCardStatus"
+                        placeholder="请选择工作证"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in empCardStatusOptions"
                           :key="dict.dicItemCode"
@@ -509,18 +556,22 @@
                 </el-row>
                 <el-row>
                   <el-col :span="8">
-                    <el-form-item label="家庭成员及关系" prop="family">
+                    <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="紧急联系电话" prop="urgencyPhone">
+                    <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
                       <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="员工手册" prop="handbookStatus">
-                      <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.handbookStatus"
+                        placeholder="请选择员工手册"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in handbookStatusOptions"
                           :key="dict.dicItemCode"
@@ -532,7 +583,12 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="相关证件" prop="certificateList">
-                      <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件" :disabled="readon ? false : true">
+                      <el-select
+                        v-model="empBaseInfoForm.certificateList"
+                        multiple
+                        placeholder="请选择相关证件"
+                        :disabled="readon ? false : true"
+                      >
                         <el-option
                           v-for="dict in certificateListOptions"
                           :key="dict.dicItemCode"
@@ -540,6 +596,11 @@
                           :value="dict.dicItemCode"
                         />
                       </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="年假天数" prop="annualLeave">
+                      <el-input v-model="empBaseInfoForm.annualLeave" disabled />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -566,20 +627,23 @@
                 :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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <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-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editWorkExperience(scope.row,1)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'workExperienceDataselection')">删除</span>
+                    <span
+                      class="table-button"
+                      @click="singleDelete(scope.row, 'workExperienceDataselection')"
+                    >删除</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -588,7 +652,7 @@
                 :total="workExperienceDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initList"
+                @pagination="initList()"
               />
             </div>
           </div>
@@ -611,34 +675,46 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editPhysicalExam(scope.row,2)">编辑</span>
                     <span class="table-button" @click="singleDelete(scope.row, 'physicalExamDataselection')">删除</span>
                   </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"
                 :total="physicalExamDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initphysicalExamData"
+                @pagination="initphysicalExamData()"
               />
             </div>
           </div>
@@ -661,30 +737,36 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editContractInfo(scope.row,3)">编辑</span>
                     <span class="table-button" @click="singleDelete(scope.row, 'contractInfoDataselection')">删除</span>
                   </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"
                 :total="contractInfoDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initcontractInfoData"
+                @pagination="initcontractInfoData()"
               />
             </div>
           </div>
@@ -702,26 +784,31 @@
                 :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="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"
                 :total="jobChangeDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initjobChangeData"
+                @pagination="initjobChangeData()"
               />
             </div>
           </div>
@@ -744,32 +831,32 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editLeaveInfo(scope.row,5)">编辑</span>
                     <span class="table-button" @click="singleDelete(scope.row, 'leaveInfoDataselection')">删除</span>
                   </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"
                 :total="leaveInfoDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initleaveInfoData"
+                @pagination="initleaveInfoData()"
               />
             </div>
           </div>
@@ -792,29 +879,29 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editResign(scope.row,5)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'onresignDataselection')">删除</span>
+                    <span class="table-button" @click="singleDelete(scope.row, 'resignDataselection')">删除</span>
                   </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"
                 :total="resignDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initresignData"
+                @pagination="initresignData()"
               />
             </div>
           </div>
@@ -837,33 +924,36 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editDimissionAttend(scope.row,6)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'dimissionAttendDataselection')">删除</span>
+                    <span
+                      class="table-button"
+                      @click="singleDelete(scope.row, 'dimissionAttendDataselection')"
+                    >删除</span>
                   </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"
                 :total="dimissionAttendDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initdimissionAttendData"
+                @pagination="initdimissionAttendData()"
               />
             </div>
           </div>
@@ -881,24 +971,31 @@
                 :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
+                  </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"
                 :total="dimissionLogDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initdimissionLogData"
+                @pagination="initdimissionLogData()"
               />
             </div>
           </div>
@@ -921,30 +1018,30 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editUnemployment(scope.row,7)">编辑</span>
                     <span class="table-button" @click="singleDelete(scope.row, 'unemploymentDataselection')">删除</span>
                   </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"
                 :total="unemploymentDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initunemploymentData"
+                @pagination="initunemploymentData()"
               />
             </div>
           </div>
@@ -967,32 +1064,47 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editInsurance(scope.row,8)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'oninsuranceDataselection')">删除</span>
+                    <span class="table-button" @click="singleDelete(scope.row, 'insuranceDataselection')">删除</span>
                   </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"
                 :total="insuranceDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initinsuranceData"
+                @pagination="initinsuranceData()"
               />
             </div>
           </div>
@@ -1015,40 +1127,55 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editAccidentCases(scope.row,9)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')">删除</span>
+                    <span
+                      class="table-button"
+                      @click="singleDelete(scope.row, 'accidentCasesDataselection')"
+                    >删除</span>
                   </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="200" />
+                <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+                <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="300" />
+                <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="150" />
+                <!--                <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"
                 :total="accidentCasesDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initaccidentCasesData"
+                @pagination="initaccidentCasesData()"
               />
             </div>
           </div>
@@ -1071,46 +1198,58 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editOccupational(scope.row,10)">编辑</span>
                     <span class="table-button" @click="singleDelete(scope.row, 'occupationalDataselection')">删除</span>
                   </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"
                 :total="occupationalDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initoccupationalData"
+                @pagination="initoccupationalData()"
               />
             </div>
           </div>
           <div ref="lzaj" class="lzaj">
             <div class="jbxxTitle">
-              劳资案件
+              仲裁案件
               <el-button class="filter-item" type="primary" @click.native="gzadd(11)">
                 {{ $t('table.add') }}
               </el-button>
@@ -1127,33 +1266,44 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editLaborTrouble(scope.row,11)">编辑</span>
                     <span class="table-button" @click="singleDelete(scope.row, 'laborTroubleDataselection')">删除</span>
                   </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"
                 :total="laborTroubleDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initlaborTroubleData"
+                @pagination="initlaborTroubleData()"
               />
             </div>
           </div>
@@ -1176,29 +1326,29 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <span class="table-button" @click="editBadRecord(scope.row,12)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'onbadRecordDataselection')">删除</span>
+                    <span class="table-button" @click="singleDelete(scope.row, 'badRecordDataselection')">删除</span>
                   </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"
                 :total="badRecordDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initbadRecordData"
+                @pagination="initbadRecordData()"
               />
             </div>
           </div>
@@ -1221,12 +1371,12 @@
                 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 show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+                <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
                   <template slot-scope="scope">
                     <!--                  <el-button type="text" size="small" @click="editRemarkInfo(scope.row)">编辑</el-button>-->
                     <!--                  <el-button-->
@@ -1236,19 +1386,19 @@
                     <!--                  >删除-->
                     <!--                  </el-button>-->
                     <span class="table-button" @click="editRemarkInfo(scope.row,13)">编辑</span>
-                    <span class="table-button" @click="singleDelete(scope.row, 'onremarkInfoDataselection')">删除</span>
+                    <span class="table-button" @click="singleDelete(scope.row, 'remarkInfoDataselection')">删除</span>
                   </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"
                 :total="remarkInfoDatatotal"
                 :page.sync="pagination.num"
                 :limit.sync="pagination.size"
-                @pagination="initremarkInfoData"
+                @pagination="initremarkInfoData()"
               />
             </div>
           </div>
@@ -1383,12 +1533,28 @@
                                 :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">
+                              <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>
+                                  <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">
+                              <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-image
                                     style="width: 100px; height: 80px;margin-top: -10px;"
@@ -1396,7 +1562,10 @@
                                     :preview-src-list="srcList"
                                     @click="clickImg(node)"
                                   />
-                                  <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">
+                                  <el-checkbox
+                                    v-model="checkedArr[index * 8 + nodeIndex].isChecked"
+                                    class="myRedCheckBox"
+                                  >
 
                                     {{ node.filesname }}
                                   </el-checkbox>
@@ -2273,6 +2442,9 @@
                   />
                 </el-select>
               </el-form-item>
+              <el-form-item label="备注">
+                <el-input v-model="accidentCasesForm.remark" />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -2478,7 +2650,7 @@
 
         </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"
@@ -2720,19 +2892,93 @@
         </div>
       </el-dialog>
     </el-dialog>
+
+    <!-- 上传方式选择弹窗 -->
+    <el-dialog
+      title="选择上传方式"
+      :visible.sync="uploadChoiceDialogVisible"
+      width="400px"
+      :close-on-click-modal="false"
+    >
+      <div class="upload-choice-container">
+        <div class="upload-choice-item" @click="choiceCamera">
+          <i class="el-icon-camera" />
+          <span>拍照上传</span>
+        </div>
+        <div class="upload-choice-item" @click="choiceFile">
+          <i class="el-icon-folder-opened" />
+          <span>文件上传</span>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 摄像头拍照弹窗 -->
+    <el-dialog
+      title="拍照上传"
+      :visible.sync="cameraDialogVisible"
+      width="640px"
+      :close-on-click-modal="false"
+      @close="closeCamera"
+    >
+      <div class="camera-container">
+        <!-- 视频预览 -->
+        <video
+          v-show="!capturedImage"
+          ref="video"
+          class="camera-video"
+          autoplay
+          playsinline
+        />
+        <!-- 画布(用于拍照) -->
+        <canvas ref="canvas" style="display: none;" />
+
+        <!-- 拍照结果预览 -->
+        <img
+          v-if="capturedImage"
+          :src="capturedImage"
+          class="captured-image"
+        >
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeCamera">取消</el-button>
+        <el-button
+          v-if="!capturedImage"
+          type="primary"
+          @click="takePhoto"
+        >
+          拍照
+        </el-button>
+        <el-button
+          v-if="capturedImage"
+          @click="retakePhoto"
+        >
+          重拍
+        </el-button>
+        <el-button
+          v-if="capturedImage"
+          type="primary"
+          @click="confirmPhoto"
+        >
+          确认使用
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { calculateSeniority, toCardGetUserInfo } from '@/utils/myUtil'
+import { calculateSeniority, dateDifference, toCardGetUserInfo } from '@/utils/myUtil'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
 import { pages } from '@/settings'
+import dictMixin from '../../utils/dictMixin'
 
 export default {
   name: 'ArchivesEdit',
   components: { Treeselect, Pagination },
+  mixins: [dictMixin],
   props: {
     dialogVisible: {
       type: Boolean,
@@ -2853,6 +3099,12 @@
         }
       ],
       empBaseInfoImageUrl: '',
+      // 上传方式选择弹窗
+      uploadChoiceDialogVisible: false,
+      // 摄像头相关
+      cameraDialogVisible: false,
+      capturedImage: '',
+      stream: null,
       rules: {
         archivesNumb: [{ required: true, message: '请输入档案号', trigger: 'blur' }, {
           max: 20,
@@ -2874,7 +3126,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' }],
@@ -2937,11 +3189,11 @@
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
       },
       contractInfoRules: {
-        signingDate: [{ required: true, message: '请选择合同签订时间', trigger: 'change' }],
+        signingDate: [{ required: true, message: '请选择合同签订时间', trigger: 'change', validator: this.startDate }],
         contractStatus: [{ required: true, message: '请选择合同状态', trigger: 'change' }],
         transactor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
         beginDate: [{ required: true, message: '请选择合同开始日期', trigger: 'change' }],
-        endDate: [{ required: true, message: '请选择合同结束时间', trigger: 'change' }],
+        endDate: [{ required: true, message: '请选择合同结束时间', trigger: 'change', validator: this.endDate }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
       },
       dimissionAttendRules: {
@@ -2955,10 +3207,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: {
@@ -3192,7 +3444,6 @@
         creator: '',
         modifyTime: '',
         modifier: '',
-
         empStatus: 0,
         version: ''
       },
@@ -3329,7 +3580,6 @@
         creator: '',
         modifyTime: '',
         modifier: '',
-
         version: '',
         empStatus: 0,
         remark: ''
@@ -3557,7 +3807,8 @@
         modifyTime: '',
         modifier: '',
         empStatus: 0,
-        version: ''
+        version: '',
+        annualLeave: ''
       },
       fsnumShow: false,
       badRecordForm: {
@@ -3601,30 +3852,6 @@
         { type: 'password' },
         { type: 'implicit' }
       ],
-      statusOptions: [],
-      empTypeOptions: [],
-      nationOptions: [],
-      marriageOptions: [],
-      educationOptions: [],
-      nativePlaceOptions: [],
-      archivesStatusOptions: [],
-      insuranceTypeOptions: [],
-      empCardStatusOptions: [],
-      handbookStatusOptions: [],
-      ecgOptions: [],
-      certificateListOptions: [],
-      physicalExamTypeOptions: [],
-      contractStatusOptions: [],
-      leaveTypeOptions: [],
-      insuranceGaersOptions: [],
-      applayStatusOptions: [],
-      reportStatusOptions: [],
-      hospitalizatioFlagOptions: [],
-      settleStatusOptions: [],
-      arbitrationTypeOptions: [],
-      changeTypeOptions: [],
-      dimissionTypeOptions: [],
-      sexOptions: [],
       srcList: [],
       getImg: pages.getAccessoryImage
     }
@@ -3638,83 +3865,37 @@
         this.close()
         this.reset()
       }
-    }
+    },
+    // 字典选项计算属性
+    statusOptions() { return this.getDictOptions('PLITICAL') },
+    empTypeOptions() { return this.getDictOptions('empType') },
+    nationOptions() { return this.getDictOptions('NATION') },
+    marriageOptions() { return this.getDictOptions('MARRIAGE') },
+    educationOptions() { return this.getDictOptions('EDUCATION') },
+    nativePlaceOptions() { return this.getDictOptions('NATIVEPLACE') },
+    archivesStatusOptions() { return this.getDictOptions('archivesStatus') },
+    insuranceTypeOptions() { return this.getDictOptions('INSURANCETYPE') },
+    empCardStatusOptions() { return this.getDictOptions('empCardStatus') },
+    handbookStatusOptions() { return this.getDictOptions('handbookStatus') },
+    certificateListOptions() { return this.getDictOptions('certificateList') },
+    physicalExamTypeOptions() { return this.getDictOptions('PHYSICALEXAMTYPE') },
+    ecgOptions() { return this.getDictOptions('ECG') },
+    contractStatusOptions() { return this.getDictOptions('CONTRACTSTATUS') },
+    leaveTypeOptions() { return this.getDictOptions('LEAVETYPE') },
+    insuranceGaersOptions() { return this.getDictOptions('INSURANCETYPE') },
+    applayStatusOptions() { return this.getDictOptions('applayStatus') },
+    reportStatusOptions() { return this.getDictOptions('reportStatus') },
+    hospitalizatioFlagOptions() { return this.getDictOptions('hospitalizatioFlag') },
+    settleStatusOptions() { return this.getDictOptions('settleStatus') },
+    arbitrationTypeOptions() { return this.getDictOptions('ZCTYPE') },
+    changeTypeOptions() { return this.getDictOptions('changeType') },
+    dimissionTypeOptions() { return this.getDictOptions('LZTYPE') },
+    sexOptions() { return this.getDictOptions('sex') }
   },
   mounted() {
     this.initDept()
-    /* 政治面貌*/
-    this.getDicts('PLITICAL').then(response => {
-      this.statusOptions = response.data
-    })
-    this.getDicts('sex').then(response => {
-      this.sexOptions = response.data
-    })
-    this.getDicts('empType').then(response => {
-      this.empTypeOptions = response.data
-    })
-    this.getDicts('NATION').then(response => {
-      this.nationOptions = response.data
-    })
-    this.getDicts('MARRIAGE').then(response => {
-      this.marriageOptions = response.data
-    })
-    this.getDicts('EDUCATION').then(response => {
-      this.educationOptions = response.data
-    })
-    this.getDicts('NATIVEPLACE').then(response => {
-      this.nativePlaceOptions = response.data
-    })
-    this.getDicts('archivesStatus').then(response => {
-      this.archivesStatusOptions = response.data
-    })
-    this.getDicts('INSURANCETYPE').then(response => {
-      this.insuranceTypeOptions = response.data
-    })
-    this.getDicts('empCardStatus').then(response => {
-      this.empCardStatusOptions = response.data
-    })
-    this.getDicts('handbookStatus').then(response => {
-      this.handbookStatusOptions = response.data
-    })
-    this.getDicts('certificateList').then(response => {
-      this.certificateListOptions = response.data
-    })
-    this.getDicts('PHYSICALEXAMTYPE').then(response => {
-      this.physicalExamTypeOptions = response.data
-    })
-    this.getDicts('ECG').then(response => {
-      this.ecgOptions = response.data
-    })
-    this.getDicts('CONTRACTSTATUS').then(response => {
-      this.contractStatusOptions = response.data
-    })
-    this.getDicts('LEAVETYPE').then(response => {
-      this.leaveTypeOptions = response.data
-    })
-    this.getDicts('insuranceGaers').then(response => {
-      this.insuranceGaersOptions = response.data
-    })
-    this.getDicts('applayStatus').then(response => {
-      this.applayStatusOptions = response.data
-    })
-    this.getDicts('reportStatus').then(response => {
-      this.reportStatusOptions = response.data
-    })
-    this.getDicts('hospitalizatioFlag').then(response => {
-      this.hospitalizatioFlagOptions = response.data
-    })
-    this.getDicts('settleStatus').then(response => {
-      this.settleStatusOptions = response.data
-    })
-    this.getDicts('ZCTYPE').then(response => {
-      this.arbitrationTypeOptions = response.data
-    })
-    this.getDicts('changeType').then(response => {
-      this.changeTypeOptions = response.data
-    })
-    this.getDicts('LZTYPE').then(response => {
-      this.dimissionTypeOptions = response.data
-    })
+    // 字典数据已在登录时预加载,直接从 Vuex 获取
+    this.initDictTypes(['PLITICAL', 'sex', 'empType', 'NATION', 'MARRIAGE', 'EDUCATION', 'NATIVEPLACE', 'archivesStatus', 'INSURANCETYPE', 'empCardStatus', 'handbookStatus', 'certificateList', 'PHYSICALEXAMTYPE', 'ECG', 'CONTRACTSTATUS', 'LEAVETYPE', 'applayStatus', 'reportStatus', 'hospitalizatioFlag', 'settleStatus', 'ZCTYPE', 'changeType', 'LZTYPE'])
   },
   methods: {
     clickImg(node) {
@@ -4126,23 +4307,171 @@
         certificateList = val.certificateList.split(',')
         val.certificateList = certificateList
       }
+      const remarks = ''
+      val.remark = remarks
+      this.readon = false
       this.empBaseInfoForm = { ...val }
       this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
       this.fileDate.empId = this.empBaseInfoForm.empId
       this.labelfrom.empId = this.empBaseInfoForm.empId
-      this.remarkInfoForm = { ...val }
-      this.laborTroubleForm = { ...val }
-      this.occupationalForm = { ...val }
-      this.accidentCasesForm = { ...val }
-      this.insuranceForm = { ...val }
-      this.unemploymentForm = { ...val }
-      this.resignForm = { ...val }
-      this.leaveInfoForm = { ...val }
-      this.contractInfoForm = { ...val }
-      this.dimissionAttendForm = { ...val }
-      this.physicalExamForm = { ...val }
-      this.workExperienceForm = { ...val }
-      this.badRecordForm = { ...val }
+
+      this.remarkInfoForm.allDeptName = val.allDeptName
+      this.remarkInfoForm.certificateNumb = val.certificateNumb
+      this.remarkInfoForm.empId = val.empId
+      this.remarkInfoForm.empName = val.empName
+      this.remarkInfoForm.empNumb = val.empNumb
+      this.remarkInfoForm.deptName = val.deptName
+      this.remarkInfoForm.deptId = val.deptId
+      this.remarkInfoForm.jobId = val.jobId
+      this.remarkInfoForm.jobName = val.jobName
+      this.remarkInfoForm.sex = val.sex
+      this.remarkInfoForm.delFlag = 0
+      this.$set(this.remarkInfoForm, 'delFlag', 0)
+
+      this.laborTroubleForm.allDeptName = val.allDeptName
+      this.laborTroubleForm.certificateNumb = val.certificateNumb
+      this.laborTroubleForm.empId = val.empId
+      this.laborTroubleForm.empName = val.empName
+      this.laborTroubleForm.empNumb = val.empNumb
+      this.laborTroubleForm.deptName = val.deptName
+      this.laborTroubleForm.deptId = val.deptId
+      this.laborTroubleForm.jobId = val.jobId
+      this.laborTroubleForm.jobName = val.jobName
+      this.laborTroubleForm.sex = val.sex
+      this.$set(this.laborTroubleForm, 'delFlag', 0)
+
+      this.occupationalForm.allDeptName = val.allDeptName
+      this.occupationalForm.certificateNumb = val.certificateNumb
+      this.occupationalForm.empId = val.empId
+      this.occupationalForm.empName = val.empName
+      this.occupationalForm.empNumb = val.empNumb
+      this.occupationalForm.deptName = val.deptName
+      this.occupationalForm.deptId = val.deptId
+      this.occupationalForm.jobId = val.jobId
+      this.occupationalForm.jobName = val.jobName
+      this.occupationalForm.sex = val.sex
+      this.$set(this.occupationalForm, 'delFlag', 0)
+
+      this.insuranceForm.allDeptName = val.allDeptName
+      this.insuranceForm.certificateNumb = val.certificateNumb
+      this.insuranceForm.empId = val.empId
+      this.insuranceForm.empName = val.empName
+      this.insuranceForm.empNumb = val.empNumb
+      this.insuranceForm.deptName = val.deptName
+      this.insuranceForm.deptId = val.deptId
+      this.insuranceForm.jobId = val.jobId
+      this.insuranceForm.jobName = val.jobName
+      this.insuranceForm.sex = val.sex
+      this.$set(this.insuranceForm, 'delFlag', 0)
+
+      this.unemploymentForm.allDeptName = val.allDeptName
+      this.unemploymentForm.certificateNumb = val.certificateNumb
+      this.unemploymentForm.empId = val.empId
+      this.unemploymentForm.empName = val.empName
+      this.unemploymentForm.empNumb = val.empNumb
+      this.unemploymentForm.deptName = val.deptName
+      this.unemploymentForm.deptId = val.deptId
+      this.unemploymentForm.jobId = val.jobId
+      this.unemploymentForm.jobName = val.jobName
+      this.unemploymentForm.sex = val.sex
+      this.$set(this.unemploymentForm, 'delFlag', 0)
+
+      this.resignForm.allDeptName = val.allDeptName
+      this.resignForm.certificateNumb = val.certificateNumb
+      this.resignForm.empId = val.empId
+      this.resignForm.empName = val.empName
+      this.resignForm.empNumb = val.empNumb
+      this.resignForm.deptName = val.deptName
+      this.resignForm.deptId = val.deptId
+      this.resignForm.jobId = val.jobId
+      this.resignForm.jobName = val.jobName
+      this.resignForm.sex = val.sex
+      this.$set(this.resignForm, 'delFlag', 0)
+
+      this.leaveInfoForm.allDeptName = val.allDeptName
+      this.leaveInfoForm.certificateNumb = val.certificateNumb
+      this.leaveInfoForm.empId = val.empId
+      this.leaveInfoForm.empName = val.empName
+      this.leaveInfoForm.empNumb = val.empNumb
+      this.leaveInfoForm.deptName = val.deptName
+      this.leaveInfoForm.deptId = val.deptId
+      this.leaveInfoForm.jobId = val.jobId
+      this.leaveInfoForm.jobName = val.jobName
+      this.leaveInfoForm.sex = val.sex
+      this.$set(this.leaveInfoForm, 'delFlag', 0)
+
+      this.contractInfoForm.allDeptName = val.allDeptName
+      this.contractInfoForm.certificateNumb = val.certificateNumb
+      this.contractInfoForm.empId = val.empId
+      this.contractInfoForm.empName = val.empName
+      this.contractInfoForm.empNumb = val.empNumb
+      this.contractInfoForm.deptName = val.deptName
+      this.contractInfoForm.deptId = val.deptId
+      this.contractInfoForm.jobId = val.jobId
+      this.contractInfoForm.jobName = val.jobName
+      this.contractInfoForm.sex = val.sex
+      this.$set(this.contractInfoForm, 'delFlag', 0)
+
+      this.dimissionAttendForm.allDeptName = val.allDeptName
+      this.dimissionAttendForm.certificateNumb = val.certificateNumb
+      this.dimissionAttendForm.empId = val.empId
+      this.dimissionAttendForm.empName = val.empName
+      this.dimissionAttendForm.empNumb = val.empNumb
+      this.dimissionAttendForm.deptName = val.deptName
+      this.dimissionAttendForm.deptId = val.deptId
+      this.dimissionAttendForm.jobId = val.jobId
+      this.dimissionAttendForm.jobName = val.jobName
+      this.dimissionAttendForm.sex = val.sex
+      this.$set(this.dimissionAttendForm, 'delFlag', 0)
+
+      this.physicalExamForm.allDeptName = val.allDeptName
+      this.physicalExamForm.certificateNumb = val.certificateNumb
+      this.physicalExamForm.empId = val.empId
+      this.physicalExamForm.empName = val.empName
+      this.physicalExamForm.empNumb = val.empNumb
+      this.physicalExamForm.deptName = val.deptName
+      this.physicalExamForm.deptId = val.deptId
+      this.physicalExamForm.jobId = val.jobId
+      this.physicalExamForm.jobName = val.jobName
+      this.physicalExamForm.sex = val.sex
+      this.$set(this.physicalExamForm, 'delFlag', 0)
+
+      this.workExperienceForm.allDeptName = val.allDeptName
+      this.workExperienceForm.certificateNumb = val.certificateNumb
+      this.workExperienceForm.empId = val.empId
+      this.workExperienceForm.empName = val.empName
+      this.workExperienceForm.empNumb = val.empNumb
+      this.workExperienceForm.deptName = val.deptName
+      this.workExperienceForm.deptId = val.deptId
+      this.workExperienceForm.jobId = val.jobId
+      this.workExperienceForm.jobName = val.jobName
+      this.workExperienceForm.sex = val.sex
+      this.$set(this.workExperienceForm, 'delFlag', 0)
+
+      this.badRecordForm.allDeptName = val.allDeptName
+      this.badRecordForm.certificateNumb = val.certificateNumb
+      this.badRecordForm.empId = val.empId
+      this.badRecordForm.empName = val.empName
+      this.badRecordForm.empNumb = val.empNumb
+      this.badRecordForm.deptName = val.deptName
+      this.badRecordForm.deptId = val.deptId
+      this.badRecordForm.jobId = val.jobId
+      this.badRecordForm.jobName = val.jobName
+      this.badRecordForm.sex = val.sex
+      this.$set(this.badRecordForm, 'delFlag', 0)
+
+      this.accidentCasesForm.allDeptName = val.allDeptName
+      this.accidentCasesForm.certificateNumb = val.certificateNumb
+      this.accidentCasesForm.empId = val.empId
+      this.accidentCasesForm.empName = val.empName
+      this.accidentCasesForm.empNumb = val.empNumb
+      this.accidentCasesForm.deptName = val.deptName
+      this.accidentCasesForm.deptId = val.deptId
+      this.accidentCasesForm.jobId = val.jobId
+      this.accidentCasesForm.jobName = val.jobName
+      this.accidentCasesForm.sex = val.sex
+      this.$set(this.accidentCasesForm, 'delFlag', 0)
+
       this.initlabel()
       this.initphysicalExamData()
       this.initList() // 工作经历
@@ -4154,7 +4483,7 @@
       this.initunemploymentData() // 失业金领取
       this.initinsuranceData() // 社保申请
       this.initremarkInfoData() // 备注
-      this.initlaborTroubleData() // 劳资案件
+      this.initlaborTroubleData() // 仲裁案件
       this.initoccupationalData() // 工伤案件
       this.initbadRecordData() // 不良记录
       this.initaccidentCasesData() // 意外险案件
@@ -4178,6 +4507,8 @@
       params.pageNum = this.pagination.num
       params.certificateNumb = this.empBaseInfoForm.certificateNumb
       params.delFlag = '0'
+      params.field = 'changeDate'
+      params.order = 'ascending'
       this.$get('hr/empJobChange/list', {
         ...params
       }).then((r) => {
@@ -4193,6 +4524,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) => {
@@ -4223,6 +4556,8 @@
       //   this.empBaseInfoForm.imagePath = ''
       // }
       this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
+        this.readon = false
+        this.$emit('success')
         this.$message({
           message: this.$t('tips.updateSuccess'),
           type: 'success'
@@ -4818,6 +5153,149 @@
     getIndex($index) {
       return (this.pagination.num - 1) * this.pagination.size + $index + 1
     },
+    // 打开上传方式选择弹窗
+    openUploadChoice() {
+      this.uploadChoiceDialogVisible = true
+    },
+    // 选择拍照上传
+    choiceCamera() {
+      this.uploadChoiceDialogVisible = false
+      this.cameraDialogVisible = true
+      this.$nextTick(() => {
+        this.initCamera()
+      })
+    },
+    // 选择文件上传
+    choiceFile() {
+      this.uploadChoiceDialogVisible = false
+      // 创建隐藏的文件输入框
+      const input = document.createElement('input')
+      input.type = 'file'
+      input.accept = 'image/*'
+      input.onchange = (e) => {
+        const file = e.target.files[0]
+        if (file) {
+          this.handleFileUpload(file)
+        }
+      }
+      input.click()
+    },
+    // 处理文件上传
+    handleFileUpload(file) {
+      // 验证文件类型
+      const isImage = file.type.startsWith('image/')
+      if (!isImage) {
+        this.$message.error('请上传图片文件')
+        return
+      }
+      // 验证文件大小(限制10MB)
+      const isLt10M = file.size / 1024 / 1024 < 10
+      if (!isLt10M) {
+        this.$message.error('图片大小不能超过10MB')
+        return
+      }
+      // 生成预览URL
+      const imageUrl = URL.createObjectURL(file)
+      this.empBaseInfoImageUrl = imageUrl
+      // 读取文件为Base64
+      const reader = new FileReader()
+      reader.onload = (e) => {
+        this.empBaseInfoForm.imagePath = e.target.result
+        this.$message.success('照片上传成功')
+      }
+      reader.readAsDataURL(file)
+    },
+    // 打开摄像头
+    openCamera() {
+      this.cameraDialogVisible = true
+      this.$nextTick(() => {
+        this.initCamera()
+      })
+    },
+    // 初始化摄像头
+    async initCamera() {
+      try {
+        // 请求摄像头权限
+        this.stream = await navigator.mediaDevices.getUserMedia({
+          video: {
+            width: { ideal: 640 },
+            height: { ideal: 480 },
+            facingMode: 'user' // 前置摄像头
+          },
+          audio: false
+        })
+
+        // 将视频流绑定到 video 元素
+        const video = this.$refs.video
+        if (video) {
+          video.srcObject = this.stream
+        }
+      } catch (error) {
+        this.$message.error('无法访问摄像头,请检查摄像头权限设置')
+        console.error('摄像头初始化失败:', error)
+      }
+    },
+    // 拍照
+    takePhoto() {
+      const video = this.$refs.video
+      const canvas = this.$refs.canvas
+
+      if (!video || !canvas) return
+
+      // 设置画布尺寸
+      canvas.width = video.videoWidth || 640
+      canvas.height = video.videoHeight || 480
+
+      // 绘制视频帧到画布
+      const ctx = canvas.getContext('2d')
+      ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
+
+      // 转换为图片数据
+      this.capturedImage = canvas.toDataURL('image/jpeg', 0.9)
+
+      // 停止摄像头
+      this.stopCamera()
+    },
+    // 重拍
+    retakePhoto() {
+      this.capturedImage = ''
+      this.initCamera()
+    },
+    // 确认使用照片
+    confirmPhoto() {
+      if (this.capturedImage) {
+        // 设置图片预览
+        this.empBaseInfoImageUrl = this.capturedImage
+
+        // 设置表单数据(Base64格式)
+        this.empBaseInfoForm.imagePath = this.capturedImage
+
+        // 关闭弹窗
+        this.closeCamera()
+
+        this.$message.success('照片已保存')
+      }
+    },
+    // 关闭摄像头
+    closeCamera() {
+      this.stopCamera()
+      this.cameraDialogVisible = false
+      this.capturedImage = ''
+    },
+    // 停止摄像头流
+    stopCamera() {
+      if (this.stream) {
+        this.stream.getTracks().forEach(track => {
+          track.stop()
+        })
+        this.stream = null
+      }
+
+      const video = this.$refs.video
+      if (video) {
+        video.srcObject = null
+      }
+    },
     cleanOccupational() {
       this.occupationalForm.occupationalId = ''
       this.occupationalForm.injuredTime = ''
@@ -5280,8 +5758,8 @@
       this.insuranceForm.applayDate = row.applayDate
       this.insuranceForm.proposer = row.proposer
       this.insuranceForm.insuranceGaers = row.insuranceGaers
-      this.insuranceForm.reportStatus = row.reportStatus
-      this.insuranceForm.applayStatus = row.applayStatus
+      this.insuranceForm.reportStatus = row.reportStatus === 0 ? '' : '' + row.reportStatus
+      this.insuranceForm.applayStatus = row.applayStatus === 0 ? '' : '' + row.applayStatus
       this.insuranceForm.auditor = row.auditor
       this.insuranceForm.createTime = row.createTime
       this.insuranceForm.creator = row.creator
@@ -5313,7 +5791,7 @@
       this.accidentCasesForm.injuredDescribe = row.injuredDescribe
       this.accidentCasesForm.hospitalName = row.hospitalName
       this.accidentCasesForm.treatmentName = row.treatmentName
-      this.accidentCasesForm.hospitalizatioFlag = row.hospitalizatioFlag
+      this.accidentCasesForm.hospitalizatioFlag = '' + row.hospitalizatioFlag
       this.accidentCasesForm.bedNumb = row.bedNumb
       this.accidentCasesForm.reprotTime = row.reprotTime
       this.accidentCasesForm.submitTime = row.submitTime
@@ -5323,7 +5801,7 @@
       this.accidentCasesForm.innsureFee = row.innsureFee
       this.accidentCasesForm.hrDoDate = row.hrDoDate
       this.accidentCasesForm.settleDate = row.settleDate
-      this.accidentCasesForm.settleStatus = row.settleStatus
+      this.accidentCasesForm.settleStatus = '' + row.settleStatus
       this.accidentCasesForm.remark = row.remark
       this.accidentCasesForm.createTime = row.createTime
       this.accidentCasesForm.creator = row.creator
@@ -5354,7 +5832,7 @@
       this.occupationalForm.injuredDescribe = row.injuredDescribe
       this.occupationalForm.hospitalName = row.hospitalName
       this.occupationalForm.treatmentName = row.treatmentName
-      this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag
+      this.occupationalForm.hospitalizatioFlag = '' + row.hospitalizatioFlag
       this.occupationalForm.bedNumb = row.bedNumb
       this.occupationalForm.reportTime = row.reportTime
       this.occupationalForm.submitTime = row.submitTime
@@ -5373,7 +5851,7 @@
       this.occupationalForm.companySubsidy = row.companySubsidy
       this.occupationalForm.companyCompensation = row.companyCompensation
       this.occupationalForm.jobSubsidy = row.jobSubsidy
-      this.occupationalForm.settleStatus = row.settleStatus
+      this.occupationalForm.settleStatus = '' + row.settleStatus
       this.occupationalForm.createTime = row.createTime
       this.occupationalForm.creator = row.creator
       this.occupationalForm.modifyTime = row.modifyTime
@@ -5402,7 +5880,7 @@
       this.laborTroubleForm.arbitrationReason = row.arbitrationReason
       this.laborTroubleForm.reporter = row.reporter
       this.laborTroubleForm.arbitrationPay = row.arbitrationPay
-      this.laborTroubleForm.arbitrationStatus = row.arbitrationStatus
+      this.laborTroubleForm.arbitrationStatus = '' + row.arbitrationStatus
       this.laborTroubleForm.settleDate = row.settleDate
       this.laborTroubleForm.createTime = row.createTime
       this.laborTroubleForm.creator = row.creator
@@ -5452,6 +5930,7 @@
       this.remarkInfoForm.deptName = row.deptName
       this.remarkInfoForm.jobName = row.jobName
       this.remarkInfoForm.remarkContent = row.remarkContent
+      // this.$set(this.remarkInfoForm, 'remarkContent', row.remarkContent)
       this.remarkInfoForm.remarkDate = row.remarkDate
       this.remarkInfoForm.createTime = row.createTime
       this.remarkInfoForm.creator = row.creator
@@ -5540,9 +6019,9 @@
           message: this.$t('tips.deleteSuccess'),
           type: 'success'
         })
-        if (selection === 'onremarkInfoDataselection') {
+        if (selection === 'remarkInfoDataselection') {
           this.initremarkInfoData()
-        } else if (selection === 'onbadRecordDataselection') {
+        } else if (selection === 'badRecordDataselection') {
           this.initbadRecordData()
         } else if (selection === 'laborTroubleDataselection') {
           this.initlaborTroubleData()
@@ -5694,10 +6173,10 @@
     singleDelete(row, names) {
       let ids = ''
       let urls = ''
-      if (names === 'onremarkInfoDataselection') {
+      if (names === 'remarkInfoDataselection') {
         ids = row.remarkId
         urls = 'empRemarkInfo'
-      } else if (names === 'onbadRecordDataselection') {
+      } else if (names === 'badRecordDataselection') {
         ids = row.badId
         urls = 'empBadRecord'
       } else if (names === 'laborTroubleDataselection') {
@@ -5772,9 +6251,45 @@
       this.$emit('close')
     },
     reset() {
-      this.$refs.form.clearValidate()
-      this.$refs.form.resetFields()
+      if (undefined !== this.$refs.form) {
+        this.$refs.form.clearValidate()
+        this.$refs.form.resetFields()
+      }
+
       this.sysConfig = this.initSysConfig()
+    },
+    startDate(rule, value, callback) {
+      // 如果结束日期没选,cb
+      if (!this.contractInfoForm.endDate) {
+        callback()
+      } else {
+        // 结束日期有,进行判断
+        if (this.compareDate(value, this.contractInfoForm.endDate)) {
+          // 如果起始在结束之前
+          callback()
+        } else {
+          callback(new Error('开始日期不能在结束日期之后,请重新选择'))
+        }
+      }
+    },
+    // 验证合同结束日期
+    endDate(rule, value, callback) {
+      // 如果起始日期没选,cb
+      if (!this.contractInfoForm.signingDate) {
+        callback()
+      } else {
+        // 起始日期有,进行判断
+        if (this.compareDate(this.contractInfoForm.signingDate, value)) {
+          // 如果起始在结束之前
+          this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'o')
+          callback()
+        } else {
+          callback(new Error('结束日期不能在开始始日期之前,请重新选择'))
+        }
+      }
+    },
+    compareDate(start, end) {
+      return new Date(end).getTime() > new Date(start).getTime()
     }
   }
 }
@@ -5811,7 +6326,7 @@
     height: 90vh;
     overflow-y: scroll;
 
-    .jbxxTitle,.jbxxTitle2 {
+    .jbxxTitle, .jbxxTitle2 {
       height: 30px;
       line-height: 30px;
       padding-left: 15px;
@@ -5826,7 +6341,7 @@
     }
 
     .jbxxTitle::before,
-    .jbxxTitle2::before{
+    .jbxxTitle2::before {
       content: '';
       position: absolute;
       left: -10px;
@@ -6009,7 +6524,7 @@
 .myRedCheckBox .el-checkbox__label {
   width: 90%;
   overflow: hidden;
-  text-overflow:ellipsis;
+  text-overflow: ellipsis;
   white-space: nowrap;
 }
 
@@ -6038,6 +6553,109 @@
   width: 150px;
   height: 150px;
   display: block;
+}
+
+// 头像包装器
+.avatar-wrapper {
+  text-align: center;
+  cursor: pointer;
+
+  .avatar {
+    width: 120px;
+    height: 150px;
+    border-radius: 4px;
+    object-fit: cover;
+    border: 1px dashed #d9d9d9;
+    margin: 0 auto;
+
+    &:hover {
+      border-color: #409eff;
+    }
+  }
+
+  .avatar-uploader-placeholder {
+    width: 120px;
+    height: 150px;
+    border: 1px dashed #d9d9d9;
+    border-radius: 4px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin: 0 auto;
+    background-color: #fafafa;
+
+    &:hover {
+      border-color: #409eff;
+    }
+
+    .avatar-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+    }
+
+    .upload-tip {
+      font-size: 12px;
+      color: #8c939d;
+      margin-top: 8px;
+    }
+  }
+}
+
+// 上传方式选择容器
+.upload-choice-container {
+  display: flex;
+  justify-content: space-around;
+  padding: 20px 0;
+
+  .upload-choice-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 120px;
+    height: 120px;
+    border: 2px dashed #d9d9d9;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &:hover {
+      border-color: #409eff;
+      background-color: #f5f7fa;
+    }
+
+    i {
+      font-size: 40px;
+      color: #409eff;
+      margin-bottom: 10px;
+    }
+
+    span {
+      font-size: 14px;
+      color: #606266;
+    }
+  }
+}
+
+// 摄像头容器
+.camera-container {
+  text-align: center;
+
+  .camera-video {
+    width: 100%;
+    max-width: 600px;
+    height: auto;
+    border-radius: 4px;
+    background: #000;
+  }
+
+  .captured-image {
+    width: 100%;
+    max-width: 600px;
+    height: auto;
+    border-radius: 4px;
+  }
 }
 
 .avatar-uploader .el-upload-dragger .el-icon-upload {
@@ -6069,7 +6687,7 @@
   list-style: none;
   padding-left: 10px !important;
 
-  >li:last-of-type {
+  > li:last-of-type {
     > div:first-of-type {
       position: absolute;
       left: 4px;
@@ -6098,10 +6716,12 @@
       height: 35px;
       box-sizing: border-box;
       padding-left: 28px !important;
-       &:hover {
-         color: #a00515;
-         cursor: pointer;
-       }
+
+      &:hover {
+        color: #a00515;
+        cursor: pointer;
+      }
+
       .light {
         color: #a00515;
       }
@@ -6131,38 +6751,46 @@
 <style lang="scss">
 .da-dialog {
   button.el-dialog__headerbtn {
-      height: 30px;
-      width: 30px;
+    height: 30px;
+    width: 30px;
     background-color: #a00515;
     opacity: 0.8;
-      line-height: 30px;
-      border-radius: 50%;
+    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;
-}
+
+  .el-dialog__title {
+    font-weight: 700;
+  }
+
   .el-dialog__body {
     padding: 10px 20px;
   }
 }
+
 .el-dialog.is-fullscreen {
   overflow: hidden;
 }
@@ -6173,6 +6801,7 @@
     color: #333 !important;
   }
 }
+
 .pri-del-btn {
   background-color: rgb(64, 158, 255) !important;
   border-color: rgb(64, 158, 255) !important;

--
Gitblit v1.8.0