fix(bug修复): 在职员工和离职员工功能按钮调整

luoyb

2021-03-09 ce4dc48d644343a35f31565c295ea88d8faa67c3

 src/views/user/inemployees.vue

@@ -213,7 +213,7 @@
            <el-button type="primary" style="background-color: #409EFF" @click="delEmp">删除员工</el-button>
            <el-button type="danger" class="hr-but-all" @click="showYgdg(0)">员工调岗</el-button>
            <!-- <el-button type="danger" class="hr-but-all" @click="showDryg(0)">导入员工</el-button> -->
            <el-button type="danger" class="hr-but-all" @click="exportExcel()">导出员工</el-button>
            <el-button type="danger" class="hr-but-all" @click="showDcyg(0)">导出EXCEL</el-button>
            <el-button type="primary" style="background-color: #409EFF" @click="showGbda(0)">关闭档案</el-button>
          </el-col>
        </el-row>
@@ -799,15 +799,15 @@
          <tr>
            <td>员工类型</td>
            <td>
              <el-checkbox label=""><span /></el-checkbox>
              <el-checkbox label="empTypeName"><span /></el-checkbox>
            </td>
            <td>员工状态</td>
            <td>
              <el-checkbox label=""><span /></el-checkbox>
              <el-checkbox label="empStatusName"><span /></el-checkbox>
            </td>
            <td>离职日期</td>
            <td>
              <el-checkbox label=""><span /></el-checkbox>
              <el-checkbox label="dimissionDate"><span /></el-checkbox>
            </td>
          </tr>
          <tr>
@@ -919,7 +919,7 @@
      }, // 查询参数
      sort: {}, // 排序
      pagination: { // 分页参数
        size: 15,
        size: 12,
        num: 1
      },
      baseicInformationForm: {},
@@ -1113,7 +1113,7 @@
      exportUrl: '',
      checkAll: false,
      isIndeterminate: false,
      cityOptions: ['archivesNumb', 'deptName', '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', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family'],
      cityOptions: ['archivesNumb', 'deptName', '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', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empTypeName', 'empStatusName', 'dimissionDate'],
      checkedCities: [],
      tableData: [],
      selectDimissionType: 1,
@@ -1539,51 +1539,6 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          this.submitEmpInfo()
          // if (this.isAdd) {
          //   this.$post('hr/empBaseInfo/addInEmp', { ...this.empBaseInfoForm }).then((r) => {
          //     if (r.data != null) {
          //       if (r.data.data.empStatus === '0') {
          //         this.$confirm('该员工已存在，是否修改？', '提示', {
          //           confirmButtonText: '确定',
          //           cancelButtonText: '取消',
          //           type: 'warning'
          //         }).then(() => {
          //           this.editEmpBase(r.data.data)
          //         })
          //       } else {
          //         this.$confirm('该员工已离职，是否重新打开档案？', '提示', {
          //           confirmButtonText: '确定',
          //           cancelButtonText: '取消',
          //           type: 'warning'
          //         }).then(() => {
          //           this.openArchivesForm = {
          //             empId: r.data.data.empId,
          //             empName: r.data.data.empName,
          //             certificateNumb: r.data.data.certificateNumb,
          //             openType: 2,
          //             openDate: this.getDateString(),
          //             remark: ''
          //           }
          //           this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
          //             this.$message({
          //               message: this.$t('员工档案打开成功'),
          //               type: 'success'
          //             })
          //           })
          //         })
          //       }
          //     }
          //   })
          // } else {
          //   this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
          //     this.$message({
          //       message: this.$t('tips.updateSuccess'),
          //       type: 'success'
          //     })
          //     this.$emit('success')
          //     this.cleanEmpBase()
          //   })
          // }
          this.fetch({
            ...this.queryParams,
            ...this.sort