feat: 员工档案编辑时入职类型丢失问题解决

luoyb

2024-06-21 fcd8d7f55ab468e538a91ce168d5f3be144e140e

 src/views/user/inemployees.vue

@@ -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)"
@@ -402,10 +409,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 +618,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 +635,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 +647,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>
@@ -804,7 +812,7 @@
            </td>
          </tr>
          <tr>
            <td>家庭成员及关系</td>
            <td>家庭成员及关系1</td>
            <td>
              <el-checkbox label="family"><span /></el-checkbox>
            </td>
@@ -850,7 +858,7 @@
            <td>
              <el-checkbox label="certificateListName"><span /></el-checkbox>
            </td>
            <td>紧急联系电话</td>
            <td>家庭成员及关系2</td>
            <td>
              <el-checkbox label="urgencyPhone"><span /></el-checkbox>
            </td>
@@ -910,8 +918,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 +981,8 @@
        empCardStatus: [],
        handbookStatus: [],
        entryType: [],
        empType: []
        empType: [],
        certificateList: []
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
@@ -1336,7 +1345,8 @@
        handbookStatus: [],
        baseKey: '',
        empType: [],
        entryType: []
        entryType: [],
        certificateList: []
      }
      this.search()
    },
@@ -1604,6 +1614,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 +1913,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 +1934,8 @@
              dimissionDate: year + '-' + month + '-' + day,
              remark: '',
              afterOperation: ['1'],
              certificateNumb: numbers.join(',')
              certificateNumb: numbers.join(','),
              deptNames: deptNames.join(',')
            }
            this.dialogShowGbda = true
          }
@@ -2051,6 +2065,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 +2131,7 @@
                  empId: r.data.data.empId,
                  empName: r.data.data.empName,
                  certificateNumb: r.data.data.certificateNumb,
                  openType: 20,
                  openType: 21,
                  openDate: this.getDateString(),
                  remark: ''
                }