|
@@ -14,7 +14,7 @@
|
|
|
<vxe-toolbar :refresh="{query: refreshList}" custom>
|
|
|
<template #buttons>
|
|
|
<el-button v-if="hasPermission('changes:dimission:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">办理员工离职</el-button>
|
|
|
- <el-button v-if="hasPermission('changes:dimission:del')" type="danger" size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.dimissionTable && $refs.dimissionTable.getCheckboxRecords().length === 0" plain>删除</el-button>
|
|
|
+<!-- <el-button v-if="hasPermission('changes:dimission:del')" type="danger" size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.dimissionTable && $refs.dimissionTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
|
|
|
</template>
|
|
|
</vxe-toolbar>
|
|
|
<div style="height: calc(100% - 140px);">
|
|
@@ -38,7 +38,7 @@
|
|
|
:import-config="{}"
|
|
|
:checkbox-config="{}">
|
|
|
<vxe-column type="seq" width="40"></vxe-column>
|
|
|
- <vxe-column type="checkbox" width="40px"></vxe-column>
|
|
|
+<!-- <vxe-column type="checkbox" width="40px"></vxe-column>-->
|
|
|
<vxe-column width="150" title="姓名" field="rosterBaseDTO.name">
|
|
|
<template slot-scope="scope">
|
|
|
<el-link type="primary" :underline="false" v-if="hasPermission('changes:dimission:view')" @click="view(scope.row.id)">{{!commonJS.isEmpty(scope.row.rosterBaseDTO.name)?scope.row.rosterBaseDTO.name:'--'}}</el-link>
|
|
@@ -47,17 +47,42 @@
|
|
|
</vxe-column>
|
|
|
<vxe-column width="120" title="离职审批" field="vettingStatus">
|
|
|
<template slot-scope="scope">
|
|
|
- {{$dictUtils.getDictLabel('vetting_status', scope.row.vettingStatus, '-')}}
|
|
|
+ <el-button v-if="scope.row.vettingStatus === '4'" type="primary" @click="auditDetail(scope.row)" size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel("vetting_status", scope.row.vettingStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else-if="scope.row.vettingStatus === '6'" type="success" @click="auditDetail(scope.row)" size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel("vetting_status", scope.row.vettingStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else-if="scope.row.vettingStatus === '2'" type="warning" size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel("vetting_status", scope.row.vettingStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel("vetting_status", scope.row.vettingStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
<vxe-column width="120" title="离职交接" field="handoverStatus">
|
|
|
<template slot-scope="scope">
|
|
|
- {{$dictUtils.getDictLabel('handover_status', scope.row.handoverStatus, '-')}}
|
|
|
+ <el-button v-if="scope.row.handoverStatus === '3'" type="primary" @click="handoverDetail(scope.row)" size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel('handover_status', scope.row.handoverStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else-if="scope.row.handoverStatus === '4'" type="success" @click="handoverDetail(scope.row)" size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel('handover_status', scope.row.handoverStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel('handover_status', scope.row.handoverStatus, '-')}}
|
|
|
+ </el-button>
|
|
|
+
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
<vxe-column width="120" title="离职状态" field="status">
|
|
|
<template slot-scope="scope">
|
|
|
- {{$dictUtils.getDictLabel('dimission_status', scope.row.status, '-')}}
|
|
|
+ <el-button v-if="scope.row.status === '2'" type="success" size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel('dimission_status', scope.row.status, '-')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else size="mini" plain>
|
|
|
+ {{$dictUtils.getDictLabel('dimission_status', scope.row.status, '-')}}
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
<vxe-column width="200" title="工号" field="rosterBaseDTO.jobNo"></vxe-column>
|
|
@@ -144,8 +169,7 @@
|
|
|
发起离职审批
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item v-if="hasPermission('changes:dimission:view')&&
|
|
|
- (scope.row.status === '1'&&scope.row.vettingStatus === '4')||
|
|
|
- (scope.row.status === '1'&&scope.row.vettingStatus === '6')"
|
|
|
+ (scope.row.vettingStatus === '4'||scope.row.vettingStatus === '6')"
|
|
|
:command="{method:'auditDetail', row:scope.row}">
|
|
|
离职审批结果
|
|
|
</el-dropdown-item>
|
|
@@ -340,7 +364,7 @@
|
|
|
let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [离职审批]`
|
|
|
this.taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
|
|
|
businessId: row.id,
|
|
|
- businessTable: 'changes_dimission'}).then((data) => {
|
|
|
+ businessTable: 'changes_dimission_audit'}).then((data) => {
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskForm',
|
|
|
query: {
|
|
@@ -350,7 +374,7 @@
|
|
|
formType: data.data.formType,
|
|
|
formUrl: data.data.formUrl,
|
|
|
formTitle: processTitle,
|
|
|
- businessTable: 'changes_dimission',
|
|
|
+ businessTable: 'changes_dimission_audit',
|
|
|
businessId: row.id,
|
|
|
isShow: 'false',
|
|
|
status: 'startAndHold',
|
|
@@ -364,7 +388,7 @@
|
|
|
// eslint-disable-next-line eqeqeq
|
|
|
if (!this.commonJS.isEmpty(row.vettingStatus)) {
|
|
|
this.taskService.getTaskDef({
|
|
|
- procInsId: row.procInsId,
|
|
|
+ procInsId: row.changesDimissionAuditDTO.procInsId,
|
|
|
procDefId: this.processDefinitionAuditId
|
|
|
}).then(({data}) => {
|
|
|
this.$router.push({
|