From 11ab4edc4f3c59643ffbd73ef2bf05bbb3e793aa Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 08:45:47 +0800
Subject: [PATCH] style(user): 调整员工编号列宽度

---
 src/views/user/inemployees.vue |  840 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 638 insertions(+), 202 deletions(-)

diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index fb44403..abc2f79 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -124,7 +124,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <td class="td">保险类型:</td>
+                  <td class="td">社保档位:</td>
                   <td class="td-group">
                     <el-checkbox-group v-model="queryParams.insuranceType" class="fj-checkbox">
                       <el-checkbox label="" @change="selectAllInsuranceType">全部</el-checkbox>
@@ -189,7 +189,7 @@
                     <el-checkbox-group v-model="queryParams.entryType" class="fj-checkbox">
                       <el-checkbox label="" @change="selectAllEntryType">全部</el-checkbox>
                       <el-checkbox :label="20">新入职</el-checkbox>
-                      <el-checkbox :label="21">最新入职</el-checkbox>
+                      <el-checkbox :label="21">重新入职</el-checkbox>
                       <el-checkbox :label="22">返聘入职</el-checkbox>
                       <!--                      <el-checkbox-->
                       <!--                        v-for="data in dimissionTypeOptions"-->
@@ -198,6 +198,21 @@
                       <!--                      >-->
                       <!--                        {{ data.dicItemName }}-->
                       <!--                      </el-checkbox>-->
+                    </el-checkbox-group>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="td">相关证件:</td>
+                  <td class="td-group">
+                    <el-checkbox-group v-model="queryParams.certificateList" class="fj-checkbox">
+                      <el-checkbox label="" @change="selectAllCertificateList">全部</el-checkbox>
+                      <el-checkbox
+                        v-for="data in certificateListOptions"
+                        :key="data.dicItemName"
+                        :label="data.dicItemCode"
+                      >
+                        {{ data.dicItemName }}
+                      </el-checkbox>
                     </el-checkbox-group>
                   </td>
                 </tr>
@@ -230,14 +245,6 @@
           <el-table-column type="selection" width="55" />
           <el-table-column label="操作" width="130">
             <template slot-scope="scope">
-              <!--              <el-button-->
-              <!--                type="text"-->
-              <!--                size="small"-->
-              <!--                @click="editArchives(scope.row)"-->
-              <!--              >-->
-              <!--                档案</el-button>-->
-              <!--              <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑</el-button>-->
-
               <span
                 style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
                 @click="editArchives(scope.row)"
@@ -248,24 +255,83 @@
               >编辑</span>
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
-          <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
-          <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="80" />
-          <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
-          <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="160" />
-          <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
-          <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
-          <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="60" :formatter="educationFormat" />
-          <el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
-          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
-          <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
-          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
-          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
+          <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="部门(护卫点)"
+            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="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="sex" label="性别" width="60" :formatter="sexFormat" />
+          <el-table-column
+            show-overflow-tooltip
+            prop="age"
+            label="年龄"
+            width="80"
+            sortable="custom"
+            :sort-orders="['ascending', 'descending']"
+          />
+          <el-table-column
+            show-overflow-tooltip
+            prop="education"
+            label="学历"
+            width="80"
+            :formatter="educationFormat"
+            sortable="custom"
+            :sort-orders="['ascending', 'descending']"
+          />
+          <el-table-column
+            show-overflow-tooltip
+            prop="nativePlace"
+            label="籍贯"
+            width="70"
+            :formatter="nativePlaceFormat"
+          />
+          <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="110" />
+          <el-table-column show-overflow-tooltip prop="empTypeName" label="员工类型" width="80" />
+          <el-table-column
+            show-overflow-tooltip
+            prop="entryDate"
+            label="入职日期"
+            width="110"
+            sortable="custom"
+            :sort-orders="['ascending', 'descending']"
+          />
+          <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
             <template slot-scope="{row}">
               {{ transEmpStatus(row.empStatus) }}
             </template>
           </el-table-column>
-          <el-table-column prop="entryTypeName" label="入职类型" width="80" />
+          <el-table-column
+            prop="entryType"
+            label="入职类型"
+            width="120"
+            sortable="custom"
+            :sort-orders="['ascending', 'descending']"
+          >
+            <template slot-scope="{row}">
+              {{ transEntryType(row.entryType) }}
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip prop="annualLeave" label="年假天数" width="110" />
         </el-table>
         <pagination
           v-show="total>0"
@@ -280,23 +346,25 @@
     <el-dialog title="基本信息" :visible.sync="dialogShowXzyg" width="50%" class="baseinfo">
       <el-container>
         <el-aside width="200px">
