From 4e6b24f719a8a44eb8efd9c47e846cf86137e205 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 11:55:35 +0800
Subject: [PATCH] fix(bug修复): 添加员工时部门选择框提示要选择部门

---
 src/views/user/Informationinput.vue | 1093 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 814 insertions(+), 279 deletions(-)

diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 09c2376..9ad4b6d 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -50,7 +50,7 @@
       <el-main>
         <el-row>
           <el-col :span="24">
-            <el-button class="commonBtn" @click.native="dialogIsShow()">新增</el-button>
+            <el-button class="commonBtn" @click.native="dialogIsShow('0')">新增</el-button>
             <el-button class="commonBtn" style="background-color: #409EFF" @click.native="butDelete()">删除</el-button>
             <el-button class="commonBtn" style="float: right" @click.native="showDryg(0)">导入员工信息</el-button>
           </el-col>
@@ -60,8 +60,11 @@
           ref="empBaseInfoTable"
           :data="basicInformationData"
           stripe
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          border
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -78,32 +81,59 @@
                 编辑
               </span>
             </template>
-          </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+          </el-table-column>-->
+          <!--          <el-table-column label="照片" width="60">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              &lt;!&ndash;              <img :src="scope.row.imagePath">&ndash;&gt;-->
+          <!--              <el-image-->
+          <!--                v-if="scope.row.imagePath && scope.row.imagePath != ''"-->
+          <!--                style="width: 30px; height: 30px"-->
+          <!--                :src="scope.row.imagePath"-->
+          <!--                fit="cover"-->
+          <!--              />-->
+
+          <!--              <el-image-->
+          <!--                v-else-->
+          <!--                style="width: 30px; height: 30px"-->
+          <!--                :src="defaultImg"-->
+          <!--                fit="cover"-->
+          <!--              />-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
           <el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
           <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
           <el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
           <el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
           <el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
-          <el-table-column show-overflow-tooltip prop="education" label="最高学历" width="80" :formatter="educationFormat" />
-          <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
-          <el-table-column prop="insuranceType" show-overflow-tooltip label="保险类型" width="80" :formatter="insuranceTypeFormat" />
-          <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
-          <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" />
-          <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" />
+          <el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
+          <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column
+            prop="insuranceType"
+            show-overflow-tooltip
+            label="保险类型"
+            width="80"
+            :formatter="insuranceTypeFormat"
+          />
+          <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" width="100" />
+          <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" width="100" />
+          <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" width="80" />
           <el-table-column prop="archivesStatusName" show-overflow-tooltip label="档案情况" />
         </el-table>
         <el-table
           v-show="showArr[1].show"
           ref="workExperienceTable"
           :data="workExperienceData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column label="操作" width="100">
@@ -120,21 +150,24 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="empNumb" label="员工编号" width="100" />
-          <el-table-column prop="empName" label="员工姓名" width="100" />
-          <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
-          <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
-          <el-table-column prop="beginDate" label="开始日期" width="120" />
-          <el-table-column prop="endDate" label="结束日期" width="120" />
-          <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" />
+          <el-table-column prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" width="180" />
+          <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" width="160" />
+          <el-table-column prop="beginDate" label="开始日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column prop="endDate" label="结束日期" width="140" />
+          <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" min-width="120" />
         </el-table>
         <el-table
           v-show="showArr[2].show"
           ref="physicalExamTable"
           :data="physicalExamData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -152,28 +185,37 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
-          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
-          <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
-          <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
-          <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="80" :formatter="typeFormat" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
+          <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" min-width="100" />
+          <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column
+            show-overflow-tooltip
+            prop="physicalExamType"
+            label="体检类型"
+            width="80"
+            :formatter="typeFormat"
+          />
           <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
           <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
           <el-table-column prop="ecg" show-overflow-tooltip label="心电图" width="80" :formatter="ecgNameFormat" />
-          <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
-          <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查记录" />
+          <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" min-width="100" />
+          <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" min-width="100" />
           <el-table-column prop="remark" show-overflow-tooltip label="备注" />
         </el-table>
         <el-table
           v-show="showArr[3].show"
           ref="contractInfoTable"
           :data="contractInfoData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column label="操作" width="100">
@@ -191,24 +233,27 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
-          <el-table-column prop="empName" label="员工姓名" width="100" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
-          <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 prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="155" />
+          <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+          <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="100" />
         </el-table>
         <el-table
           v-show="showArr[4].show"
           ref="dimissionAttendTable"
           :data="dimissionAttendData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -221,16 +266,16 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
-          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
-          <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="100" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+          <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
           <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
           <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班(天)" width="100" />
-          <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班(小时)" width="80" />
-          <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="80" />
+          <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班(小时)" width="120" />
+          <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="120" />
           <el-table-column show-overflow-tooltip prop="leaveDay" label="请假(天)" width="100" />
           <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工(天)" width="100" />
           <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -239,9 +284,12 @@
           v-show="showArr[5].show"
           ref="leaveInfoTable"
           :data="leaveInfoData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -253,16 +301,16 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
-          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" />
-          <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+          <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="110" />
           <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
           <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
-          <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
+          <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="110" />
           <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
           <el-table-column show-overflow-tooltip prop="remark" label="备注" />
         </el-table>
@@ -270,9 +318,12 @@
           v-show="showArr[6].show"
           ref="resignTable"
           :data="resignData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -284,12 +335,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
-          <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
+          <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
           <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
           <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -298,9 +349,12 @@
           v-show="showArr[7].show"
           ref="unemploymentTable"
           :data="unemploymentData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -312,13 +366,13 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
-          <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="100" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
+          <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
           <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
           <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
           <el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -327,9 +381,12 @@
           v-show="showArr[8].show"
           ref="insuranceTable"
           :data="insuranceData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -341,26 +398,29 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+          <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
-          <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
+          <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" width="80" />
           <el-table-column prop="reportStatus " label="是否已报告" width="100" :formatter="reportStatusFormat" />
-          <el-table-column prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
-          <el-table-column prop="auditor" label="审核人" width="100" />
+          <el-table-column prop="applayStatus" label="状态" width="80" :formatter="applayStatusFormat" />
+          <el-table-column prop="auditor" label="审核人" width="80" />
           <el-table-column prop="remark" label="备注" />
         </el-table>
         <el-table
           v-show="showArr[9].show"
           ref="accidentCasesTable"
           :data="accidentCasesData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -372,33 +432,42 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="60" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
-          <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
-          <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
-          <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
-          <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" />
-          <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
-          <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
-          <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="60" :formatter="hospitalizatioFlagFormat" />
-          <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
-          <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="60" />
-          <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
-          <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
-          <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
-          <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="60" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+          <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
+          <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+          <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
+          <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="120" />
+          <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="80" />
+          <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />
+          <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="80" />
+          <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+          <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
+          <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+          <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
         </el-table>
         <el-table
           v-show="showArr[10].show"
           ref="occupationalTable"
           :data="occupationalData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -410,33 +479,43 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
-          <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
-          <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
-          <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
-          <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" />
-          <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
-          <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
-          <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="50" :formatter="hospitalizatioFlagFormat" />
-          <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
-          <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="60" />
-          <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
-          <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
-          <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
-          <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="60" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+          <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
+          <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+          <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
+          <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80" />
+          <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="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="settleStatusName" label="是否结案" width="80" />
         </el-table>
         <el-table
           v-show="showArr[11].show"
           ref="laborTroubleTable"
           :data="laborTroubleData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -448,28 +527,42 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
