hbyt/evo-Financial-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增离职重新入职

Browse Source
This commit is contained in:
andy 2025-07-14 09:21:14 +08:00
parent 7f0c8000d0
commit d80fe249f2
3 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/system/staff.js
View File

@ -68,3 +68,11 @@ export function clearAllStaff() {
})
}
export function reEmployment(id) {
return request({
url: '/system/staff/reEmployment/' + id,
method: 'post'
})
}

2
src/views/attendance/param/index.vue
View File

@ -111,7 +111,7 @@
<el-input v-model="form.paramValue" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="说明" prop="description">
<el-input v-model="form.description" type="textarea" placeholder="请输入内容" disabled/>
<el-input v-model="form.description" type="textarea" placeholder="请输入内容"/>
</el-form-item>
<!-- <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />

70
src/views/system/staff/index.vue
View File

@ -150,6 +150,11 @@
<el-table-column label="部门" align="center" fixed="left" width="90" prop="deptName" />
<el-table-column label="员工编码" align="center" width="90" prop="code" />
<el-table-column label="员工岗位" align="center" prop="jobCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.job_info" :value="scope.row.jobCode"/>
</template>
</el-table-column>
<!-- <el-table-column label="编号" align="center" prop="code" /> -->
<el-table-column label="身份证号" align="center" prop="idCard" width="180"/>
<el-table-column label="性别" align="center" prop="sex">
@ -221,6 +226,7 @@
size="mini"
type="text"
icon="el-icon-info"
v-if="scope.row.status!=-1"
@click="handleDetail(scope.row)"
v-hasPermi="['system:staff:detail']"
>查看详情</el-button>
@ -228,6 +234,7 @@
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.status!=-1"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:staff:edit']"
>修改</el-button>
@ -243,6 +250,7 @@
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.status!=-1"
@click="handleDelay(scope.row)"
v-hasPermi="['system:staff:delay']"
>工资延期</el-button>
@ -254,6 +262,14 @@
@click="handleJobStatus(scope.row)"
v-hasPermi="['system:staff:jobStatus']"
>离职</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status==-1"
icon="el-icon-edit"
@click="reEmployment(scope.row)"
v-hasPermi="['system:staff:reEmployment']"
>重新入职</el-button>
</template>
</el-table-column>
</el-table>
@ -380,13 +396,38 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属公司：" prop="companyName">
<el-select v-model="form.companyName" placeholder="请选择公司">
<el-option
v-for="dict in dict.type.sys_company"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="岗位：" prop="jobCode">
<el-select v-model="form.jobCode" placeholder="请选择岗位">
<el-option
v-for="dict in dict.type.job_info"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否负责人：" prop="isLeader">
<el-select v-model="form.isLeader" placeholder="请选择是不是负责人" clearable>
@ -507,18 +548,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属公司：" prop="companyName">
<el-select v-model="form.companyName" placeholder="请选择公司">
<el-option
v-for="dict in dict.type.sys_company"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注：" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
@ -870,7 +900,7 @@
<script>
import { listStaff, getStaff, delStaff, addStaff, updateStaff, clearAllStaff } from '@/api/system/staff'
import { listStaff, getStaff, delStaff, addStaff, updateStaff, clearAllStaff,reEmployment } from '@/api/system/staff'
import { getDetailByUser,updateDetail } from "@/api/system/staffDetail";
import { listAllDepts } from '@/api/system/dept';
import { listAllOptions } from '@/api/personnelMatters/subsidyInformation';
@ -880,7 +910,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Staff",
dicts: ['sys_user_sex', 'sys_level','sys_yes_no','sys_worker_status','sys_contract','sys_company','time_clock'],
dicts: ['sys_user_sex', 'sys_level','sys_yes_no','sys_worker_status','sys_contract','sys_company','time_clock','job_info'],
components: { Treeselect },
data() {
return {
@ -1229,6 +1259,16 @@ export default {
this.title = "离职对话框";
});
},
reEmployment(row){
reEmployment(row.userId).then(response => {
if(response.data.code==200){
this.$modal.msgSuccess("重新入职成功");
this.getList();
}else{
this.$modal.msgError(response.data.msg);
}
});
},
//员工全额工资对话框
handleDelay(row){
this.reset();