fix(bug修复): 【在职员工】、【离职员工】、【员工智搜】导出缺少“员工编号“字段

luoyb

2021-03-17 c4e5cc5dc481a120c8b13a340901aa826b4205cf

 src/views/user/inemployees.vue

@@ -188,9 +188,9 @@
                  <td class="td-group">
                    <el-checkbox-group v-model="queryParams.entryType" class="fj-checkbox">
                      <el-checkbox label="" @change="selectAllEntryType">全部</el-checkbox>
                      <el-checkbox :label="4">新入职</el-checkbox>
                      <el-checkbox :label="5">最新入职</el-checkbox>
                      <el-checkbox :label="6">返聘入职</el-checkbox>
                      <el-checkbox :label="20">新入职</el-checkbox>
                      <el-checkbox :label="21">重新新入职</el-checkbox>
                      <el-checkbox :label="22">返聘入职</el-checkbox>
                      <!--                      <el-checkbox-->
                      <!--                        v-for="data in dimissionTypeOptions"-->
                      <!--                        :key="data.dicItemName"-->
@@ -248,24 +248,28 @@
              >编辑</span>
            </template>
          </el-table-column>
          <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <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="100" />
          <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="180" />
          <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="age" label="年龄" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="80" :formatter="educationFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <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="telePhone" label="联系电话" width="140" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
          <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">
            <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>
        <pagination
          v-show="total>0"
@@ -417,7 +421,7 @@
                    :clear-value-text="$t('common.clear')"
                    placeholder="请选择部门(护卫点)"
                    style="width:100%"
                    @select="deptNameSelect"
                    @select="empDeptNameSelect"
                  />
                </el-form-item>
                <el-form-item label="岗位" prop="jobName">
@@ -518,7 +522,7 @@
              </el-col>
              <el-col :span="24">
                <el-form-item label="相关证件" prop="certificateList">
                  <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
                  <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件">
                    <el-option
                      v-for="dict in certificateListOptions"
                      :key="dict.dicItemCode"
@@ -630,11 +634,12 @@
          <el-col span="24">
            <el-form-item label="离职类型" prop="dimissionType">
              <el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType">
                <el-radio :label="1">正常离职</el-radio>
                <el-radio :label="2">自动离职</el-radio>
                <el-radio :label="3">公司劝退</el-radio>
                <el-radio :label="4">公司辞退</el-radio>
                <el-radio :label="1">合同期满</el-radio>
                <el-radio :label="2">公司劝退</el-radio>
                <el-radio :label="3">公司辞退</el-radio>
                <el-radio :label="4">自动离职</el-radio>
                <el-radio :label="5">试用期内</el-radio>
                <el-radio :label="6">正常离职</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -854,6 +859,20 @@
              <el-checkbox label="handbookStatusName"><span /></el-checkbox>
            </td>
          </tr>
          <tr>
            <td>入职类型</td>
            <td>
              <el-checkbox label="entryTypeName"><span /></el-checkbox>
            </td>
            <td>离职类型</td>
            <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>-->
@@ -878,6 +897,42 @@
      :type="dialog.type"
      @close="editClose"
    />
    <el-dialog title="打开档案" :visible.sync="dialogShowDkda" width="50%">
      <el-form
        ref="openArchivesForm"
        :model="openArchivesForm"
        rules="openArchivesRules"
        label-position="right"
        label-width="120px"
      >
        <el-row>
          <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-group>
              （主要对已退休员工返聘）
            </el-form-item>
            <el-form-item label="打开日期">
              <el-date-picker
                v-model="openArchivesForm.openDate"
                value-format="yyyy-MM-dd"
                type="date"
                placeholder="选择打开日期"
              />
            </el-form-item>
            <el-form-item label="备注说明">
              <el-input v-model="openArchivesForm.remark" type="textarea" :rows="4" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="showDkda(1, '')">取 消</el-button>
        <el-button type="primary" @click="showDkda(2, 'openArchivesForm')">确 定</el-button>
      </div>
    </el-dialog>
  </div>
</template>
<script>
@@ -931,7 +986,7 @@
        empId: '',
        customerId: '',
        archivesNumb: '',
        deptId: '',
        deptId: null,
        deptName: '',
        empNumb: '',
        allDeptName: '',