-          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="70" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
-          <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
-          <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" width="100" :formatter="arbitrationTypeFormat" />
-          <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
-          <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+          <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column
+            show-overflow-tooltip
+            prop="arbitrationType"
+            label="仲裁类型"
+            width="100"
+            :formatter="arbitrationTypeFormat"
+          />
+          <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" min-width="100" />
+          <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="70" />
           <el-table-column show-overflow-tooltip prop="remark" label="备注" />
-          <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付(元)" width="100" />
-          <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="80" :formatter="arbitrationStatusFormat" />
-          <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="120" />
+          <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付(元)" width="120" />
+          <el-table-column
+            show-overflow-tooltip
+            prop="arbitrationStatus"
+            label="状态"
+            width="50"
+            :formatter="arbitrationStatusFormat"
+          />
+          <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
         </el-table>
         <el-table
           v-show="showArr[12].show"
           ref="badRecordTable"
           :data="badRecordData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column label="操作" width="100">
@@ -486,13 +579,13 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="120" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" />
-          <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
+          <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
           <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="120" />
           <el-table-column show-overflow-tooltip prop="remark" label="备注" />
         </el-table>
@@ -500,9 +593,12 @@
           v-show="showArr[13].show"
           ref="remarkInfoTable"
           :data="remarkInfoData"
-          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+          :cell-style="{padding:'7px 0','text-align':'center'}"
+          :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
           stripe
+          border
           style="width: 100%;"
+          @sort-change="changeSort"
         >
           <el-table-column type="selection" width="50" />
           <el-table-column label="操作" width="80">
@@ -514,12 +610,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
-          <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+          <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
-          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
-          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
-          <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+          <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+          <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
           <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
         </el-table>
         <pagination
@@ -542,16 +638,18 @@
         <el-row>
           <el-col span="24">
             <el-form-item label="员工模板下载" prop="region">
-              <a href="http://120.24.23.155:8000/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
+              <a :href="downloadEmpExcel" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
               <span style="margin-left: 100px;">点击下载</span>
             </el-form-item>
             <el-form-item label="导入员工">
               <el-upload
                 ref="upload"
                 class="upload-demo"
-                action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
+                :action="uploadEmpExcel"
                 accept=".xls, .xlsx, .excel"
                 :headers="headers()"
+                :on-success="importHandleAvatarSuccess"
+                :on-error="importHandleAvatarError"
                 :file-list="fileList"
                 :auto-upload="false"
               >
@@ -582,13 +680,20 @@
           </el-upload>
         </el-aside>
         <el-main>
-          <el-form ref="empBaseInfoForm" class="info-input-form" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
+          <el-form
+            ref="empBaseInfoForm"
+            class="info-input-form"
+            :model="empBaseInfoForm"
+            :rules="rules"
+            label-position="right"
+            label-width="120px"
+          >
             <el-row>
               <el-col :span="11">
                 <el-form-item label="档案号" prop="archivesNumb">
                   <el-input v-model="empBaseInfoForm.archivesNumb" />
                 </el-form-item>
-                <el-form-item label="员工编号" prop="empNumb">
+                <el-form-item label="编号" prop="empNumb">
                   <el-input v-model="empBaseInfoForm.empNumb" />
                 </el-form-item>
                 <el-form-item label="身份证号码" prop="certificateNumb">
@@ -608,7 +713,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="民族" prop="nation">
-                  <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
+                  <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族">
                     <el-option
                       v-for="dict in nationOptions"
                       :key="dict.dicItemCode"
@@ -640,8 +745,8 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="最高学历" prop="education">
-                  <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
+                <el-form-item label="学历" prop="education">
+                  <el-select v-model="empBaseInfoForm.education" placeholder="请选择学历">
                     <el-option
                       v-for="dict in educationOptions"
                       :key="dict.dicItemCode"
@@ -695,7 +800,7 @@
                 <el-form-item label="姓名" prop="empName">
                   <el-input v-model="empBaseInfoForm.empName" />
                 </el-form-item>
-                <el-form-item label="部门(护卫点)" required message="请选择护卫点" prop="deptId">
+                <el-form-item label="部门(护卫点)" required message="请选择部门(护卫点)" prop="allDeptName">
                   <treeselect
                     v-model="empBaseInfoForm.deptId"
                     :multiple="false"
@@ -703,6 +808,7 @@
                     :clear-value-text="$t('common.clear')"
                     placeholder="请选择部门(护卫点)"
                     style="width:100%"
+                    @select="DeptNameSelect"
                   />
                 </el-form-item>
                 <el-form-item label="岗位" prop="jobName">
@@ -820,12 +926,18 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putEmpBase('empBaseInfoForm')">保 存</el-button>
-        <el-button type="primary" @click="putEmpBaseContinue('empBaseInfoForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putEmpBaseContinue('empBaseInfoForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="工作经历" :visible.sync="dialogshowArr[1].show" width="50%">
-      <el-form ref="workExperienceForm" :model="workExperienceForm" :rules="workExperienceRules" label-position="right" label-width="120px">
+      <el-form
+        ref="workExperienceForm"
+        :model="workExperienceForm"
+        :rules="workExperienceRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -836,16 +948,16 @@
                 v-model="workExperienceForm.certificateNumb"
               />
             </el-form-item>
-            <el-form-item label="性别" prop="sex">
-              <el-input v-model="workExperienceForm.sex" />
+            <el-form-item label="性别" prop="sexName">
+              <el-input v-model="workExperienceForm.sexName" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="workExperienceForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="workExperienceForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="workExperienceForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="workExperienceForm.jobName" />
@@ -892,6 +1004,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putWorkExperience('workExperienceForm')">保 存</el-button>
         <el-button
+          v-if="isAdd"
           type="primary"
           @click="putWorkExperienceContinue('workExperienceForm')"
         >保存并继续新增
@@ -900,7 +1013,13 @@
       </div>
     </el-dialog>
     <el-dialog title="体检信息" :visible.sync="dialogshowArr[2].show" width="50%">
-      <el-form ref="physicalExamForm" :model="physicalExamForm" :rules="physicalExamRules" label-position="right" label-width="120px">
+      <el-form
+        ref="physicalExamForm"
+        :model="physicalExamForm"
+        :rules="physicalExamRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -935,11 +1054,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="physicalExamForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="physicalExamForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="physicalExamForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="physicalExamForm.jobName" />
@@ -972,8 +1091,13 @@
             <el-form-item label="体检结论" prop="conclusion">
               <el-input v-model="physicalExamForm.conclusion" />
             </el-form-item>
-            <el-form-item label="复查记录" prop="reviewRecord">
-              <el-input v-model="physicalExamForm.reviewRecord" />
+            <el-form-item label="复查日期" prop="reviewRecord">
+              <el-date-picker
+                v-model="physicalExamForm.reviewRecord"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="选择复查日期"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -988,6 +1112,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putPhysicalExam('physicalExamForm')">保 存</el-button>
         <el-button
+          v-if="isAdd"
           type="primary"
           @click="putPhysicalExamContinue('physicalExamForm')"
         >保存并继续新增
