员工管理界面(在职、离职和智搜的列表、档案、导出)增加了年假天数显示

luoyb

2025-09-23 338c1fc6a3de638d84b60a5da064dceef6f0d775

 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,28 +255,84 @@
              >编辑</span>
            </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="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="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <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="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="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="entryType" label="入职类型" width="120" sortable="custom" :sort-orders="['ascending', 'descending']">
          <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"
@@ -392,8 +455,8 @@
                <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"
@@ -402,10 +465,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>
@@ -611,7 +674,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"
@@ -628,7 +691,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">
@@ -640,6 +703,7 @@
                <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>
@@ -682,7 +746,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;">
@@ -804,7 +870,7 @@
            </td>
          </tr>
          <tr>
            <td>家庭成员及关系</td>
            <td>家庭成员及关系1</td>
            <td>
              <el-checkbox label="family"><span /></el-checkbox>
            </td>
@@ -822,7 +888,7 @@
            <td>
              <el-checkbox label="entryDate"><span /></el-checkbox>
            </td>
            <td>保险类型</td>
            <td>社保档位</td>
            <td>
              <el-checkbox label="insuranceTypeName"><span /></el-checkbox>
            </td>
@@ -848,9 +914,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>
@@ -873,16 +939,16 @@
              <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">
@@ -910,8 +976,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>
@@ -973,7 +1039,8 @@
        empCardStatus: [],
        handbookStatus: [],
        entryType: [],
        empType: []
        empType: [],
        certificateList: []
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
@@ -1079,7 +1146,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' }],
@@ -1187,7 +1254,7 @@
      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', 'empNumb'],
      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,
@@ -1217,7 +1284,7 @@
      dimissionTypeOptions: [],
      ageStrOptions: [],
      sexOptions: [],
      openArchivesForm: { }
      openArchivesForm: {}
    }
  },
  mounted() {
@@ -1274,7 +1341,7 @@
    this.getDicts('LEAVETYPE').then(response => {
      this.leaveTypeOptions = response.data
    })
    this.getDicts('insuranceGaers').then(response => {
    this.getDicts('INSURANCETYPE').then(response => {
      this.insuranceGaersOptions = response.data
    })
    this.getDicts('applayStatus').then(response => {
@@ -1336,7 +1403,8 @@
        handbookStatus: [],
        baseKey: '',
        empType: [],
        entryType: []
        entryType: [],
        certificateList: []
      }
      this.search()
    },
@@ -1604,6 +1672,7 @@
      this.empBaseInfoForm.stature = row.stature
      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
@@ -1902,12 +1971,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()
@@ -1921,7 +1992,8 @@
              dimissionDate: year + '-' + month + '-' + day,
              remark: '',
              afterOperation: ['1'],
              certificateNumb: numbers.join(',')
              certificateNumb: numbers.join(','),
              deptNames: deptNames.join(',')
            }
            this.dialogShowGbda = true
          }
@@ -2051,6 +2123,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) {
@@ -2110,7 +2189,7 @@
                  empId: r.data.data.empId,
                  empName: r.data.data.empName,
                  certificateNumb: r.data.data.certificateNumb,
                  openType: 20,
                  openType: 21,
                  openDate: this.getDateString(),
                  remark: ''
                }
@@ -2316,10 +2395,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;
    }