@@ -976,9 +1031,23 @@
        modifier: '',
        delFlag: '0',
        empStatus: 0,
        version: ''
        version: '',
        entryType: '20'
      },
      ygdgForm: {},
      ygdgForm: {
        empIds: [],
        empNames: [],
        oldDeptNames: [],
        oldJobNames: [],
        changeType: '',
        changeDate: '',
        changeReason: '',
        jobId: '',
        newJobName: '',
        deptId: '',
        newDeptName: '',
        allDeptName: ''
      },
      gbdaForm: {
        dgryIds: '',
        dimissionType: 1,
@@ -1113,10 +1182,11 @@
      dialogShowYgdg: false,
      dialogShowDryg: false,
      dialogShowGbda: false,
      dialogShowDkda: false,
      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'],
      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'],
      checkedCities: [],
      tableData: [],
      selectDimissionType: 1,
@@ -1146,7 +1216,7 @@
      dimissionTypeOptions: [],
      ageStrOptions: [],
      sexOptions: [],
      openArchivesForm: {}
      openArchivesForm: { }
    }
  },
  mounted() {
@@ -1309,6 +1379,16 @@
          return '离职'
        case '2':
          return '退休'
      }
    },
    transEntryType(entryType) {
      switch (entryType) {
        case '20':
          return '新入职'
        case '21':
          return '重新入职'
        case '22':
          return '返聘入职'
      }
    },
    typeFormat(row, column) {
@@ -1534,6 +1614,11 @@
      this.empBaseInfoForm.handbookStatus = row.handbookStatus
      this.empBaseInfoForm.urgencyPhone = row.urgencyPhone
      this.empBaseInfoForm.empCardStatus = row.empCardStatus
      let certificateList = []
      if (row.certificateList && typeof row.certificateList === 'string') {
        certificateList = row.certificateList.split(',')
        row.certificateList = certificateList
      }
      this.empBaseInfoForm.certificateList = row.certificateList
      this.empBaseInfoForm.createTime = row.createTime
      this.empBaseInfoForm.creator = row.creator
@@ -1541,7 +1626,8 @@
      this.empBaseInfoForm.modifier = row.modifier
      this.empBaseInfoForm.delFlag = row.delFlag
      this.empBaseInfoForm.version = row.version
      this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId
      // this.empBaseInfoImageUrl = ''
      this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId + '?t=' + parseInt(100 * Math.random())
      this.showXzyg(1)
    },
    putEmpBase(formName) {
@@ -1665,7 +1751,7 @@
              var data = selection[i]
              ids.push(data.empId)
              names.push(data.empName)
              deptNames.push(data.deptName)
              deptNames.push(data.allDeptName)
              jobNames.push(data.jobName)
            }
            this.ygdgForm = {
@@ -1715,7 +1801,9 @@
      this.empBaseInfoForm.nativePlace = item.code
    },
    deptNameSelect(node) {
      this.ygdgForm.deptId = node.deptId
      this.ygdgForm.newDeptName = node.label
      this.ygdgForm.allDeptName = node.allDeptName
    },
    querySearchJob(queryString, cb) {
      const restaurants = this.restaurJob
@@ -1729,7 +1817,7 @@

      this.ygdgForm.newJobName = item.value
      this.ygdgForm.jobId = item.code
    }, DeptNameSelect(val) {
    }, empDeptNameSelect(val) {
      this.empBaseInfoForm.deptId = val.id
      this.empBaseInfoForm.deptName = val.label
      this.empBaseInfoForm.allDeptName = val.allDeptName
@@ -1946,7 +2034,7 @@
    },
    selectAllEntryType(val) {
      if (val) {
        this.queryParams.entryType = [4, 5, 6]
        this.queryParams.entryType = [20, 21, 22]
      } else {
        this.queryParams.entryType = []
      }
@@ -1977,7 +2065,31 @@
                this.editEmpBase(r.data.data)
              })
            } else {
              this.$confirm('该员工已离职，是否重新打开档案？', '提示', {
              let tempName
              switch (r.data.data.dimissionType) {
                case '1':
                  tempName = '合同期满'
                  break
                case '2':
                  tempName = '公司劝退'
                  break
                case '3':
                  tempName = '公司辞退'
                  break
                case '4':
                  tempName = '自动离职'
                  break
                case '5':
                  tempName = '试用期内'
                  break
                case '6':
                  tempName = '正常离职'
                  break
              }
              var msg = '该员工已存在，' + tempName + '状态!\n\r'
              msg += r.data.data.remark + '\n\r'
              msg += '由于' + r.data.data.empName + '已离职，是否重新打开档案？'
              this.$confirm(msg, '提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
@@ -1986,16 +2098,17 @@
                  empId: r.data.data.empId,
                  empName: r.data.data.empName,
                  certificateNumb: r.data.data.certificateNumb,
                  openType: 2,
                  openType: 20,
                  openDate: this.getDateString(),
                  remark: ''
                }
                this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
                  this.$message({
                    message: this.$t('员工档案打开成功'),
                    type: 'success'
                  })
                })
                this.dialogShowDkda = true
                // this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
                //   this.$message({
                //     message: this.$t('员工档案打开成功'),
                //     type: 'success'
                //   })
                // })
              })
            }
          }
@@ -2015,6 +2128,56 @@
      this.sort.field = val.prop
      this.sort.order = val.order
      this.search()
    },
    showDkda(operate, formName) {
      switch (operate) {
        // case 0:
        //   var selection = this.$refs.multipleTable.store.states.selection
        //   if (selection.length === 1) {
        //     var id = selection[0].empId
        //     var name = selection[0].empName
        //     var number = selection[0].certificateNumb
        //     const nowDate = new Date()
        //     const year = nowDate.getFullYear()
        //     const month = nowDate.getMonth() + 1
        //     const day = nowDate.getDate()
        //     this.baseicInformationForm = {
        //       empId: id,
        //       empName: name,
        //       certificateNumb: number,
        //       openType: 2,
        //       openDate: year + '-' + month + '-' + day,
        //       remark: ''
        //     }
        //     this.dialogShowDkda = true
        //   } else {
        //     this.$message({
        //       message: '请选中一个要打开档案的人员',
        //       type: 'error'
        //     })
        //   }
        //   break
        case 1:
          this.dialogShowDkda = false
          break
        case 2:
          this.$refs[formName].validate((valid) => {
            if (valid) {
              this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
                this.dialogShowDkda = false
                this.$message({
                  message: this.$t('员工档案打开成功'),
                  type: 'success'
                })
                this.fetch({
                  ...this.queryParams,
                  ...this.sort
                })
              })
            }
          })
          break
      }
    }
  }
}