@@ -996,7 +1121,13 @@
       </div>
     </el-dialog>
     <el-dialog title="合同信息" :visible.sync="dialogshowArr[3].show" width="50%">
-      <el-form ref="contractInfoForm" :model="contractInfoForm" :rules="contractInfoRules" label-position="right" label-width="120px">
+      <el-form
+        ref="contractInfoForm"
+        :model="contractInfoForm"
+        :rules="contractInfoRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1036,11 +1167,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="contractInfoForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="contractInfoForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="contractInfoForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="contractInfoForm.jobName" />
@@ -1069,6 +1200,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putContractInfo('contractInfoForm')">保 存</el-button>
         <el-button
+          v-if="isAdd"
           type="primary"
           @click="putContractInfoContinue('contractInfoForm')"
         >保存并继续新增
@@ -1077,7 +1209,13 @@
       </div>
     </el-dialog>
     <el-dialog title="离职当月考勤" :visible.sync="dialogshowArr[4].show" width="50%">
-      <el-form ref="dimissionAttendForm" :model="dimissionAttendForm" :rules="dimissionAttendRules" label-position="right" label-width="120px">
+      <el-form
+        ref="dimissionAttendForm"
+        :model="dimissionAttendForm"
+        :rules="dimissionAttendRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1110,11 +1248,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="dimissionAttendForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="dimissionAttendForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="dimissionAttendForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="dimissionAttendForm.jobName" />
@@ -1142,12 +1280,19 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
-        <el-button type="primary" @click="putDimissionAttendContinue('dimissionAttendForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putDimissionAttendContinue('dimissionAttendForm')">保存并继续新增
+        </el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="请假记录" :visible.sync="dialogshowArr[5].show" width="50%">
-      <el-form ref="leaveInfoForm" :model="leaveInfoForm" :rules="leaveInfoRules" label-position="right" label-width="120px">
+      <el-form
+        ref="leaveInfoForm"
+        :model="leaveInfoForm"
+        :rules="leaveInfoRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1187,11 +1332,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="leaveInfoForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="leaveInfoForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="leaveInfoForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="leaveInfoForm.jobName" />
@@ -1210,12 +1355,12 @@
               <el-input v-model="leaveInfoForm.leaveDay" />
             </el-form-item>
 
-            <el-form-item label="到岗时间" prop="returnDate">
+            <el-form-item label="返岗时间" prop="returnDate">
               <el-date-picker
                 v-model="leaveInfoForm.returnDate"
                 value-format="yyyy-MM-dd"
                 type="date"
-                placeholder="选择到岗时间"
+                placeholder="选择返岗时间"
               />
             </el-form-item>
 
@@ -1231,7 +1376,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putLeaveInfo('leaveInfoForm')">保 存</el-button>
-        <el-button type="primary" @click="putLeaveInfoContinue('leaveInfoForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putLeaveInfoContinue('leaveInfoForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
@@ -1260,11 +1405,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="resignForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="resignForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="resignForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="resignForm.jobName" />
@@ -1291,12 +1436,18 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putResign('resignForm')">保 存</el-button>
-        <el-button type="primary" @click="putResignContinue('resignForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putResignContinue('resignForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="失业金领取" :visible.sync="dialogshowArr[7].show" width="50%">
-      <el-form ref="unemploymentForm" :model="unemploymentForm" :rules="unemploymentRules" label-position="right" label-width="120px">
+      <el-form
+        ref="unemploymentForm"
+        :model="unemploymentForm"
+        :rules="unemploymentRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1323,11 +1474,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="unemploymentForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="unemploymentForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="unemploymentForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="unemploymentForm.jobName" />
@@ -1351,12 +1502,18 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putUnemployment('unemploymentForm')">保 存</el-button>
-        <el-button type="primary" @click="putUnemploymentContinue('unemploymentForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putUnemploymentContinue('unemploymentForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="社保申请" :visible.sync="dialogshowArr[8].show" width="50%">
-      <el-form ref="insuranceForm" :model="insuranceForm" :rules="insuranceRules" label-position="right" label-width="120px">
+      <el-form
+        ref="insuranceForm"
+        :model="insuranceForm"
+        :rules="insuranceRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1400,11 +1557,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="insuranceForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="insuranceForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="insuranceForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="insuranceForm.jobName" />
@@ -1437,12 +1594,18 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putInsurance('insuranceForm')">保 存</el-button>
-        <el-button type="primary" @click="putInsuranceContinue('insuranceForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putInsuranceContinue('insuranceForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="意外险案件" :visible.sync="dialogshowArr[9].show" width="50%">
-      <el-form ref="accidentCasesForm" :model="accidentCasesForm" :rules="accidentCasesRules" label-position="right" label-width="120px">
+      <el-form
+        ref="accidentCasesForm"
+        :model="accidentCasesForm"
+        :rules="accidentCasesRules"
+        label-position="right"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1469,11 +1632,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="accidentCasesForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="accidentCasesForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="accidentCasesForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="accidentCasesForm.jobName" />
@@ -1577,12 +1740,19 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
-        <el-button type="primary" @click="putAccidentCasesContinue('accidentCasesForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putAccidentCasesContinue('accidentCasesForm')">保存并继续新增
+        </el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="工伤案件" :visible.sync="dialogshowArr[10].show" width="50%">
-      <el-form ref="occupationalForm" :model="occupationalForm" :rules="occupationalRules" label-position="right" label-width="140px">
+      <el-form
+        ref="occupationalForm"
+        :model="occupationalForm"
+        :rules="occupationalRules"
+        label-position="right"
+        label-width="140px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1609,11 +1779,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="occupationalForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="occupationalForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="occupationalForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="occupationalForm.jobName" />
@@ -1762,12 +1932,18 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
-        <el-button type="primary" @click="putOccupationalContinue('occupationalForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putOccupationalContinue('occupationalForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="劳资案件" :visible.sync="dialogshowArr[11].show" width="50%">
-      <el-form ref="laborTroubleForm" :model="laborTroubleForm" :rules="laborTroubleRules" label-position="right" label-width="140px">
+      <el-form
+        ref="laborTroubleForm"
+        :model="laborTroubleForm"
+        :rules="laborTroubleRules"
+        label-position="right"
+        label-width="140px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1804,11 +1980,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="laborTroubleForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="laborTroubleForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="laborTroubleForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="laborTroubleForm.jobName" />
@@ -1824,7 +2000,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="仲裁赔付(元)" prop="'arbitrationPay">
-              <el-input v-model="laborTroubleForm.arbitrationPay" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" @blur="arbitrationPayChange" />
+              <el-input
+                v-model="laborTroubleForm.arbitrationPay"
+                oninput="value=value.replace(/^\.+|[^\d.]/g,'')"
+                @blur="arbitrationPayChange"
+              />
             </el-form-item>
             <el-form-item label="案结日期" prop="settleDate">
               <el-date-picker