-          <el-upload
-            class="avatar-uploader"
-            action="#"
-            :show-file-list="false"
-            :on-change="handlePictureCardPreview"
-            :auto-upload="false"
-          >
-            <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过4MB</div>
-            <img v-if="empBaseInfoImageUrl" :src="empBaseInfoImageUrl" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon" />
-          </el-upload>
+          <!-- 头像显示区域 -->
+          <div class="avatar-wrapper">
+            <img
+              v-if="empBaseInfoImageUrl"
+              :src="empBaseInfoImageUrl"
+              class="avatar"
+              @click="openUploadChoice"
+            >
+            <div v-else class="avatar-uploader-placeholder" @click="openUploadChoice">
+              <i class="el-icon-plus avatar-uploader-icon" />
+              <div class="upload-tip">点击上传照片</div>
+            </div>
+          </div>
         </el-aside>
         <el-main>
           <el-form
             ref="empBaseInfoForm"
             :model="empBaseInfoForm"
-            :rules="rules"
+            :rules="isAdd ? addRules : rules"
             label-position="right"
             label-width="120px"
           >
@@ -385,11 +453,11 @@
                 <el-form-item label="招聘介绍人" prop="introducer">
                   <el-input v-model="empBaseInfoForm.introducer" />
                 </el-form-item>
-                <el-form-item label="银行名称" prop="bankName">
+                <el-form-item label="银行名称">
                   <el-input v-model="empBaseInfoForm.bankName" />
                 </el-form-item>
-                <el-form-item label="保险类型" prop="insuranceType">
-                  <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
+                <el-form-item label="社保档位" prop="insuranceType">
+                  <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位">
                     <el-option
                       v-for="dict in insuranceTypeOptions"
                       :key="dict.dicItemCode"
@@ -398,10 +466,10 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="家庭成员及关系" prop="family">
+                <el-form-item label="家庭成员及关系1" prop="family">
                   <el-input v-model="empBaseInfoForm.family" />
                 </el-form-item>
-                <el-form-item label="紧急联系电话" prop="urgencyPhone">
+                <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
                   <el-input v-model="empBaseInfoForm.urgencyPhone" />
                 </el-form-item>
               </el-col>
@@ -489,7 +557,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="银行账号" prop="bankNumb">
+                <el-form-item label="银行账号">
                   <el-input v-model="empBaseInfoForm.bankNumb" />
                 </el-form-item>
                 <el-form-item label="社保电脑号" prop="socialNumb">
@@ -607,7 +675,7 @@
               <el-upload
                 ref="upload"
                 class="upload-demo"
-                action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+                action="http://127.0.0.1:8301/hr/empBaseInfo/importEmp"
                 accept=".xls, .xlsx, .excel"
                 :headers="headers()"
                 :file-list="fileList"
@@ -624,7 +692,7 @@
         <el-button type="primary" @click="showDryg(2)">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="关闭档案" :visible.sync="dialogShowGbda" width="50%">
+    <el-dialog title="关闭档案" :visible.sync="dialogShowGbda" width="70%">
       <el-form ref="gbdaForm" :model="gbdaForm" :rules="gbdaRules" label-position="right" label-width="120px">
         <el-row>
           <el-col span="24">
@@ -636,15 +704,16 @@
                 <el-radio :label="4">自动离职</el-radio>
                 <el-radio :label="5">试用期内</el-radio>
                 <el-radio :label="6">正常离职</el-radio>
+                <el-radio :label="7">到龄退休</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col v-if="selectDimissionType === 2" span="12">
+          <el-col v-if="selectDimissionType === 4" span="12">
             <el-form-item label="自离天数" prop="selfLeaveDay">
               <el-input v-model="gbdaForm.selfLeaveDay" onkeyup="value=value.replace(/[^0-9.]/g,'')" />
             </el-form-item>
           </el-col>
-          <el-col v-if="selectDimissionType === 2" span="12">
+          <el-col v-if="selectDimissionType === 4" span="12">
             <el-form-item label="报告人" prop="reporter">
               <el-input v-model="gbdaForm.reporter" />
             </el-form-item>
@@ -678,7 +747,9 @@
       </div>
     </el-dialog>
     <el-dialog title="导出员工" :visible.sync="dialogShowDcyg" width="40%">
-      <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">请勾选需要导出的字段</div>
+      <div style="font-size: 16px;font-weight: 400;height: 35px;margin-top: -30px;color: #409EFF;">
+        请勾选需要导出的字段
+      </div>
       <table id="dcygTable" width="100%">
         <tr>
           <td colspan="6" style="text-align: left;">
@@ -800,7 +871,7 @@
             </td>
           </tr>
           <tr>
