feat(员工档案-入离职记录): 员工档案中入离职按记录顺序显示

luoyb

2021-03-24 5386a70600dc4e0d28af9fb81c16667d2b850af8

 src/views/user/archivesEdit.vue

@@ -752,7 +752,7 @@
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editLeaveInfo(scope.row,5)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onleaveInfoDataselection')">删除</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'leaveInfoDataselection')">删除</span>
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="leaveId" label="" />
@@ -800,7 +800,7 @@
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editResign(scope.row,5)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onresignDataselection')">删除</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'resignDataselection')">删除</span>
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="resignId" label="" />
@@ -1184,7 +1184,7 @@
                <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
                  <template slot-scope="scope">
                    <span class="table-button" @click="editBadRecord(scope.row,12)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onbadRecordDataselection')">删除</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'badRecordDataselection')">删除</span>
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="badId" label="" />
@@ -1236,7 +1236,7 @@
                    <!--                  >删除-->
                    <!--                  </el-button>-->
                    <span class="table-button" @click="editRemarkInfo(scope.row,13)">编辑</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'onremarkInfoDataselection')">删除</span>
                    <span class="table-button" @click="singleDelete(scope.row, 'remarkInfoDataselection')">删除</span>
                  </template>
                </el-table-column>
                <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="remarkId" label="" />
@@ -4126,6 +4126,8 @@
        certificateList = val.certificateList.split(',')
        val.certificateList = certificateList
      }
      const remarks = ''
      val.remark = remarks
      this.empBaseInfoForm = { ...val }
      this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
      this.fileDate.empId = this.empBaseInfoForm.empId
@@ -4193,6 +4195,8 @@
      params.empId = this.empBaseInfoForm.empId
      params.dimissionType = ''
      params.delFlag = '0'
      params.field = 'createTime'
      params.order = 'ascending'
      this.$get('hr/empDimissionlog/list', {
        ...params
      }).then((r) => {
@@ -4223,6 +4227,8 @@
      //   this.empBaseInfoForm.imagePath = ''
      // }
      this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
        this.readon = false
        this.$emit('success')
        this.$message({
          message: this.$t('tips.updateSuccess'),
          type: 'success'
@@ -5463,6 +5469,7 @@
      this.dialogshowArr[13].show = true
    },
    gzadd(index) {
      debugger
      this.isAdd = true
      this.thisShowIndex = index
      this.dialogshowArr[index].show = true
@@ -5540,9 +5547,9 @@
          message: this.$t('tips.deleteSuccess'),
          type: 'success'
        })
        if (selection === 'onremarkInfoDataselection') {
        if (selection === 'remarkInfoDataselection') {
          this.initremarkInfoData()
        } else if (selection === 'onbadRecordDataselection') {
        } else if (selection === 'badRecordDataselection') {
          this.initbadRecordData()
        } else if (selection === 'laborTroubleDataselection') {
          this.initlaborTroubleData()
@@ -5694,7 +5701,7 @@
    singleDelete(row, names) {
      let ids = ''
      let urls = ''
      if (names === 'onremarkInfoDataselection') {
      if (names === 'remarkInfoDataselection') {
        ids = row.remarkId
        urls = 'empRemarkInfo'
      } else if (names === 'onbadRecordDataselection') {