@@ -1853,12 +2033,18 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putLaborTrouble('laborTroubleForm')">保 存</el-button>
-        <el-button type="primary" @click="putLaborTroubleContinue('laborTroubleForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putLaborTroubleContinue('laborTroubleForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog title="不良记录" :visible.sync="dialogshowArr[12].show" width="50%">
-      <el-form ref="badRecordForm" :model="badRecordForm" :rules="badRecordRules" label-position="right" label-width="140px">
+      <el-form
+        ref="badRecordForm"
+        :model="badRecordForm"
+        :rules="badRecordRules"
+        label-position="right"
+        label-width="140px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="姓名" prop="empName">
@@ -1882,11 +2068,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="badRecordForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="badRecordForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="badRecordForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="badRecordForm.jobName" />
@@ -1913,7 +2099,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
-        <el-button type="primary" @click="putBadRecordContinue('badRecordForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putBadRecordContinue('badRecordForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
@@ -1948,11 +2134,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="员工编号" prop="empNumb">
+            <el-form-item label="编号" prop="empNumb">
               <el-input v-model="remarkInfoForm.empNumb" />
             </el-form-item>
-            <el-form-item label="部门(护卫点)" prop="deptName">
-              <el-input v-model="remarkInfoForm.deptName" />
+            <el-form-item label="部门(护卫点)" prop="allDeptName">
+              <el-input v-model="remarkInfoForm.allDeptName" />
             </el-form-item>
             <el-form-item label="岗位" prop="jobName">
               <el-input v-model="remarkInfoForm.jobName" />
@@ -1969,7 +2155,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="putRemarkInfo('remarkInfoForm')">保 存</el-button>
-        <el-button type="primary" @click="putRemarkInfoContinue('remarkInfoForm')">保存并继续新增</el-button>
+        <el-button v-if="isAdd" type="primary" @click="putRemarkInfoContinue('remarkInfoForm')">保存并继续新增</el-button>
         <el-button @click="dialogIsShow()">取 消</el-button>
       </div>
     </el-dialog>
@@ -1991,15 +2177,17 @@
   components: { Treeselect, Pagination },
   data() {
     return {
-      baseicInformationForm: {
-      },
+      downloadEmpExcel: pages.downloadEmpExcel,
+      uploadEmpExcel: pages.uploadEmpExcel,
+      defaultImg: require('../../assets/avatar/20180414165936.jpg'),
+      baseicInformationForm: {},
       dialogShowDryg: false,
       empBaseInfoImageUrl: '',
       total: 0, // 总数量
       queryParams: {}, // 查询参数
       sort: {}, // 排序
       pagination: { // 分页参数
-        size: 10,
+        size: 15,
         num: 1
       },
       tableUrl: '',
@@ -2011,9 +2199,9 @@
           message: this.$t('rules.noMoreThan20'),
           trigger: 'blur'
         }],
-        empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+        empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
           { min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
-        empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
+        empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
           { min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
         deptName: [
           { required: true, message: '请选择护卫点', trigger: 'input' }
@@ -2021,12 +2209,20 @@
         certificateNumb: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
         jobName: [{ required: true, message: '请选择岗位', trigger: 'change' }],
         nativePlaceName: [{ required: true, message: '请选择籍贯', trigger: 'change' }],
-        bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, { max: 36, message: '长度不超过36个字符', trigger: 'blur' }],
+        bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, {
+          max: 36,
+          message: '长度不超过36个字符',
+          trigger: 'blur'
+        }],
         insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
         entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
         seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
         archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
-        bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, { max: 32, message: '长度不超过32个字符', trigger: 'blur' }],
+        bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, {
+          max: 32,
+          message: '长度不超过32个字符',
+          trigger: 'blur'
+        }],
         empType: [{ required: true, message: '请选择员工类型', trigger: 'change' }],
         censusAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
         currentAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