-            <td>家庭成员及关系</td>
+            <td>家庭成员及关系1</td>
             <td>
               <el-checkbox label="family"><span /></el-checkbox>
             </td>
@@ -818,7 +889,7 @@
             <td>
               <el-checkbox label="entryDate"><span /></el-checkbox>
             </td>
-            <td>保险类型</td>
+            <td>社保档位</td>
             <td>
               <el-checkbox label="insuranceTypeName"><span /></el-checkbox>
             </td>
@@ -844,9 +915,9 @@
           <tr>
             <td>相关证件</td>
             <td>
-              <el-checkbox label="certificateList"><span /></el-checkbox>
+              <el-checkbox label="certificateListName"><span /></el-checkbox>
             </td>
-            <td>紧急联系电话</td>
+            <td>家庭成员及关系2</td>
             <td>
               <el-checkbox label="urgencyPhone"><span /></el-checkbox>
             </td>
@@ -864,17 +935,21 @@
             <td>
               <el-checkbox label="dimissionTypeName"><span /></el-checkbox>
             </td>
+            <td>编号</td>
+            <td>
+              <el-checkbox label="empNumb"><span /></el-checkbox>
+            </td>
           </tr>
-          <!--          <tr>-->
-          <!--            <td>家庭成员及关系</td>-->
-          <!--            <td>-->
-          <!--              <el-checkbox label="family"><span /></el-checkbox>-->
-          <!--            </td>-->
-          <!--            <td />-->
-          <!--            <td />-->
-          <!--            <td />-->
-          <!--            <td />-->
-          <!--          </tr>-->
+          <tr>
+            <td>年假天数</td>
+            <td>
+              <el-checkbox label="annualLeave"><span /></el-checkbox>
+            </td>
+            <td />
+            <td />
+            <td />
+            <td />
+          </tr>
         </el-checkbox-group>
       </table>
       <div slot="footer" class="dialog-footer">
@@ -887,6 +962,7 @@
       :dialog-visible="dialog.isVisible"
       :title="dialog.title"
       :type="dialog.type"
+      @success="editSuccess"
       @close="editClose"
     />
     <el-dialog title="打开档案" :visible.sync="dialogShowDkda" width="50%">
@@ -901,8 +977,8 @@
           <el-col span="24">
             <el-form-item label="打开类型" prop="region">
               <el-radio-group v-model="openArchivesForm.openType">
-                <el-radio :label="20">重新入职</el-radio>
-                <el-radio :label="21">返聘</el-radio>
+                <el-radio :label="21">重新入职</el-radio>
+                <el-radio :label="22">返聘</el-radio>
               </el-radio-group>
               (主要对已退休员工返聘)
             </el-form-item>
@@ -925,6 +1001,78 @@
         <el-button type="primary" @click="showDkda(2, 'openArchivesForm')">确 定</el-button>
       </div>
     </el-dialog>
+
+    <!-- 上传方式选择弹窗 -->
+    <el-dialog
+      title="选择上传方式"
+      :visible.sync="uploadChoiceDialogVisible"
+      width="400px"
+      :close-on-click-modal="false"
+    >
+      <div class="upload-choice-container">
+        <div class="upload-choice-item" @click="choiceCamera">
+          <i class="el-icon-camera" />
+          <span>拍照上传</span>
+        </div>
+        <div class="upload-choice-item" @click="choiceFile">
+          <i class="el-icon-folder-opened" />
+          <span>文件上传</span>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 摄像头拍照弹窗 -->
+    <el-dialog
+      title="拍照上传"
+      :visible.sync="cameraDialogVisible"
+      width="640px"
+      :close-on-click-modal="false"
+      @close="closeCamera"
+    >
+      <div class="camera-container">
+        <!-- 视频预览 -->
+        <video
+          v-show="!capturedImage"
+          ref="video"
+          class="camera-video"
+          autoplay
+          playsinline
+        />
+        <!-- 画布(用于拍照) -->
+        <canvas ref="canvas" style="display: none;" />
+
+        <!-- 拍照结果预览 -->
+        <img
+          v-if="capturedImage"
+          :src="capturedImage"
+          class="captured-image"
+        >
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeCamera">取消</el-button>
+        <el-button
+          v-if="!capturedImage"
+          type="primary"
+          @click="takePhoto"
+        >
+          拍照
+        </el-button>
+        <el-button
+          v-if="capturedImage"
+          @click="retakePhoto"
+        >
+          重拍
+        </el-button>
+        <el-button
+          v-if="capturedImage"
+          type="primary"
+          @click="confirmPhoto"
+        >
+          确认使用
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -936,12 +1084,14 @@
 import { calculateSeniority, toCardGetUserInfo, dateToString } from '@/utils/myUtil'
 import ArchivesEdit from './archivesEdit'
 import { pages } from '@/settings'
