人力资源模块体验优化
This commit is contained in:
parent
e45e08ffb9
commit
ea132bfc00
@ -28,7 +28,7 @@ class Admin extends BaseController
|
||||
if (!empty($param['keywords'])) {
|
||||
$where[] = ['id|username|name|nickname|mobile|desc', 'like', '%' . $param['keywords'] . '%'];
|
||||
}
|
||||
$where[] = ['status', '>=', 0];
|
||||
$where[] = ['status', '<', 2];
|
||||
if (isset($param['status'])) {
|
||||
$where[] = ['status', '=', $param['status']];
|
||||
}
|
||||
|
@ -52,6 +52,10 @@ class Personal extends BaseController
|
||||
$param = get_params();
|
||||
if (request()->isAjax()) {
|
||||
$param['move_time'] = isset($param['move_time']) ? strtotime($param['move_time']) : 0;
|
||||
$count = Db::name('Department')->where(['leader_id' => $param['uid']])->count();
|
||||
if($count>0){
|
||||
return to_assign(1,'请先撤销该员工的部门负责人头衔再调部门');
|
||||
}
|
||||
if ($param['id'] > 0) {
|
||||
$param['update_time'] = time();
|
||||
$res = Db::name('DepartmentChange')->strict(false)->field(true)->update($param);
|
||||
@ -94,19 +98,19 @@ class Personal extends BaseController
|
||||
$where['p.status'] = array('eq', 1);
|
||||
$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
|
||||
$list = PersonalQuit::where($where)
|
||||
->field('p.*,u.name as name,d.title as department,ps.title as position')
|
||||
->alias('p')
|
||||
->join('admin u', 'p.uid = u.id', 'LEFT')
|
||||
->join('department d', 'u.did = d.id', 'LEFT')
|
||||
->join('position ps', 'u.position_id = ps.id', 'LEFT')
|
||||
->order('p.id desc')
|
||||
->paginate($rows, false, ['query' => $param])
|
||||
->each(function ($item, $key) {
|
||||
$item->quit_time = date('Y-m-d', $item->quit_time);
|
||||
$item->lead_admin = Db::name('admin')->where(['id' => $item->lead_admin_id])->value('name');
|
||||
$this_uids_name = Db::name('admin')->where([['id','in', $item->connect_uids]])->column('name');
|
||||
$item->connect_names = implode(',', $this_uids_name);
|
||||
});
|
||||
->field('p.*,u.name as name,d.title as department,ps.title as position')
|
||||
->alias('p')
|
||||
->join('admin u', 'p.uid = u.id', 'LEFT')
|
||||
->join('department d', 'u.did = d.id', 'LEFT')
|
||||
->join('position ps', 'u.position_id = ps.id', 'LEFT')
|
||||
->order('p.id desc')
|
||||
->paginate($rows, false, ['query' => $param])
|
||||
->each(function ($item, $key) {
|
||||
$item->quit_time = date('Y-m-d', $item->quit_time);
|
||||
$item->lead_admin = Db::name('admin')->where(['id' => $item->lead_admin_id])->value('name');
|
||||
$this_uids_name = Db::name('admin')->where([['id','in', $item->connect_uids]])->column('name');
|
||||
$item->connect_names = implode(',', $this_uids_name);
|
||||
});
|
||||
return table_assign(0, '', $list);
|
||||
} else {
|
||||
return view();
|
||||
@ -118,6 +122,10 @@ class Personal extends BaseController
|
||||
{
|
||||
$param = get_params();
|
||||
if (request()->isAjax()) {
|
||||
$count = Db::name('Department')->where(['leader_id' => $param['uid']])->count();
|
||||
if($count>0){
|
||||
return to_assign(1,'请先撤销该员工的部门负责人头衔再添加离职档案');
|
||||
}
|
||||
$param['quit_time'] = isset($param['quit_time']) ? strtotime($param['quit_time']) : 0;
|
||||
if ($param['id'] > 0) {
|
||||
$param['update_time'] = time();
|
||||
@ -130,7 +138,7 @@ class Personal extends BaseController
|
||||
add_log('add', $res, $param);
|
||||
}
|
||||
if ($res!==false) {
|
||||
Db::name('Admin')->where('id', $param['uid'])->update(['status' => 0]);
|
||||
Db::name('Admin')->where('id', $param['uid'])->update(['status' => 2]);
|
||||
}
|
||||
return to_assign();
|
||||
} else {
|
||||
|
@ -25,7 +25,6 @@
|
||||
<select name="status">
|
||||
<option value="">选择员工状态</option>
|
||||
<option value="1">正常状态</option>
|
||||
<option value="2">离职状态</option>
|
||||
<option value="0">禁止登录</option>
|
||||
</select>
|
||||
</div>
|
||||
@ -52,7 +51,6 @@
|
||||
<script type="text/html" id="toolbarDemo">
|
||||
<div class="layui-btn-container">
|
||||
<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add"><i class="layui-icon"></i>添加员工</button>
|
||||
<button class="layui-btn layui-btn-warm layui-btn-sm" lay-event="leave"><i class="layui-icon"></i>设为离职</button>
|
||||
<button class="layui-btn layui-btn-danger layui-btn-sm" lay-event="disable"><i class="layui-icon">ဆ</i>禁止登录</button>
|
||||
<button class="layui-btn layui-btn-sm" lay-event="recovery"><i class="layui-icon"></i>恢复正常</button>
|
||||
</div>
|
||||
@ -252,10 +250,6 @@
|
||||
msg = '您确定要把选中的员工恢复正常?';
|
||||
type = 1;
|
||||
break;
|
||||
case 'leave':
|
||||
msg = '您确定要把选中的员工设为离职?';
|
||||
type = 2;
|
||||
break;
|
||||
};
|
||||
|
||||
layer.confirm(msg, {
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
<script type="text/html" id="toolbarDemo">
|
||||
<div class="layui-btn-container">
|
||||
<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add">+ 添加离职档案记录</button>
|
||||
<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add">+ 添加离职档案记录</button> <span style="font-size:12px; margin-left:20px; color:#FF5722">删除离职档案即可恢复在职状态</span>
|
||||
</div>
|
||||
</script>
|
||||
{/block}
|
||||
@ -35,7 +35,7 @@
|
||||
, limit: 20
|
||||
, cols: [[
|
||||
{ field: 'id', width: 80, title: '序号', align: 'center' }
|
||||
, { field: 'name', width: 90, title: '员工姓名', align: 'center'}
|
||||
, { field: 'name', width: 110, title: '离职员工姓名', align: 'center','style':'color:#FF5722'}
|
||||
, { field: 'department', width: 120, title: '所在部门', align: 'center'}
|
||||
, { field: 'position', width: 100, title: '职位', align: 'center'}
|
||||
, { field: 'lead_admin', width: 90, title: '部门负责人', align: 'center'}
|
||||
|
Loading…
x
Reference in New Issue
Block a user