@@ -2040,21 +2236,38 @@
         urgencyPhone: [{ max: 30, message: '长度不超过30个字符', trigger: 'blur' }]
       },
       workExperienceRules: {
-        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
-        workUnit: [{ required: true, message: '请输入工作单位', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
-        beginDate: [{ required: true, validator: this.startDate }],
-        endDate: [{ required: true, validator: this.endDate }],
+        empName: [{ required: true, message: '请选择员工' }],
+        workUnit: [{ required: true, message: '请输入工作单位', trigger: 'blur' }, {
+          max: 128,
+          message: '长度不超过128个字符',
+          trigger: 'blur'
+        }],
+        beginDate: [{ required: true, trigger: 'blur', validator: this.startDate }],
+        endDate: [{ required: true, trigger: 'blur', validator: this.endDate }],
         jobContent: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
       },
       physicalExamRules: {
-        empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
-        physicalExamDate: [{ required: true, message: '请选择体检日期', trigger: 'change' }],
-        hospital: [{ required: true, message: '请输入体检医院', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
-        physicalExamType: [{ required: true, message: '请选择体检类型', trigger: 'change' }],
-        bloodPressure: [{ required: true, message: '请输入血压', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
-        transaminase: [{ required: true, message: '请输入转氨酶', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
-        ecg: [{ required: true, message: '请选择心电图', trigger: 'change' }, { max: 16, message: '长度不超过16个字符', trigger: 'blur' }],
-        conclusion: [{ required: true, message: '请输入体检结论', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+        empName: [{ required: true, message: '请选择员工' }],
+        physicalExamDate: [{ required: true, message: '请选择体检日期' }],
+        hospital: [{ required: true, message: '请输入体检医院' }, {
+          max: 64,
+          message: '长度不超过64个字符'
+        }],
+        physicalExamType: [{ required: true, message: '请选择体检类型' }],
+        bloodPressure: [{ required: true, message: '请输入血压' }, {
+          max: 40,
+          message: '长度不超过40个字符'
+        }],
+        transaminase: [{ required: true, message: '请输入转氨酶' }, {
+          max: 40,
+          message: '长度不超过40个字符'
+        }],
+        ecg: [{ required: true, message: '请选择心电图' }],
+        conclusion: [{ required: true, message: '请输入体检结论', trigger: 'blur' }, {
+          max: 128,
+          message: '长度不超过128个字符',
+          trigger: 'blur'
+        }],
         reviewRecord: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
       },
@@ -2070,8 +2283,15 @@
       dimissionAttendRules: {
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         attendMonth: [{ required: true, message: '请选择出勤月份', trigger: 'change' }],
-        deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }, { max: 100, message: '长度不超过100个字符', trigger: 'blur' }],
-        attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }, { pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '出勤天数精确到1位小数' }],
+        deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }, {
+          max: 100,
+          message: '长度不超过100个字符',
+          trigger: 'blur'
+        }],
+        attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }, {
+          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位小数' }],
@@ -2083,21 +2303,29 @@
         beginTime: [{ required: true, validator: this.startDate }],
         leaveType: [{ required: true, message: '请选择请假类型', trigger: 'change' }],
         endTime: [{ required: true, validator: this.endDate }],
-        returnDate: [{ required: true, message: '请选择到岗时间', trigger: 'change' }],
+        returnDate: [{ required: true, message: '请选择返岗时间', trigger: 'change' }],
         reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
       },
       resignRules: {
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
-        reason: [{ required: true, message: '请输入事由', trigger: 'blur' }, { max: 256, message: '长度不超过256个字符', trigger: 'blur' }],
+        reason: [{ required: true, message: '请输入事由', trigger: 'blur' }, {
+          max: 256,
+          message: '长度不超过256个字符',
+          trigger: 'blur'
+        }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
         reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }]
       },
       unemploymentRules: {
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
-        applayReason: [{ required: true, message: '请输入申报事由', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+        applayReason: [{ required: true, message: '请输入申报事由', trigger: 'blur' }, {
+          max: 128,
+          message: '长度不超过128个字符',
+          trigger: 'blur'
+        }],
         reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
         auditor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
@@ -2105,7 +2333,11 @@
       insuranceRules: {
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
-        proposer: [{ required: true, message: '请输入申请人', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+        proposer: [{ required: true, message: '请输入申请人', trigger: 'blur' }, {
+          max: 40,
+          message: '长度不超过40个字符',
+          trigger: 'blur'
+        }],
         insuranceGaers: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
         auditor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
@@ -2114,10 +2346,26 @@
       accidentCasesRules: {
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         injuredTime: [{ required: true, message: '请选择受伤时间', trigger: 'blur' }],
-        injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
-        injuredAddress: [{ required: true, message: '请输入受伤地点', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
-        injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, { max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
-        hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+        injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, {
+          max: 40,
+          message: '长度不超过40个字符',
+          trigger: 'blur'
+        }],
+        injuredAddress: [{ required: true, message: '请输入受伤地点', trigger: 'blur' }, {
+          max: 64,
+          message: '长度不超过64个字符',
+          trigger: 'blur'
+        }],
+        injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, {
+          max: 512,
+          message: '长度不超过512个字符',
+          trigger: 'blur'
+        }],
+        hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, {
+          max: 40,
+          message: '长度不超过40个字符',
+          trigger: 'blur'
+        }],
         hospitalizatioFlag: [{ required: true, message: '请选择是否住院', trigger: 'blur' }],
         innsureFee: [{ required: true, message: '请输入保险赔付费用', trigger: 'blur' }],
         expensesFee: [{ required: true, message: '请输入医疗总费用', trigger: 'blur' }],
@@ -2130,9 +2378,21 @@
       occupationalRules: {
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         injuredTime: [{ required: true, message: '请选择受伤时间', trigger: 'blur' }],
-        injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
-        injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, { max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
-        hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+        injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, {
+          max: 40,
+          message: '长度不超过40个字符',
+          trigger: 'blur'
+        }],
+        injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, {
+          max: 512,
+          message: '长度不超过512个字符',
+          trigger: 'blur'
+        }],
+        hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, {
+          max: 40,
+          message: '长度不超过40个字符',
+          trigger: 'blur'
+        }],
         hospitalizatioFlag: [{ required: true, message: '请选择是否住院', trigger: 'blur' }],
         innsureFee: [{ required: true, message: '请输入保险赔付费用', trigger: 'blur' }],
         settleDate: [{ required: true, message: '请选择案结时间', trigger: 'change' }],
@@ -2146,7 +2406,11 @@
         empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
         arbitrationType: [{ required: true, message: '请选择仲裁类型', trigger: 'change' }],
         arbitrationDate: [{ required: true, message: '请选择仲裁日期', trigger: 'change' }],
-        arbitrationReason: [{ required: true, message: '请输入仲裁事由', trigger: 'blur' }, { max: 1024, message: '长度不超过1024个字符', trigger: 'blur' }],
+        arbitrationReason: [{ required: true, message: '请输入仲裁事由', trigger: 'blur' }, {
+          max: 1024,
+          message: '长度不超过1024个字符',
+          trigger: 'blur'
+        }],
         arbitrationStatus: [{ required: true, message: '请选择结案状态', trigger: 'change' }],
         remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
         reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }]
@@ -2349,10 +2613,12 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         JobId: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         jobName: '',
         remarkContent: '',
         remarkDate: '',
@@ -2370,9 +2636,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         arbitrationDate: '',
@@ -2397,9 +2665,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         injuredTime: '',
@@ -2444,9 +2714,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         injuredTime: '',
@@ -2472,7 +2744,7 @@
         creator: '',
         modifyTime: '',
         modifier: '',
-        delFlag: '',
+        delFlag: '2',
         empStatus: 0,
         version: ''
       },
@@ -2482,9 +2754,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         applayDate: '',
@@ -2508,9 +2782,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         applayDate: '',
@@ -2532,9 +2808,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         applayDate: '',
@@ -2555,9 +2833,11 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         beginTime: '',
@@ -2582,8 +2862,10 @@
         empName: '',
         certificateNumb: '',
         sex: '',
+        sexName: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         beginDate: '',
@@ -2607,8 +2889,10 @@
         empNumb: '',
         empName: '',
         sex: '',
+        sexName: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         certificateNumb: '',
@@ -2635,8 +2919,10 @@
         empName: '',
         certificateNumb: '',
         sex: '',
+        sexName: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         hospital: '',
@@ -2663,8 +2949,10 @@
         empName: '',
         certificateNumb: '',
         sex: '',
+        sexName: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         workUnit: '',
@@ -2684,11 +2972,13 @@
         empId: '',
         customerId: '',
         archivesNumb: '',
-        deptId: '1',
+        deptId: null,
         deptName: '',
+        allDeptName: '',
         empNumb: '',
         empName: '',
         sex: '1',
+        sexName: '男',
         JobId: '',
         jobName: '',
         empType: '01',
@@ -2736,9 +3026,11 @@
         empName: '',
         empNumb: '',
         sex: '',
+        sexName: '',
         certificateNumb: '',
         deptId: '',
         deptName: '',
+        allDeptName: '',
         JobId: '',
         jobName: '',
         badDate: '',
@@ -2855,8 +3147,28 @@
     this.initDept()
     this.thisShowIndex = 1
     this.isShow(false, 0)
+    this.initJob()
   },
   methods: {
+    importHandleAvatarError() {
+      this.$notify.error({
+        title: '错误',
+        message: '导入失败'
+      })
+    },
+    importHandleAvatarSuccess(res, file) {
+      if (res.data === null || res.data.length === 0) {
+        this.$notify({
+          title: '成功',
+          message: '导入成功!',
+          type: 'success'
+        })
+      } else {
+        this.$alert(JSON.stringify(res.data), '导入失败原因', {
+          confirmButtonText: '确定'
+        })
+      }
+    },
     headers() {
       const token = getToken()
       if (token) {
@@ -2944,8 +3256,52 @@
         this[this.tableDataName] = data.rows
       })
     },
-    dialogIsShow() {
-      this.isAdd = true
+    dialogIsShow(val) {
+      this.isAdd = val === '0'
+      switch (this.thisShowIndex) {
+        case 0:
+          this.cleanEmpBase()
+          break
+        case 1:
+          this.cleanWorkExperience()
+          break
+        case 2:
+          this.cleanPhysicalExam()
+          break
+        case 3:
+          this.cleanContractInfo()
+          break
+        case 4:
+          this.cleanDimissionAttend()
+          break
+        case 5:
+          this.cleanLeaveInfo()
+          break
+        case 6:
+          this.cleanResign()
+          break
+        case 7:
+          this.cleanUnemployment()
+          break
+        case 8:
+          this.cleanInsurance()
+          break
+        case 9:
+          this.cleanAccidentCases()
+          break
+        case 10:
+          this.cleanOccupational()
+          break
+        case 11:
+          this.cleanLaborTrouble()
+          break
+        case 12:
+          this.cleanBadRecord()
+          break
+        case 13:
+          this.cleanRemarkInfo()
+          break
+      }
       this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
         .show
     },
@@ -3061,6 +3417,11 @@
     },
     resetDeptTree() {
       this.$refs.deptTree.setCheckedKeys([])
+    },
+    initJob() {
+      this.$get('system/position/dicJob').then((r) => {
+        this.restaurJob = r.data.data
+      })
     },
     butDelete() {
       let selected
@@ -3292,7 +3653,7 @@
           }
           break
         case 11:
-          selected = this.$refs.occupationalTable.selection
+          selected = this.$refs.laborTroubleTable.selection
           if (selected.length > 0) {
             const delIds = []
             selected.forEach((j) => {
@@ -3873,8 +4234,9 @@
       this.empBaseInfoForm.empId = ''
       this.empBaseInfoForm.customerId = ''
       this.empBaseInfoForm.archivesNumb = ''
-      this.empBaseInfoForm.deptId = ''
+      this.empBaseInfoForm.deptId = null
       this.empBaseInfoForm.deptName = ''
+      this.empBaseInfoForm.allDeptName = ''
       this.empBaseInfoForm.empNumb = ''
       this.empBaseInfoForm.empName = ''
       this.empBaseInfoForm.sex = ''
@@ -3927,6 +4289,7 @@
       this.empBaseInfoForm.archivesNumb = row.archivesNumb
       this.empBaseInfoForm.deptId = row.deptId
       this.empBaseInfoForm.deptName = row.deptName
+      this.empBaseInfoForm.allDeptName = row.allDeptName
       this.empBaseInfoForm.empNumb = row.empNumb
       this.empBaseInfoForm.empName = row.empName
       this.empBaseInfoForm.sex = row.sex
@@ -4027,6 +4390,7 @@
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
+            this.workExperienceForm.delFlag = '2'
             this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
               this.buttonLoading = false
               this.$message({
@@ -4055,6 +4419,7 @@
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
+            this.workExperienceForm.delFlag = '2'
             this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
               this.buttonLoading = false
               this.$message({
@@ -4069,6 +4434,17 @@
       })
     },
     cleanWorkExperience() {
+      this.workExperienceForm.empId = ''
+      this.workExperienceForm.archivesNumb = ''
+      this.workExperienceForm.deptId = ''
+      this.workExperienceForm.deptName = ''
+      this.workExperienceForm.allDeptName = ''
+      this.workExperienceForm.empNumb = ''
+      this.workExperienceForm.empName = ''
+      this.workExperienceForm.sex = ''
+      this.workExperienceForm.JobId = ''
+      this.workExperienceForm.jobName = ''
+      this.workExperienceForm.certificateNumb = ''
       this.workExperienceForm.workUnit = ''
       this.workExperienceForm.beginDate = ''
       this.workExperienceForm.endDate = ''
@@ -4087,9 +4463,10 @@
       this.workExperienceForm.empNumb = row.empNumb
       this.workExperienceForm.empName = row.empName
       this.workExperienceForm.certificateNumb = row.certificateNumb
-      this.workExperienceForm.sex = row.sex
+      this.workExperienceForm.sexName = row.sex
       this.workExperienceForm.deptId = row.deptId
       this.workExperienceForm.deptName = row.deptName
+      this.workExperienceForm.allDeptName = row.allDeptName
       this.workExperienceForm.JobId = row.JobId
       this.workExperienceForm.jobName = row.jobName
       this.workExperienceForm.workUnit = row.workUnit
@@ -4156,6 +4533,17 @@
       })
     },
     cleanPhysicalExam() {
+      this.physicalExamForm.empId = ''
+      this.physicalExamForm.archivesNumb = ''
+      this.physicalExamForm.deptId = ''
+      this.physicalExamForm.deptName = ''
+      this.physicalExamForm.allDeptName = ''
+      this.physicalExamForm.empNumb = ''
+      this.physicalExamForm.empName = ''
+      this.physicalExamForm.sex = ''
+      this.physicalExamForm.JobId = ''
+      this.physicalExamForm.jobName = ''
+      this.physicalExamForm.certificateNumb = ''
       this.physicalExamForm.hospital = ''
       this.physicalExamForm.physicalExamDate = ''
       this.physicalExamForm.physicalExamType = ''
@@ -4176,6 +4564,7 @@
       this.physicalExamForm.sex = row.sex
       this.physicalExamForm.deptId = row.deptId
       this.physicalExamForm.deptName = row.deptName
+      this.physicalExamForm.allDeptName = row.allDeptName
       this.physicalExamForm.JobId = row.JobId
       this.physicalExamForm.jobName = row.jobName
       this.physicalExamForm.hospital = row.hospital
@@ -4248,6 +4637,17 @@
       })
     },
     cleanContractInfo() {
+      this.contractInfoForm.empId = ''
+      this.contractInfoForm.archivesNumb = ''
+      this.contractInfoForm.deptId = ''
+      this.contractInfoForm.deptName = ''
+      this.contractInfoForm.allDeptName = ''
+      this.contractInfoForm.empNumb = ''
+      this.contractInfoForm.empName = ''
+      this.contractInfoForm.sex = ''
+      this.contractInfoForm.JobId = ''
+      this.contractInfoForm.jobName = ''
+      this.contractInfoForm.certificateNumb = ''
       this.contractInfoForm.contractId = ''
       this.contractInfoForm.beginDate = ''
       this.contractInfoForm.endDate = ''
@@ -4274,6 +4674,7 @@
       this.contractInfoForm.sex = row.sex
       this.contractInfoForm.deptId = row.deptId
       this.contractInfoForm.deptName = row.deptName
+      this.contractInfoForm.allDeptName = row.allDeptName
       this.contractInfoForm.JobId = row.JobId
       this.contractInfoForm.jobName = row.jobName
       this.contractInfoForm.beginDate = row.beginDate
@@ -4344,6 +4745,17 @@
       })
     },
     cleanDimissionAttend() {
+      this.dimissionAttendForm.empId = ''
+      this.dimissionAttendForm.archivesNumb = ''
+      this.dimissionAttendForm.deptId = ''
+      this.dimissionAttendForm.deptName = ''
+      this.dimissionAttendForm.allDeptName = ''
+      this.dimissionAttendForm.empNumb = ''
+      this.dimissionAttendForm.empName = ''
+      this.dimissionAttendForm.sex = ''
+      this.dimissionAttendForm.JobId = ''
+      this.dimissionAttendForm.jobName = ''
+      this.dimissionAttendForm.certificateNumb = ''
       this.dimissionAttendForm.dimissionAttendId = ''
       this.dimissionAttendForm.attendMonth = ''
       this.dimissionAttendForm.overtimeHour = ''
@@ -4369,6 +4781,7 @@
       this.dimissionAttendForm.certificateNumb = row.certificateNumb
       this.dimissionAttendForm.deptId = row.deptId
       this.dimissionAttendForm.deptName = row.deptName
+      this.dimissionAttendForm.allDeptName = row.allDeptName
       this.dimissionAttendForm.JobId = row.JobId
       this.dimissionAttendForm.jobName = row.jobName
       this.dimissionAttendForm.attendMonth = row.attendMonth
@@ -4438,6 +4851,17 @@
       })
     },
     cleanLeaveInfo() {
+      this.leaveInfoForm.empId = ''
+      this.leaveInfoForm.archivesNumb = ''
+      this.leaveInfoForm.deptId = ''
+      this.leaveInfoForm.deptName = ''
+      this.leaveInfoForm.allDeptName = ''
+      this.leaveInfoForm.empNumb = ''
+      this.leaveInfoForm.empName = ''
+      this.leaveInfoForm.sex = ''
+      this.leaveInfoForm.JobId = ''
+      this.leaveInfoForm.jobName = ''
+      this.leaveInfoForm.certificateNumb = ''
       this.leaveInfoForm.leaveId = ''
       this.leaveInfoForm.beginTime = ''
       this.leaveInfoForm.endTime = ''
@@ -4464,6 +4888,7 @@
       this.leaveInfoForm.certificateNumb = row.certificateNumb
       this.leaveInfoForm.deptId = row.deptId
       this.leaveInfoForm.deptName = row.deptName
+      this.leaveInfoForm.allDeptName = row.allDeptName
       this.leaveInfoForm.JobId = row.JobId
       this.leaveInfoForm.jobName = row.jobName
       this.leaveInfoForm.beginTime = row.beginTime
@@ -4534,6 +4959,17 @@
       })
     },
     cleanResign() {
+      this.resignForm.empId = ''
+      this.resignForm.archivesNumb = ''
+      this.resignForm.deptId = ''
+      this.resignForm.deptName = ''
+      this.resignForm.allDeptName = ''
+      this.resignForm.empNumb = ''
+      this.resignForm.empName = ''
+      this.resignForm.sex = ''
+      this.resignForm.JobId = ''
+      this.resignForm.jobName = ''
+      this.resignForm.certificateNumb = ''
       this.resignForm.resignId = ''
       this.resignForm.applayDate = ''
       this.resignForm.reporter = ''
@@ -4557,6 +4993,7 @@
       this.resignForm.certificateNumb = row.certificateNumb
       this.resignForm.deptId = row.deptId
       this.resignForm.deptName = row.deptName
+      this.resignForm.allDeptName = row.allDeptName
       this.resignForm.JobId = row.JobId
       this.resignForm.jobName = row.jobName
       this.resignForm.applayDate = row.applayDate
@@ -4624,6 +5061,17 @@
       })
     },
     cleanUnemployment() {
+      this.unemploymentForm.empId = ''
+      this.unemploymentForm.archivesNumb = ''
+      this.unemploymentForm.deptId = ''
+      this.unemploymentForm.deptName = ''
+      this.unemploymentForm.allDeptName = ''
+      this.unemploymentForm.empNumb = ''
+      this.unemploymentForm.empName = ''
+      this.unemploymentForm.sex = ''
+      this.unemploymentForm.JobId = ''
+      this.unemploymentForm.jobName = ''
+      this.unemploymentForm.certificateNumb = ''
       this.unemploymentForm.unemploymentId = ''
       this.unemploymentForm.applayDate = ''
       this.unemploymentForm.applayReason = ''
@@ -4648,6 +5096,7 @@
       this.unemploymentForm.certificateNumb = row.certificateNumb
       this.unemploymentForm.deptId = row.deptId
       this.unemploymentForm.deptName = row.deptName
+      this.unemploymentForm.allDeptName = row.allDeptName
       this.unemploymentForm.JobId = row.JobId
       this.unemploymentForm.jobName = row.jobName
       this.unemploymentForm.applayDate = row.applayDate
@@ -4716,6 +5165,17 @@
       })
     },
     cleanInsurance() {
+      this.insuranceForm.empId = ''
+      this.insuranceForm.archivesNumb = ''
+      this.insuranceForm.deptId = ''
+      this.insuranceForm.deptName = ''
+      this.insuranceForm.allDeptName = ''
+      this.insuranceForm.empNumb = ''
+      this.insuranceForm.empName = ''
+      this.insuranceForm.sex = ''
+      this.insuranceForm.JobId = ''
+      this.insuranceForm.jobName = ''
+      this.insuranceForm.certificateNumb = ''
       this.insuranceForm.insuranceId = ''
       this.insuranceForm.applayDate = ''
       this.insuranceForm.proposer = ''
@@ -4742,6 +5202,7 @@
       this.insuranceForm.certificateNumb = row.certificateNumb
       this.insuranceForm.deptId = row.deptId
       this.insuranceForm.deptName = row.deptName
+      this.insuranceForm.allDeptName = row.allDeptName
       this.insuranceForm.JobId = row.JobId
       this.insuranceForm.jobName = row.jobName
       this.insuranceForm.applayDate = row.applayDate
@@ -4811,6 +5272,17 @@
       })
     },
     cleanAccidentCases() {
+      this.accidentCasesForm.empId = ''
+      this.accidentCasesForm.archivesNumb = ''
+      this.accidentCasesForm.deptId = ''
+      this.accidentCasesForm.deptName = ''
+      this.accidentCasesForm.allDeptName = ''
+      this.accidentCasesForm.empNumb = ''
+      this.accidentCasesForm.empName = ''
+      this.accidentCasesForm.sex = ''
+      this.accidentCasesForm.JobId = ''
+      this.accidentCasesForm.jobName = ''
+      this.accidentCasesForm.certificateNumb = ''
       this.accidentCasesForm.accidentId = ''
       this.accidentCasesForm.injuredTime = ''
       this.accidentCasesForm.injuredAddress = ''
@@ -4835,7 +5307,7 @@
       this.accidentCasesForm.creator = ''
       this.accidentCasesForm.modifyTime = ''
       this.accidentCasesForm.modifier = ''
-      this.accidentCasesForm.delFlag = ''
+      this.accidentCasesForm.delFlag = '2'
       this.accidentCasesForm.version = ''
     },
     editAccidentCases(row) {
@@ -4849,6 +5321,7 @@
       this.accidentCasesForm.certificateNumb = row.certificateNumb
       this.accidentCasesForm.deptId = row.deptId
       this.accidentCasesForm.deptName = row.deptName
+      this.accidentCasesForm.allDeptName = row.allDeptName
       this.accidentCasesForm.JobId = row.JobId
       this.accidentCasesForm.jobName = row.jobName
       this.accidentCasesForm.injuredTime = row.injuredTime
@@ -4868,7 +5341,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
@@ -4931,6 +5404,17 @@
       })
     },
     cleanOccupational() {
+      this.occupationalForm.empId = ''
+      this.occupationalForm.archivesNumb = ''
+      this.occupationalForm.deptId = ''
+      this.occupationalForm.deptName = ''
+      this.occupationalForm.allDeptName = ''
+      this.occupationalForm.empNumb = ''
+      this.occupationalForm.empName = ''
+      this.occupationalForm.sex = ''
+      this.occupationalForm.JobId = ''
+      this.occupationalForm.jobName = ''
+      this.occupationalForm.certificateNumb = ''
       this.occupationalForm.occupationalId = ''
       this.occupationalForm.injuredTime = ''
       this.occupationalForm.injuredAddress = ''
@@ -4963,7 +5447,7 @@
       this.occupationalForm.creator = ''
       this.occupationalForm.modifyTime = ''
       this.occupationalForm.modifier = ''
-      this.occupationalForm.delFlag = ''
+      this.occupationalForm.delFlag = '2'
       this.occupationalForm.version = ''
       this.occupationalForm.remark = ''
     },