+import dictMixin from '../../utils/dictMixin'
 
 export default {
   components: {
     ArchivesEdit,
     Pagination, Treeselect
   },
+  mixins: [dictMixin],
   data() {
     return {
       dialog: {
@@ -964,7 +1114,8 @@
         empCardStatus: [],
         handbookStatus: [],
         entryType: [],
-        empType: []
+        empType: [],
+        certificateList: []
       }, // 查询参数
       sort: {}, // 排序
       pagination: { // 分页参数
@@ -973,6 +1124,12 @@
       },
       baseicInformationForm: {},
       empBaseInfoImageUrl: '',
+      // 上传方式选择弹窗
+      uploadChoiceDialogVisible: false,
+      // 摄像头相关
+      cameraDialogVisible: false,
+      capturedImage: '',
+      stream: null,
       empBaseInfoForm: {
         imagePath: '',
         empId: '',
@@ -1050,11 +1207,7 @@
       depts: [],
       fileList: [],
       rules: {
-        archivesNumb: [{ required: true, message: '请输入档案号', trigger: 'blur' }, {
-          max: 20,
-          message: this.$t('rules.noMoreThan20'),
-          trigger: 'blur'
-        }],
+        archivesNumb: [{ max: 20, message: this.$t('rules.noMoreThan20'), 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' },
@@ -1070,7 +1223,7 @@
           message: '长度不超过36个字符',
           trigger: 'blur'
         }],
-        insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
+        insuranceType: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
         entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
         seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
         archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
@@ -1090,6 +1243,14 @@
         family: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
         certificateValidity: [{ required: true, message: '请选择身份证有效期', trigger: 'change' }],
         urgencyPhone: [{ max: 30, message: '长度不超过30个字符', trigger: 'blur' }]
+      },
+      // 新增模式的简化验证规则(仅验证核心字段)
+      addRules: {
+        empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
+          { min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
+        empNumb: [{ required: true, message: '请输入员工编号', trigger: 'blur' },
+          { min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
+        certificateNumb: [{ required: true, message: '请输入身份证号', trigger: 'blur' }]
       },
       gbdaRules: {
         dimissionType: [{ required: true, message: '请选择离职类型', trigger: 'change' }],
@@ -1178,117 +1339,97 @@
       exportUrl: '',
       checkAll: false,
       isIndeterminate: false,
-      cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName'],
+      cityOptions: ['archivesNumb', 'allDeptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'insuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateListName', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate', 'entryTypeName', 'dimissionTypeName', 'empNumb', 'annualLeave'],
       checkedCities: [],
       tableData: [],
       selectDimissionType: 1,
-      statusOptions: [],
-      empTypeOptions: [],
       inTypeOptions: [],
-      nationOptions: [],
-      marriageOptions: [],
-      educationOptions: [],
-      nativePlaceOptions: [],
-      archivesStatusOptions: [],
-      insuranceTypeOptions: [],
-      empCardStatusOptions: [],
-      handbookStatusOptions: [],
-      ecgOptions: [],
-      certificateListOptions: [],
-      physicalExamTypeOptions: [],
-      contractStatusOptions: [],
-      leaveTypeOptions: [],
-      insuranceGaersOptions: [],
-      applayStatusOptions: [],
-      reportStatusOptions: [],
-      hospitalizatioFlagOptions: [],
-      settleStatusOptions: [],
-      arbitrationTypeOptions: [],
-      changeTypeOptions: [],
-      dimissionTypeOptions: [],
-      ageStrOptions: [],
-      sexOptions: [],
-      openArchivesForm: { }
+      openArchivesForm: {}
+    }
+  },
+  computed: {
+    // 字典选项计算属性
+    statusOptions() {
+      return this.getDictOptions('PLITICAL')
+    },
+    empTypeOptions() {
+      return this.getDictOptions('EMPTYPE')
+    },
+    nationOptions() {
+      return this.getDictOptions('NATION')
+    },
+    marriageOptions() {
+      return this.getDictOptions('MARRIAGE')
+    },
+    educationOptions() {
+      return this.getDictOptions('EDUCATION')
+    },
+    nativePlaceOptions() {
+      return this.getDictOptions('NATIVEPLACE')
+    },
+    archivesStatusOptions() {
+      return this.getDictOptions('archivesStatus')
+    },
+    insuranceTypeOptions() {
+      return this.getDictOptions('INSURANCETYPE')
+    },
+    empCardStatusOptions() {
+      return this.getDictOptions('empCardStatus')
+    },
+    handbookStatusOptions() {
+      return this.getDictOptions('handbookStatus')
+    },
+    certificateListOptions() {
+      return this.getDictOptions('certificateList')
+    },
+    physicalExamTypeOptions() {
+      return this.getDictOptions('PHYSICALEXAMTYPE')
+    },
+    ecgOptions() {
+      return this.getDictOptions('ECG')
+    },
+    contractStatusOptions() {
+      return this.getDictOptions('CONTRACTSTATUS')
+    },
+    leaveTypeOptions() {
+      return this.getDictOptions('LEAVETYPE')
+    },
+    insuranceGaersOptions() {
+      return this.getDictOptions('INSURANCETYPE')
+    },
+    applayStatusOptions() {
+      return this.getDictOptions('applayStatus')
+    },
+    reportStatusOptions() {
+      return this.getDictOptions('reportStatus')
+    },
+    hospitalizatioFlagOptions() {
+      return this.getDictOptions('hospitalizatioFlag')
+    },
+    settleStatusOptions() {
+      return this.getDictOptions('settleStatus')
+    },
+    arbitrationTypeOptions() {
+      return this.getDictOptions('ZCTYPE')
+    },
+    changeTypeOptions() {
+      return this.getDictOptions('changeType')
+    },
+    dimissionTypeOptions() {
+      return this.getDictOptions('LZTYPE')
+    },
+    ageStrOptions() {
+      return this.getDictOptions('ageStr')
+    },
+    sexOptions() {
+      return this.getDictOptions('sex')
     }
   },
   mounted() {
     this.fetch()
     this.initDept()
-    this.getDicts('ageStr').then(response => {
-      this.ageStrOptions = response.data
-    })
-    this.getDicts('PLITICAL').then(response => {
-      this.statusOptions = response.data
-    })
-    this.getDicts('sex').then(response => {
-      this.sexOptions = response.data
-    })
-    this.getDicts('empType').then(response => {
-      this.empTypeOptions = response.data
-    })
-    this.getDicts('NATION').then(response => {
-      this.nationOptions = response.data
-    })
-    this.getDicts('MARRIAGE').then(response => {
-      this.marriageOptions = response.data
-    })
-    this.getDicts('EDUCATION').then(response => {
-      this.educationOptions = response.data
-    })
-    this.getDicts('NATIVEPLACE').then(response => {
-      this.nativePlaceOptions = response.data
-    })
-    this.getDicts('archivesStatus').then(response => {
-      this.archivesStatusOptions = response.data
-    })
-    this.getDicts('INSURANCETYPE').then(response => {
-      this.insuranceTypeOptions = response.data
-    })
-    this.getDicts('empCardStatus').then(response => {
-      this.empCardStatusOptions = response.data
-    })
-    this.getDicts('handbookStatus').then(response => {
-      this.handbookStatusOptions = response.data
-    })
-    this.getDicts('certificateList').then(response => {
-      this.certificateListOptions = response.data
-    })
-    this.getDicts('PHYSICALEXAMTYPE').then(response => {
-      this.physicalExamTypeOptions = response.data
-    })
-    this.getDicts('ECG').then(response => {
-      this.ecgOptions = response.data
-    })
-    this.getDicts('CONTRACTSTATUS').then(response => {
-      this.contractStatusOptions = response.data
-    })
-    this.getDicts('LEAVETYPE').then(response => {
-      this.leaveTypeOptions = response.data
-    })
-    this.getDicts('insuranceGaers').then(response => {
-      this.insuranceGaersOptions = response.data
-    })
-    this.getDicts('applayStatus').then(response => {
-      this.applayStatusOptions = response.data
-    })
-    this.getDicts('reportStatus').then(response => {
-      this.reportStatusOptions = response.data
-    })
-    this.getDicts('hospitalizatioFlag').then(response => {
-      this.hospitalizatioFlagOptions = response.data
-    })
-    this.getDicts('settleStatus').then(response => {
-      this.settleStatusOptions = response.data
-    })
-    this.getDicts('ZCTYPE').then(response => {
-      this.arbitrationTypeOptions = response.data
-    })
-    this.getDicts('changeType').then(response => {
-      this.changeTypeOptions = response.data
-    })
-    this.getDicts('LZTYPE').then(response => {
-      this.dimissionTypeOptions = response.data
-    })
+    // 字典数据已在登录时预加载,直接从 Vuex 获取
+    this.initDictTypes(['ageStr', 'PLITICAL', 'sex', 'EMPTYPE', 'NATION', 'MARRIAGE', 'EDUCATION', 'NATIVEPLACE', 'archivesStatus', 'INSURANCETYPE', 'empCardStatus', 'handbookStatus', 'certificateList', 'PHYSICALEXAMTYPE', 'ECG', 'CONTRACTSTATUS', 'LEAVETYPE', 'applayStatus', 'reportStatus', 'hospitalizatioFlag', 'settleStatus', 'ZCTYPE', 'changeType', 'LZTYPE'])
     this.initJob()
   },
   methods: {
@@ -1327,7 +1468,8 @@
         handbookStatus: [],
         baseKey: '',
         empType: [],
-        entryType: []
+        entryType: [],
+        certificateList: []
       }
       this.search()
     },
@@ -1371,6 +1513,16 @@
           return '离职'
         case '2':
           return '退休'
+      }
+    },
+    transEntryType(entryType) {
+      switch (entryType) {
+        case '20':
+          return '新入职'
+        case '21':
+          return '重新入职'
+        case '22':
+          return '返聘入职'
       }
     },
     typeFormat(row, column) {
@@ -1501,6 +1653,149 @@
         this.$message.error('图片大小超过4M,请重新上传')
       }
     },
+    // 打开上传方式选择弹窗
+    openUploadChoice() {
+      this.uploadChoiceDialogVisible = true
+    },
+    // 选择拍照上传
+    choiceCamera() {
+      this.uploadChoiceDialogVisible = false
+      this.cameraDialogVisible = true
+      this.$nextTick(() => {
+        this.initCamera()
+      })
+    },
+    // 选择文件上传
+    choiceFile() {
+      this.uploadChoiceDialogVisible = false
+      // 创建隐藏的文件输入框
+      const input = document.createElement('input')
+      input.type = 'file'
+      input.accept = 'image/*'
+      input.onchange = (e) => {
+        const file = e.target.files[0]
+        if (file) {
+          this.handleFileUpload(file)
+        }
+      }
+      input.click()
+    },
+    // 处理文件上传
+    handleFileUpload(file) {
+      // 验证文件类型
+      const isImage = file.type.startsWith('image/')
+      if (!isImage) {
+        this.$message.error('请上传图片文件')
+        return
+      }
+      // 验证文件大小(限制10MB)
+      const isLt10M = file.size / 1024 / 1024 < 10
+      if (!isLt10M) {
+        this.$message.error('图片大小不能超过10MB')
+        return
+      }
+      // 生成预览URL
+      const imageUrl = URL.createObjectURL(file)
+      this.empBaseInfoImageUrl = imageUrl
+      // 读取文件为Base64
+      const reader = new FileReader()
+      reader.onload = (e) => {
+        this.empBaseInfoForm.imagePath = e.target.result
+        this.$message.success('照片上传成功')
+      }
+      reader.readAsDataURL(file)
+    },
+    // 打开摄像头
+    openCamera() {
+      this.cameraDialogVisible = true
+      this.$nextTick(() => {
+        this.initCamera()
+      })
+    },
+    // 初始化摄像头
+    async initCamera() {
+      try {
+        // 请求摄像头权限
+        this.stream = await navigator.mediaDevices.getUserMedia({
+          video: {
+            width: { ideal: 640 },
+            height: { ideal: 480 },
+            facingMode: 'user' // 前置摄像头
+          },
+          audio: false
+        })
+
+        // 将视频流绑定到 video 元素
+        const video = this.$refs.video
+        if (video) {
+          video.srcObject = this.stream
+        }
+      } catch (error) {
+        this.$message.error('无法访问摄像头,请检查摄像头权限设置')
+        console.error('摄像头初始化失败:', error)
+      }
+    },
+    // 拍照
+    takePhoto() {
+      const video = this.$refs.video
+      const canvas = this.$refs.canvas
+
+      if (!video || !canvas) return
+
+      // 设置画布尺寸
+      canvas.width = video.videoWidth || 640
+      canvas.height = video.videoHeight || 480
+
+      // 绘制视频帧到画布
+      const ctx = canvas.getContext('2d')
+      ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
+
+      // 转换为图片数据
+      this.capturedImage = canvas.toDataURL('image/jpeg', 0.9)
+
+      // 停止摄像头
+      this.stopCamera()
+    },
+    // 重拍
+    retakePhoto() {
+      this.capturedImage = ''
+      this.initCamera()
+    },
+    // 确认使用照片
+    confirmPhoto() {
+      if (this.capturedImage) {
+        // 设置图片预览
+        this.empBaseInfoImageUrl = this.capturedImage
+
+        // 设置表单数据(Base64格式)
+        this.empBaseInfoForm.imagePath = this.capturedImage
+
+        // 关闭弹窗
+        this.closeCamera()
+
+        this.$message.success('照片已保存')
+      }
+    },
+    // 关闭摄像头
+    closeCamera() {
+      this.stopCamera()
+      this.cameraDialogVisible = false
+      this.capturedImage = ''
+    },
+    // 停止摄像头流
+    stopCamera() {
+      if (this.stream) {
+        this.stream.getTracks().forEach(track => {
+          track.stop()
+        })
+        this.stream = null
+      }
+
+      const video = this.$refs.video
+      if (video) {
+        video.srcObject = null
+      }
+    },
     cleanEmpBase() {
       this.empBaseInfoForm.empId = ''
       this.empBaseInfoForm.customerId = ''
@@ -1562,20 +1857,30 @@
       this.empBaseInfoForm.deptName = row.deptName
       this.empBaseInfoForm.empNumb = row.empNumb
       this.empBaseInfoForm.empName = row.empName
-      this.empBaseInfoForm.sex = row.sex
       this.empBaseInfoForm.JobId = row.JobId
       this.empBaseInfoForm.jobName = row.jobName
       this.empBaseInfoForm.empType = row.empType
       this.empBaseInfoForm.certificateType = row.certificateType
-      this.empBaseInfoForm.certificateNumb = row.certificateNumb
       this.empBaseInfoForm.nation = row.nation
       this.empBaseInfoForm.certificateValidity = row.certificateValidity
       this.empBaseInfoForm.marriage = row.marriage
-      this.empBaseInfoForm.age = row.age
+      this.empBaseInfoForm.certificateNumb = row.certificateNumb
+      if (!row.birthdate) {
+        var userinfo = toCardGetUserInfo(this.empBaseInfoForm.certificateNumb)
+        if (userinfo !== null) {
+          this.empBaseInfoForm.age = userinfo.age
+          this.empBaseInfoForm.birthdate = userinfo.birth
+          this.empBaseInfoForm.sex = userinfo.sex
+        }
+      } else {
+        this.empBaseInfoForm.age = row.age
+        this.empBaseInfoForm.birthdate = row.birthdate
+        this.empBaseInfoForm.sex = row.sex
+      }
       this.empBaseInfoForm.stature = row.stature
-      this.empBaseInfoForm.birthdate = row.birthdate
       this.empBaseInfoForm.politics = row.politics
       this.empBaseInfoForm.entryDate = row.entryDate
+      this.empBaseInfoForm.entryType = row.entryType
       this.empBaseInfoForm.education = row.education
       this.empBaseInfoForm.seniority = row.seniority
       this.empBaseInfoForm.nativePlace = row.nativePlace
@@ -1613,29 +1918,24 @@
       this.showXzyg(1)
     },
     putEmpBase(formName) {
+      // 根据新增/编辑模式使用不同的验证规则
+      const validateRules = this.isAdd ? this.addRules : this.rules
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.submitEmpInfo()
-          this.fetch({
-            ...this.queryParams,
-            ...this.sort
-          })
-          this.cleanEmpBase()
-          this.showXzyg()
+          // 刷新、清空、关闭操作已移至 submitEmpInfo 的成功回调中
         }
-      })
+      }, validateRules)
     },
     putEmpBaseContinue(formName) {
+      // 根据新增/编辑模式使用不同的验证规则
+      const validateRules = this.isAdd ? this.addRules : this.rules
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.submitEmpInfo()
-          this.cleanEmpBase()
-          this.fetch({
-            ...this.queryParams,
-            ...this.sort
-          })
+          // 传入 true 表示保存并继续新增,不关闭对话框
+          this.submitEmpInfo(true)
         }
