正在显示
3 个修改的文件
包含
71 行增加
和
4 行删除
@@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
3 | namespace app\admin\controller; | 3 | namespace app\admin\controller; |
4 | 4 | ||
5 | use app\common\controller\Backend; | 5 | use app\common\controller\Backend; |
6 | +use think\Db; | ||
6 | 7 | ||
7 | /** | 8 | /** |
8 | * 每月工资管理 | 9 | * 每月工资管理 |
@@ -71,4 +72,47 @@ class UserSalary extends Backend | @@ -71,4 +72,47 @@ class UserSalary extends Backend | ||
71 | return $this->view->fetch(); | 72 | return $this->view->fetch(); |
72 | } | 73 | } |
73 | 74 | ||
75 | + /** | ||
76 | + * 审核 | ||
77 | + */ | ||
78 | + public function examine($ids = null) | ||
79 | + { | ||
80 | + if($ids) { | ||
81 | + $row = $this->model->get($ids); | ||
82 | + if (!$row) { | ||
83 | + $this->error(__('No Results were found')); | ||
84 | + } | ||
85 | + $adminIds = $this->getDataLimitAdminIds(); | ||
86 | + if (is_array($adminIds)) { | ||
87 | + if (!in_array($row[$this->dataLimitField], $adminIds)) { | ||
88 | + $this->error(__('You have no permission')); | ||
89 | + } | ||
90 | + } | ||
91 | + $params = $this->request->param(); | ||
92 | + if($params['status'] == '2' && $row['status'] == '1'){ | ||
93 | + $this->error('该申请已通过审核,无法驳回'); | ||
94 | + } | ||
95 | + $row->status = $params['status']; | ||
96 | + $row->updatetime = time(); | ||
97 | + Db::startTrans(); | ||
98 | + try { | ||
99 | + $result = $row->save(); | ||
100 | + Db::commit(); | ||
101 | + } catch (ValidateException $e) { | ||
102 | + Db::rollback(); | ||
103 | + $this->error($e->getMessage()); | ||
104 | + } catch (PDOException $e) { | ||
105 | + Db::rollback(); | ||
106 | + $this->error($e->getMessage()); | ||
107 | + } catch (\think\Exception $e) { | ||
108 | + Db::rollback(); | ||
109 | + $this->error($e->getMessage()); | ||
110 | + } | ||
111 | + if(!$result) { | ||
112 | + $this->error('审核失败'); | ||
113 | + } | ||
114 | + $this->success('审核成功'); | ||
115 | + } | ||
116 | + } | ||
117 | + | ||
74 | } | 118 | } |
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | <div id="toolbar" class="toolbar"> | 18 | <div id="toolbar" class="toolbar"> |
19 | <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> | 19 | <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> |
20 | <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user_salary/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>--> | 20 | <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user_salary/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>--> |
21 | - <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user_salary/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a> | 21 | +<!-- <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user_salary/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>--> |
22 | <!-- <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user_salary/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>--> | 22 | <!-- <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user_salary/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>--> |
23 | <!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user_salary/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>--> | 23 | <!-- <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user_salary/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>--> |
24 | 24 | ||
@@ -33,8 +33,6 @@ | @@ -33,8 +33,6 @@ | ||
33 | 33 | ||
34 | </div> | 34 | </div> |
35 | <table id="table" class="table table-striped table-bordered table-hover table-nowrap" | 35 | <table id="table" class="table table-striped table-bordered table-hover table-nowrap" |
36 | - data-operate-edit="{:$auth->check('user_salary/edit')}" | ||
37 | - data-operate-del="{:$auth->check('user_salary/del')}" | ||
38 | width="100%"> | 36 | width="100%"> |
39 | </table> | 37 | </table> |
40 | </div> | 38 | </div> |
@@ -37,7 +37,32 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | @@ -37,7 +37,32 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | ||
37 | {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status}, | 37 | {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status}, |
38 | {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, | 38 | {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, |
39 | {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, | 39 | {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, |
40 | - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} | 40 | + { |
41 | + field: 'operate', | ||
42 | + title: __('Operate'), | ||
43 | + table: table, | ||
44 | + events: Table.api.events.operate, | ||
45 | + buttons: [ | ||
46 | + { | ||
47 | + name: 'examine', | ||
48 | + text: '通过', | ||
49 | + title: '通过', | ||
50 | + classname: 'btn btn-xs btn-success btn-ajax', | ||
51 | + icon: '', | ||
52 | + url: 'user_salary/examine?id={id}&status=1', | ||
53 | + confirm: '是否确认通过?', | ||
54 | + visible:function (row) { | ||
55 | + if(row.status == '0'){ | ||
56 | + return true; | ||
57 | + } | ||
58 | + }, | ||
59 | + success: function (data) { | ||
60 | + table.bootstrapTable('refresh'); | ||
61 | + } | ||
62 | + }, | ||
63 | + ], | ||
64 | + formatter: Table.api.formatter.operate | ||
65 | + } | ||
41 | ] | 66 | ] |
42 | ] | 67 | ] |
43 | }); | 68 | }); |
-
请 注册 或 登录 后发表评论