@@ -4978,6 +5462,7 @@
       this.occupationalForm.certificateNumb = row.certificateNumb
       this.occupationalForm.deptId = row.deptId
       this.occupationalForm.deptName = row.deptName
+      this.occupationalForm.allDeptName = row.allDeptName
       this.occupationalForm.JobId = row.JobId
       this.occupationalForm.jobName = row.jobName
       this.occupationalForm.injuredTime = row.injuredTime
@@ -5006,7 +5491,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
@@ -5071,6 +5556,17 @@
       })
     },
     cleanLaborTrouble() {
+      this.laborTroubleForm.empId = ''
+      this.laborTroubleForm.archivesNumb = ''
+      this.laborTroubleForm.deptId = ''
+      this.laborTroubleForm.deptName = ''
+      this.laborTroubleForm.allDeptName = ''
+      this.laborTroubleForm.empNumb = ''
+      this.laborTroubleForm.empName = ''
+      this.laborTroubleForm.sex = ''
+      this.laborTroubleForm.JobId = ''
+      this.laborTroubleForm.jobName = ''
+      this.laborTroubleForm.certificateNumb = ''
       this.laborTroubleForm.arbitrationId = ''
       this.laborTroubleForm.arbitrationDate = ''
       this.laborTroubleForm.arbitrationType = ''
@@ -5083,7 +5579,7 @@
       this.laborTroubleForm.creator = ''
       this.laborTroubleForm.modifyTime = ''
       this.laborTroubleForm.modifier = ''
-      this.laborTroubleForm.delFlag = ''
+      this.laborTroubleForm.delFlag = '2'
       this.laborTroubleForm.version = ''
       this.laborTroubleForm.remark = ''
     },