-      })
+      }, validateRules)
     },
     delEmp() {
       var selection = this.$refs.multipleTable.store.states.selection
@@ -1714,6 +2014,9 @@
           })
           break
       }
+    },
+    editSuccess() {
+      this.search()
     },
     showYgdg(operate, formName) {
       switch (operate) {
@@ -1828,7 +2131,6 @@
     },
     changeDimissionType(value) {
       this.selectDimissionType = value
-      console.log('值:' + value)
     },
     validSelfLeaveDay(rule, value, callback) {
       const type = this.gbdaForm.dimissionType
@@ -1872,12 +2174,14 @@
             var names = []
             var dates = []
             var numbers = []
+            var deptNames = []
             for (var i = 0; i < selection.length; i++) {
               var data = selection[i]
               ids.push(data.empId)
               names.push(data.empName)
               dates.push(data.entryDate)
               numbers.push(data.certificateNumb)
+              deptNames.push(data.allDeptName)
             }
             const nowDate = new Date()
             const year = nowDate.getFullYear()
@@ -1891,7 +2195,8 @@
               dimissionDate: year + '-' + month + '-' + day,
               remark: '',
               afterOperation: ['1'],
-              certificateNumb: numbers.join(',')
+              certificateNumb: numbers.join(','),
+              deptNames: deptNames.join(',')
             }
             this.dialogShowGbda = true
           }