@@ -5097,6 +5593,7 @@
       this.laborTroubleForm.certificateNumb = row.certificateNumb
       this.laborTroubleForm.deptId = row.deptId
       this.laborTroubleForm.deptName = row.deptName
+      this.laborTroubleForm.allDeptName = row.allDeptName
       this.laborTroubleForm.JobId = row.JobId
       this.laborTroubleForm.jobName = row.jobName
       this.laborTroubleForm.arbitrationDate = row.arbitrationDate
@@ -5123,6 +5620,17 @@
       this.search()
     },
     cleanBadRecord() {
+      this.badRecordForm.empId = ''
+      this.badRecordForm.archivesNumb = ''
+      this.badRecordForm.deptId = ''
+      this.badRecordForm.deptName = ''
+      this.badRecordForm.allDeptName = ''
+      this.badRecordForm.empNumb = ''
+      this.badRecordForm.empName = ''
+      this.badRecordForm.sex = ''
+      this.badRecordForm.JobId = ''
+      this.badRecordForm.jobName = ''
+      this.badRecordForm.certificateNumb = ''
       this.badRecordForm.badId = ''
       this.badRecordForm.badDate = ''
       this.badRecordForm.reporter = ''
@@ -5131,7 +5639,7 @@
       this.badRecordForm.creator = ''
       this.badRecordForm.modifyTime = ''
       this.badRecordForm.modifier = ''
-      this.badRecordForm.delFlag = ''
+      this.badRecordForm.delFlag = '2'
       this.badRecordForm.version = ''
       this.badRecordForm.remark = ''
     },