@@ -2021,6 +2326,13 @@
         this.queryParams.entryType = []
       }
     },
+    selectAllCertificateList(val) {
+      if (val) {
+        this.queryParams.certificateList = this.dicListToArr(this.certificateListOptions)
+      } else {
+        this.queryParams.certificateList = []
+      }
+    },
     headers() {
       const token = getToken()
       if (token) {
@@ -2034,9 +2346,25 @@
     getDateString() {
       return dateToString(new Date())
     },
-    submitEmpInfo() {
+    submitEmpInfo(continueAdd = false) {
       if (this.isAdd) {
         this.$post('hr/empBaseInfo/addInEmp', { ...this.empBaseInfoForm }).then((r) => {
+          this.$message({
+            message: this.$t('tips.addSuccess'),
+            type: 'success'
+          })
+          // 刷新列表
+          this.fetch({
+            ...this.queryParams,
+            ...this.sort
+          })
+          // 清空表单
+          this.cleanEmpBase()
+          // 如果不是继续新增,则关闭对话框
+          if (!continueAdd) {
+            this.showXzyg()
+          }
+          // 处理员工已存在的情况
           if (r.data != null) {
             if (r.data.data.empStatus === '0') {
               this.$confirm('该员工已存在,是否修改?', '提示', {
@@ -2080,17 +2408,11 @@
                   empId: r.data.data.empId,
                   empName: r.data.data.empName,
                   certificateNumb: r.data.data.certificateNumb,
-                  openType: 20,
+                  openType: 21,
                   openDate: this.getDateString(),
                   remark: ''
                 }
                 this.dialogShowDkda = true
-                // this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
-                //   this.$message({
-                //     message: this.$t('员工档案打开成功'),
-                //     type: 'success'
-                //   })
-                // })
               })
             }
           }
@@ -2103,6 +2425,11 @@
           })
           this.$emit('success')
           this.cleanEmpBase()
+          this.fetch({
+            ...this.queryParams,
+            ...this.sort
+          })
+          this.showXzyg()
         })
       }
     },