@@ -5190,6 +5698,7 @@
       this.badRecordForm.certificateNumb = row.certificateNumb
       this.badRecordForm.deptId = row.deptId
       this.badRecordForm.deptName = row.deptName
+      this.badRecordForm.allDeptName = row.allDeptName
       this.badRecordForm.JobId = row.JobId
       this.badRecordForm.jobName = row.jobName
       this.badRecordForm.badDate = row.badDate
@@ -5256,6 +5765,17 @@
       })
     },
     cleanRemarkInfo() {
+      this.remarkInfoForm.empId = ''
+      this.remarkInfoForm.archivesNumb = ''
+      this.remarkInfoForm.deptId = ''
+      this.remarkInfoForm.deptName = ''
+      this.remarkInfoForm.allDeptName = ''
+      this.remarkInfoForm.empNumb = ''
+      this.remarkInfoForm.empName = ''
+      this.remarkInfoForm.sex = ''
+      this.remarkInfoForm.JobId = ''
+      this.remarkInfoForm.jobName = ''
+      this.remarkInfoForm.certificateNumb = ''
       this.remarkInfoForm.remarkId = ''
       this.remarkInfoForm.remarkContent = ''
       this.remarkInfoForm.remarkDate = ''
@@ -5263,7 +5783,7 @@
       this.remarkInfoForm.creator = ''
       this.remarkInfoForm.modifyTime = ''
       this.remarkInfoForm.modifier = ''
-      this.remarkInfoForm.delFlag = ''
+      this.remarkInfoForm.delFlag = '2'
       this.remarkInfoForm.version = ''
     },
     editRemarkInfo(row) {
@@ -5277,6 +5797,7 @@
       this.remarkInfoForm.JobId = row.JobId
       this.remarkInfoForm.deptId = row.deptId
       this.remarkInfoForm.deptName = row.deptName
+      this.remarkInfoForm.allDeptName = row.allDeptName
       this.remarkInfoForm.jobName = row.jobName
       this.remarkInfoForm.remarkContent = row.remarkContent
       this.remarkInfoForm.remarkDate = row.remarkDate
@@ -5347,7 +5868,8 @@
         this[this.inputForName].deptName = data.deptName
         this[this.inputForName].JobId = data.jobId
         this[this.inputForName].jobName = data.jobName
-        this[this.inputForName].sex = data.sex === '0' ? '男' : '女'
+        this[this.inputForName].sex = data.sex === '1' ? '男' : '女'
+        this[this.inputForName].sexName = data.sex === '1' ? '男' : '女'
       }
       this.dialogShowXzyg = false
     },
@@ -5372,6 +5894,10 @@
     }, jobNameSelect(item) {
       this.empBaseInfoForm.jobName = item.value
       this.empBaseInfoForm.JobId = item.code
+    }, DeptNameSelect(val) {
+      this.empBaseInfoForm.deptId = val.deptId
+      this.empBaseInfoForm.deptName = val.label
+      this.empBaseInfoForm.allDeptName = val.allDeptName
     },
     generateUserInfo(index, val) {
       var userinfo = toCardGetUserInfo(val)
@@ -5402,13 +5928,18 @@
         case '5':
           return '(非深户)四险一档'
       }
+    },
+    changeSort(val) {
+      this.sort.field = val.prop
+      this.sort.order = val.order
+      this.search()
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.baseinfo .el-container{
-    .el-aside {
+.baseinfo .el-container {
+  .el-aside {
     background-color: #fff;
   }
 
@@ -5417,6 +5948,7 @@
   }
 
 }
+
 .el-container {
   height: 86.7vh;
   background-color: #fff;
@@ -5431,12 +5963,14 @@
   .el-main {
     color: #333;
     height: 100%;
-    .el-table{
+
+    .el-table {
       margin-top: 10px;
     }
   }
-  .el-timeline-item{
-      padding-bottom: 5px;
+
+  .el-timeline-item {
+    padding-bottom: 5px;
   }
 }
 
@@ -5493,6 +6027,7 @@
     color: #a00515;
     cursor: pointer;
     top: -5px;
+
     .el-timeline-item__content {
       &:hover {
         color: #a00515;

--
Gitblit v1.8.0