@@ -2286,10 +2613,12 @@
 
 #dcygTable {
   border-collapse: collapse;
+
   tr {
     width: 100%;
     border-bottom: 1px dashed #ccc;
-    >td:nth-child(even) {
+
+    > td:nth-child(even) {
       width: 100px;
       text-align: left;
     }
@@ -2333,4 +2662,111 @@
   cursor: pointer;
   vertical-align: middle;
 }
+
+// 头像包装器
+.avatar-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 10px;
+
+  .avatar {
+    width: 150px;
+    height: 150px;
+    border-radius: 4px;
+    cursor: pointer;
+    object-fit: cover;
+    border: 1px dashed #d9d9d9;
+
+    &:hover {
+      border-color: #409eff;
+    }
+  }
+
+  .avatar-uploader-placeholder {
+    width: 150px;
+    height: 150px;
+    border: 1px dashed #d9d9d9;
+    border-radius: 4px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    background-color: #fafafa;
+
+    &:hover {
+      border-color: #409eff;
+      background-color: #f0f9ff;
+    }
+
+    .avatar-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      line-height: 1;
+      margin-bottom: 8px;
+    }
+
+    .upload-tip {
+      font-size: 12px;
+      color: #8c939d;
+    }
+  }
+}
+
+// 上传方式选择容器
+.upload-choice-container {
+  display: flex;
+  justify-content: space-around;
+  padding: 20px 0;
+
+  .upload-choice-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 120px;
+    height: 120px;
+    border: 2px dashed #d9d9d9;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &:hover {
+      border-color: #409eff;
+      background-color: #f5f7fa;
+    }
+
+    i {
+      font-size: 40px;
+      color: #409eff;
+      margin-bottom: 10px;
+    }
+
+    span {
+      font-size: 14px;
+      color: #606266;
+    }
+  }
+}
+
+// 摄像头容器
+.camera-container {
+  text-align: center;
+
+  .camera-video {
+    width: 100%;
+    max-width: 600px;
+    height: auto;
+    border-radius: 4px;
+    background: #000;
+  }
+
+  .captured-image {
+    width: 100%;
+    max-width: 600px;
+    height: auto;
+    border-radius: 4px;
+  }
+}
 </style>

--
Gitblit v1.8.0