From b740f4ad8fdf72111e0bc79bfa5cf8cdaaf1c6be Mon Sep 17 00:00:00 2001 From: zhuyu Date: Thu, 6 Mar 2025 16:37:44 +0800 Subject: [PATCH 01/21] feature: task --- application/admin/controller/Task.php | 37 ++++++++++++++++++ application/admin/lang/zh-cn/task.php | 12 ++++++ application/admin/model/Task.php | 49 +++++++++++++++++++++++ application/admin/validate/Task.php | 27 +++++++++++++ application/admin/view/task/add.html | 39 +++++++++++++++++++ application/admin/view/task/edit.html | 39 +++++++++++++++++++ application/admin/view/task/index.html | 46 ++++++++++++++++++++++ public/assets/js/backend/task.js | 54 ++++++++++++++++++++++++++ 8 files changed, 303 insertions(+) create mode 100644 application/admin/controller/Task.php create mode 100644 application/admin/lang/zh-cn/task.php create mode 100644 application/admin/model/Task.php create mode 100644 application/admin/validate/Task.php create mode 100644 application/admin/view/task/add.html create mode 100644 application/admin/view/task/edit.html create mode 100644 application/admin/view/task/index.html create mode 100644 public/assets/js/backend/task.js diff --git a/application/admin/controller/Task.php b/application/admin/controller/Task.php new file mode 100644 index 0000000..951601f --- /dev/null +++ b/application/admin/controller/Task.php @@ -0,0 +1,37 @@ +model = new \app\admin\model\Task; + $this->view->assign("statusList", $this->model->getStatusList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/lang/zh-cn/task.php b/application/admin/lang/zh-cn/task.php new file mode 100644 index 0000000..b108570 --- /dev/null +++ b/application/admin/lang/zh-cn/task.php @@ -0,0 +1,12 @@ + 'ID', + 'Status' => '状态', + 'Status 1' => '未完成', + 'Set status to 1'=> '设为未完成', + 'Status 2' => '已完成', + 'Set status to 2'=> '设为已完成', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' +]; diff --git a/application/admin/model/Task.php b/application/admin/model/Task.php new file mode 100644 index 0000000..ec49dd9 --- /dev/null +++ b/application/admin/model/Task.php @@ -0,0 +1,49 @@ + __('Status 1'), '2' => __('Status 2')]; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ?: ($data['status'] ?? ''); + $list = $this->getStatusList(); + return $list[$value] ?? ''; + } + + + + +} diff --git a/application/admin/validate/Task.php b/application/admin/validate/Task.php new file mode 100644 index 0000000..05f2c4c --- /dev/null +++ b/application/admin/validate/Task.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/task/add.html b/application/admin/view/task/add.html new file mode 100644 index 0000000..93a9487 --- /dev/null +++ b/application/admin/view/task/add.html @@ -0,0 +1,39 @@ +
+ +
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/task/edit.html b/application/admin/view/task/edit.html new file mode 100644 index 0000000..9da9b12 --- /dev/null +++ b/application/admin/view/task/edit.html @@ -0,0 +1,39 @@ +
+ +
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/task/index.html b/application/admin/view/task/index.html new file mode 100644 index 0000000..49a3519 --- /dev/null +++ b/application/admin/view/task/index.html @@ -0,0 +1,46 @@ +
+ +
+ {:build_heading(null,FALSE)} + +
+ + +
+
+
+
+
+ + {:__('Add')} + {:__('Edit')} + {:__('Delete')} + + +
+ {:__('More')} + +
+ + +
+ +
+
+
+ +
+
+
diff --git a/public/assets/js/backend/task.js b/public/assets/js/backend/task.js new file mode 100644 index 0000000..37d62fa --- /dev/null +++ b/public/assets/js/backend/task.js @@ -0,0 +1,54 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'task/index' + location.search, + add_url: 'task/add', + edit_url: 'task/edit', + del_url: 'task/del', + multi_url: 'task/multi', + import_url: 'task/import', + table: 'task', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status}, + {field: 'name', title: __('Name'), operate: 'LIKE'}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); From bf23a696264e184732ac272d93271b0700b29f72 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Mon, 10 Mar 2025 22:04:09 +0800 Subject: [PATCH 02/21] feature: task --- application/admin/controller/Task.php | 47 ++++++++++++++++++++++++ application/admin/lang/zh-cn/task.php | 31 +++++++++++----- application/admin/model/Task.php | 30 +++++++++++++++- application/admin/view/task/add.html | 32 ++++++++++------- application/admin/view/task/edit.html | 52 +++++++++++++++++++++++++-- public/assets/js/backend/task.js | 11 +++++- 6 files changed, 178 insertions(+), 25 deletions(-) diff --git a/application/admin/controller/Task.php b/application/admin/controller/Task.php index 951601f..87074da 100644 --- a/application/admin/controller/Task.php +++ b/application/admin/controller/Task.php @@ -3,6 +3,9 @@ namespace app\admin\controller; use app\common\controller\Backend; +use think\Db; +use think\exception\PDOException; +use think\exception\ValidateException; /** * 任务 @@ -22,7 +25,9 @@ class Task extends Backend { parent::_initialize(); $this->model = new \app\admin\model\Task; + $this->view->assign("typeList", $this->model->getTypeList()); $this->view->assign("statusList", $this->model->getStatusList()); + $this->view->assign("reviewStatusList", $this->model->getReviewStatusList()); } @@ -33,5 +38,47 @@ class Task extends Backend * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 */ + public function add() + { + if (false === $this->request->isPost()) { + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; + $this->model->validateFailException()->validate($validate); + } + + $params['admin_id'] = $this->auth->id; + $params['status'] = 1; + $params['review_status'] = 1; + $params['create_time'] = date('Y-m-d H:i:s'); + $params['update_time'] = date('Y-m-d H:i:s'); + + $result = $this->model->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } } diff --git a/application/admin/lang/zh-cn/task.php b/application/admin/lang/zh-cn/task.php index b108570..a629a6a 100644 --- a/application/admin/lang/zh-cn/task.php +++ b/application/admin/lang/zh-cn/task.php @@ -1,12 +1,27 @@ 'ID', - 'Status' => '状态', - 'Status 1' => '未完成', - 'Set status to 1'=> '设为未完成', - 'Status 2' => '已完成', - 'Set status to 2'=> '设为已完成', - 'Create_time' => '创建时间', - 'Update_time' => '编辑时间' + 'Id' => 'ID', + 'Admin_id' => '提交人ID', + 'Reviewer_id' => '审核人ID', + 'Type' => '任务类型', + 'Type 1' => '每日任务', + 'Type 2' => '每周任务', + 'Type 3' => '每月任务', + 'Title' => '任务标题', + 'Desc' => '任务描述', + 'Status' => '状态', + 'Status 1' => '待完成', + 'Set status to 1' => '设为待完成', + 'Status 2' => '已完成', + 'Set status to 2' => '设为已完成', + 'Review_status' => '状态', + 'Review_status 1' => '待审核', + 'Review_status 2' => '已通过', + 'Review_status 3' => '已驳回', + 'Review_status 4' => '未执行', + 'Expire_start_time' => '有效期开始时间', + 'Expire_end_time' => '有效期结束时间', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' ]; diff --git a/application/admin/model/Task.php b/application/admin/model/Task.php index ec49dd9..40177df 100644 --- a/application/admin/model/Task.php +++ b/application/admin/model/Task.php @@ -25,16 +25,36 @@ class Task extends Model // 追加属性 protected $append = [ - 'status_text' + 'type_text', + 'status_text', + 'review_status_text' ]; + public function getTypeList() + { + return ['1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; + } + public function getStatusList() { return ['1' => __('Status 1'), '2' => __('Status 2')]; } + public function getReviewStatusList() + { + return ['1' => __('Review_status 1'), '2' => __('Review_status 2'), '3' => __('Review_status 3'), '4' => __('Review_status 4')]; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ?: ($data['type'] ?? ''); + $list = $this->getTypeList(); + return $list[$value] ?? ''; + } + public function getStatusTextAttr($value, $data) { @@ -44,6 +64,14 @@ class Task extends Model } + public function getReviewStatusTextAttr($value, $data) + { + $value = $value ?: ($data['review_status'] ?? ''); + $list = $this->getReviewStatusList(); + return $list[$value] ?? ''; + } + + } diff --git a/application/admin/view/task/add.html b/application/admin/view/task/add.html index 93a9487..ec8f8c3 100644 --- a/application/admin/view/task/add.html +++ b/application/admin/view/task/add.html @@ -1,33 +1,39 @@
- +
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
+ +
- +
- +
- +
- +
- +
- + +
+
+
+ +
+
diff --git a/application/admin/view/task/edit.html b/application/admin/view/task/edit.html index 9da9b12..9de098e 100644 --- a/application/admin/view/task/edit.html +++ b/application/admin/view/task/edit.html @@ -1,5 +1,35 @@ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -13,9 +43,27 @@
- +
- + +
+ {foreach name="reviewStatusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+
diff --git a/public/assets/js/backend/task.js b/public/assets/js/backend/task.js index 37d62fa..c331cb0 100644 --- a/public/assets/js/backend/task.js +++ b/public/assets/js/backend/task.js @@ -22,12 +22,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin url: $.fn.bootstrapTable.defaults.extend.index_url, pk: 'id', sortName: 'id', + fixedColumns: true, + fixedRightNumber: 1, columns: [ [ {checkbox: true}, {field: 'id', title: __('Id')}, + {field: 'admin_id', title: __('Admin_id')}, + {field: 'reviewer_id', title: __('Reviewer_id')}, + {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, + {field: 'title', title: __('Title'), operate: 'LIKE'}, + {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status}, - {field: 'name', title: __('Name'), operate: 'LIKE'}, + {field: 'review_status', title: __('Review_status'), searchList: {"1":__('Review_status 1'),"2":__('Review_status 2'),"3":__('Review_status 3'),"4":__('Review_status 4')}, formatter: Table.api.formatter.status}, + {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} From f3ee736f1c5409f1226dce13425ca921a2cb88ad Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 21 Mar 2025 17:55:41 +0800 Subject: [PATCH 03/21] feature: task --- application/admin/controller/Task.php | 84 ------------------------- application/admin/lang/zh-cn/task.php | 27 -------- application/admin/model/Task.php | 77 ----------------------- application/admin/validate/Task.php | 27 -------- application/admin/view/task/add.html | 45 ------------- application/admin/view/task/edit.html | 87 -------------------------- application/admin/view/task/index.html | 46 -------------- public/assets/js/backend/task.js | 63 ------------------- 8 files changed, 456 deletions(-) delete mode 100644 application/admin/controller/Task.php delete mode 100644 application/admin/lang/zh-cn/task.php delete mode 100644 application/admin/model/Task.php delete mode 100644 application/admin/validate/Task.php delete mode 100644 application/admin/view/task/add.html delete mode 100644 application/admin/view/task/edit.html delete mode 100644 application/admin/view/task/index.html delete mode 100644 public/assets/js/backend/task.js diff --git a/application/admin/controller/Task.php b/application/admin/controller/Task.php deleted file mode 100644 index 87074da..0000000 --- a/application/admin/controller/Task.php +++ /dev/null @@ -1,84 +0,0 @@ -model = new \app\admin\model\Task; - $this->view->assign("typeList", $this->model->getTypeList()); - $this->view->assign("statusList", $this->model->getStatusList()); - $this->view->assign("reviewStatusList", $this->model->getReviewStatusList()); - } - - - - /** - * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 - * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 - * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 - */ - - public function add() - { - if (false === $this->request->isPost()) { - return $this->view->fetch(); - } - $params = $this->request->post('row/a'); - if (empty($params)) { - $this->error(__('Parameter %s can not be empty', '')); - } - $params = $this->preExcludeFields($params); - - if ($this->dataLimit && $this->dataLimitFieldAutoFill) { - $params[$this->dataLimitField] = $this->auth->id; - } - - $result = false; - Db::startTrans(); - try { - //是否采用模型验证 - if ($this->modelValidate) { - $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); - $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; - $this->model->validateFailException()->validate($validate); - } - - $params['admin_id'] = $this->auth->id; - $params['status'] = 1; - $params['review_status'] = 1; - $params['create_time'] = date('Y-m-d H:i:s'); - $params['update_time'] = date('Y-m-d H:i:s'); - - $result = $this->model->allowField(true)->save($params); - Db::commit(); - } catch (ValidateException|PDOException|Exception $e) { - Db::rollback(); - $this->error($e->getMessage()); - } - if ($result === false) { - $this->error(__('No rows were inserted')); - } - $this->success(); - } - -} diff --git a/application/admin/lang/zh-cn/task.php b/application/admin/lang/zh-cn/task.php deleted file mode 100644 index a629a6a..0000000 --- a/application/admin/lang/zh-cn/task.php +++ /dev/null @@ -1,27 +0,0 @@ - 'ID', - 'Admin_id' => '提交人ID', - 'Reviewer_id' => '审核人ID', - 'Type' => '任务类型', - 'Type 1' => '每日任务', - 'Type 2' => '每周任务', - 'Type 3' => '每月任务', - 'Title' => '任务标题', - 'Desc' => '任务描述', - 'Status' => '状态', - 'Status 1' => '待完成', - 'Set status to 1' => '设为待完成', - 'Status 2' => '已完成', - 'Set status to 2' => '设为已完成', - 'Review_status' => '状态', - 'Review_status 1' => '待审核', - 'Review_status 2' => '已通过', - 'Review_status 3' => '已驳回', - 'Review_status 4' => '未执行', - 'Expire_start_time' => '有效期开始时间', - 'Expire_end_time' => '有效期结束时间', - 'Create_time' => '创建时间', - 'Update_time' => '编辑时间' -]; diff --git a/application/admin/model/Task.php b/application/admin/model/Task.php deleted file mode 100644 index 40177df..0000000 --- a/application/admin/model/Task.php +++ /dev/null @@ -1,77 +0,0 @@ - __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; - } - - public function getStatusList() - { - return ['1' => __('Status 1'), '2' => __('Status 2')]; - } - - public function getReviewStatusList() - { - return ['1' => __('Review_status 1'), '2' => __('Review_status 2'), '3' => __('Review_status 3'), '4' => __('Review_status 4')]; - } - - - public function getTypeTextAttr($value, $data) - { - $value = $value ?: ($data['type'] ?? ''); - $list = $this->getTypeList(); - return $list[$value] ?? ''; - } - - - public function getStatusTextAttr($value, $data) - { - $value = $value ?: ($data['status'] ?? ''); - $list = $this->getStatusList(); - return $list[$value] ?? ''; - } - - - public function getReviewStatusTextAttr($value, $data) - { - $value = $value ?: ($data['review_status'] ?? ''); - $list = $this->getReviewStatusList(); - return $list[$value] ?? ''; - } - - - - -} diff --git a/application/admin/validate/Task.php b/application/admin/validate/Task.php deleted file mode 100644 index 05f2c4c..0000000 --- a/application/admin/validate/Task.php +++ /dev/null @@ -1,27 +0,0 @@ - [], - 'edit' => [], - ]; - -} diff --git a/application/admin/view/task/add.html b/application/admin/view/task/add.html deleted file mode 100644 index ec8f8c3..0000000 --- a/application/admin/view/task/add.html +++ /dev/null @@ -1,45 +0,0 @@ - - -
- -
- - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- diff --git a/application/admin/view/task/edit.html b/application/admin/view/task/edit.html deleted file mode 100644 index 9de098e..0000000 --- a/application/admin/view/task/edit.html +++ /dev/null @@ -1,87 +0,0 @@ -
- -
- -
- -
-
-
- -
- - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
- -
-
-
- -
- -
- {foreach name="reviewStatusList" item="vo"} - - {/foreach} -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
diff --git a/application/admin/view/task/index.html b/application/admin/view/task/index.html deleted file mode 100644 index 49a3519..0000000 --- a/application/admin/view/task/index.html +++ /dev/null @@ -1,46 +0,0 @@ -
- -
- {:build_heading(null,FALSE)} - -
- - -
-
-
-
-
- - {:__('Add')} - {:__('Edit')} - {:__('Delete')} - - -
- {:__('More')} - -
- - -
- -
-
-
- -
-
-
diff --git a/public/assets/js/backend/task.js b/public/assets/js/backend/task.js deleted file mode 100644 index c331cb0..0000000 --- a/public/assets/js/backend/task.js +++ /dev/null @@ -1,63 +0,0 @@ -define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { - - var Controller = { - index: function () { - // 初始化表格参数配置 - Table.api.init({ - extend: { - index_url: 'task/index' + location.search, - add_url: 'task/add', - edit_url: 'task/edit', - del_url: 'task/del', - multi_url: 'task/multi', - import_url: 'task/import', - table: 'task', - } - }); - - var table = $("#table"); - - // 初始化表格 - table.bootstrapTable({ - url: $.fn.bootstrapTable.defaults.extend.index_url, - pk: 'id', - sortName: 'id', - fixedColumns: true, - fixedRightNumber: 1, - columns: [ - [ - {checkbox: true}, - {field: 'id', title: __('Id')}, - {field: 'admin_id', title: __('Admin_id')}, - {field: 'reviewer_id', title: __('Reviewer_id')}, - {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, - {field: 'title', title: __('Title'), operate: 'LIKE'}, - {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status}, - {field: 'review_status', title: __('Review_status'), searchList: {"1":__('Review_status 1'),"2":__('Review_status 2'),"3":__('Review_status 3'),"4":__('Review_status 4')}, formatter: Table.api.formatter.status}, - {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} - ] - ] - }); - - // 为表格绑定事件 - Table.api.bindevent(table); - }, - add: function () { - Controller.api.bindevent(); - }, - edit: function () { - Controller.api.bindevent(); - }, - api: { - bindevent: function () { - Form.api.bindevent($("form[role=form]")); - } - } - }; - return Controller; -}); From f8b0af60573f1bf40d019a2d5b09b9663de2fe2e Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 21 Mar 2025 17:56:26 +0800 Subject: [PATCH 04/21] feature: task --- application/admin/controller/Task.php | 38 +++++++++++ application/admin/lang/zh-cn/task.php | 32 ++++++++++ application/admin/model/Task.php | 63 +++++++++++++++++++ application/admin/validate/Task.php | 27 ++++++++ application/admin/view/task/add.html | 87 ++++++++++++++++++++++++++ application/admin/view/task/edit.html | 87 ++++++++++++++++++++++++++ application/admin/view/task/index.html | 46 ++++++++++++++ public/assets/js/backend/task.js | 64 +++++++++++++++++++ 8 files changed, 444 insertions(+) create mode 100644 application/admin/controller/Task.php create mode 100644 application/admin/lang/zh-cn/task.php create mode 100644 application/admin/model/Task.php create mode 100644 application/admin/validate/Task.php create mode 100644 application/admin/view/task/add.html create mode 100644 application/admin/view/task/edit.html create mode 100644 application/admin/view/task/index.html create mode 100644 public/assets/js/backend/task.js diff --git a/application/admin/controller/Task.php b/application/admin/controller/Task.php new file mode 100644 index 0000000..1bc8dc3 --- /dev/null +++ b/application/admin/controller/Task.php @@ -0,0 +1,38 @@ +model = new \app\admin\model\Task; + $this->view->assign("typeList", $this->model->getTypeList()); + $this->view->assign("statusList", $this->model->getStatusList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/lang/zh-cn/task.php b/application/admin/lang/zh-cn/task.php new file mode 100644 index 0000000..f30d68f --- /dev/null +++ b/application/admin/lang/zh-cn/task.php @@ -0,0 +1,32 @@ + 'ID', + 'Admin_id' => '创建人id', + 'Exec_admin_id' => '执行人id', + 'Type' => '任务类型', + 'Type 1' => '每日任务', + 'Type 2' => '每周任务', + 'Type 3' => '每月任务', + 'Title' => '任务标题', + 'Desc' => '任务描述', + 'Status' => '状态', + 'Status 1' => '待完成', + 'Set status to 1' => '设为待完成', + 'Status 2' => '已完成', + 'Set status to 2' => '设为已完成', + 'Status 3' => '待审核', + 'Set status to 3' => '设为待审核', + 'Status 4' => '已通过', + 'Set status to 4' => '设为已通过', + 'Status 5' => '已驳回', + 'Set status to 5' => '设为已驳回', + 'Status 6' => '未执行', + 'Set status to 6' => '设为未执行', + 'Refuse_reason' => '驳回原因', + 'Expire_start_time' => '有效期开始时间', + 'Expire_end_time' => '有效期结束时间', + 'Complete_time' => '完成时间', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' +]; diff --git a/application/admin/model/Task.php b/application/admin/model/Task.php new file mode 100644 index 0000000..aed4460 --- /dev/null +++ b/application/admin/model/Task.php @@ -0,0 +1,63 @@ + __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; + } + + public function getStatusList() + { + return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3'), '4' => __('Status 4'), '5' => __('Status 5'), '6' => __('Status 6')]; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ?: ($data['type'] ?? ''); + $list = $this->getTypeList(); + return $list[$value] ?? ''; + } + + + public function getStatusTextAttr($value, $data) + { + $value = $value ?: ($data['status'] ?? ''); + $list = $this->getStatusList(); + return $list[$value] ?? ''; + } + + + + +} diff --git a/application/admin/validate/Task.php b/application/admin/validate/Task.php new file mode 100644 index 0000000..05f2c4c --- /dev/null +++ b/application/admin/validate/Task.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/task/add.html b/application/admin/view/task/add.html new file mode 100644 index 0000000..235e8ee --- /dev/null +++ b/application/admin/view/task/add.html @@ -0,0 +1,87 @@ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/task/edit.html b/application/admin/view/task/edit.html new file mode 100644 index 0000000..e18bc31 --- /dev/null +++ b/application/admin/view/task/edit.html @@ -0,0 +1,87 @@ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/task/index.html b/application/admin/view/task/index.html new file mode 100644 index 0000000..49a3519 --- /dev/null +++ b/application/admin/view/task/index.html @@ -0,0 +1,46 @@ +
+ +
+ {:build_heading(null,FALSE)} + +
+ + +
+
+
+
+
+ + {:__('Add')} + {:__('Edit')} + {:__('Delete')} + + +
+ {:__('More')} + +
+ + +
+ +
+
+
+ +
+
+
diff --git a/public/assets/js/backend/task.js b/public/assets/js/backend/task.js new file mode 100644 index 0000000..dc72f7c --- /dev/null +++ b/public/assets/js/backend/task.js @@ -0,0 +1,64 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'task/index' + location.search, + add_url: 'task/add', + edit_url: 'task/edit', + del_url: 'task/del', + multi_url: 'task/multi', + import_url: 'task/import', + table: 'task', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + fixedColumns: true, + fixedRightNumber: 1, + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'admin_id', title: __('Admin_id')}, + {field: 'exec_admin_id', title: __('Exec_admin_id')}, + {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, + {field: 'title', title: __('Title'), operate: 'LIKE'}, + {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2'),"3":__('Status 3'),"4":__('Status 4'),"5":__('Status 5'),"6":__('Status 6')}, formatter: Table.api.formatter.status}, + {field: 'refuse_reason', title: __('Refuse_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); From 7837c6df0b5b0cf37961c329072d8f5491d0b105 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 21 Mar 2025 18:00:59 +0800 Subject: [PATCH 05/21] feature: task --- application/admin/view/task/add.html | 40 ++-------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/application/admin/view/task/add.html b/application/admin/view/task/add.html index 235e8ee..36e1c1a 100644 --- a/application/admin/view/task/add.html +++ b/application/admin/view/task/add.html @@ -30,52 +30,16 @@
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
- -
-
-
- -
- -
-
- +
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
From 30ecfd1f65720bcc65943e7bf63dc968e0f88c56 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sat, 22 Mar 2025 18:24:24 +0800 Subject: [PATCH 06/21] feature: task --- application/admin/controller/oa/Doc.php | 37 ++++++++ application/admin/controller/oa/Schedule.php | 37 ++++++++ .../admin/controller/{ => oa}/Task.php | 6 +- application/admin/lang/zh-cn/oa/doc.php | 15 ++++ application/admin/lang/zh-cn/oa/schedule.php | 14 +++ .../admin/lang/zh-cn/{ => oa}/task.php | 0 application/admin/model/oa/Doc.php | 49 +++++++++++ application/admin/model/oa/Schedule.php | 49 +++++++++++ application/admin/model/{ => oa}/Task.php | 2 +- application/admin/validate/oa/Doc.php | 27 ++++++ application/admin/validate/oa/Schedule.php | 27 ++++++ application/admin/validate/{ => oa}/Task.php | 2 +- .../admin/view/{task => oa/doc}/add.html | 20 ++--- application/admin/view/oa/doc/edit.html | 51 +++++++++++ application/admin/view/oa/doc/index.html | 29 +++++++ application/admin/view/oa/schedule/add.html | 45 ++++++++++ application/admin/view/oa/schedule/edit.html | 45 ++++++++++ application/admin/view/oa/schedule/index.html | 29 +++++++ application/admin/view/oa/task/add.html | 87 +++++++++++++++++++ .../admin/view/{ => oa}/task/edit.html | 0 .../admin/view/{ => oa}/task/index.html | 12 +-- public/assets/js/backend/oa/doc.js | 57 ++++++++++++ public/assets/js/backend/oa/schedule.js | 56 ++++++++++++ public/assets/js/backend/{ => oa}/task.js | 12 +-- 24 files changed, 681 insertions(+), 27 deletions(-) create mode 100644 application/admin/controller/oa/Doc.php create mode 100644 application/admin/controller/oa/Schedule.php rename application/admin/controller/{ => oa}/Task.php (86%) create mode 100644 application/admin/lang/zh-cn/oa/doc.php create mode 100644 application/admin/lang/zh-cn/oa/schedule.php rename application/admin/lang/zh-cn/{ => oa}/task.php (100%) create mode 100644 application/admin/model/oa/Doc.php create mode 100644 application/admin/model/oa/Schedule.php rename application/admin/model/{ => oa}/Task.php (97%) create mode 100644 application/admin/validate/oa/Doc.php create mode 100644 application/admin/validate/oa/Schedule.php rename application/admin/validate/{ => oa}/Task.php (90%) rename application/admin/view/{task => oa/doc}/add.html (65%) create mode 100644 application/admin/view/oa/doc/edit.html create mode 100644 application/admin/view/oa/doc/index.html create mode 100644 application/admin/view/oa/schedule/add.html create mode 100644 application/admin/view/oa/schedule/edit.html create mode 100644 application/admin/view/oa/schedule/index.html create mode 100644 application/admin/view/oa/task/add.html rename application/admin/view/{ => oa}/task/edit.html (100%) rename application/admin/view/{ => oa}/task/index.html (77%) create mode 100644 public/assets/js/backend/oa/doc.js create mode 100644 public/assets/js/backend/oa/schedule.js rename public/assets/js/backend/{ => oa}/task.js (91%) diff --git a/application/admin/controller/oa/Doc.php b/application/admin/controller/oa/Doc.php new file mode 100644 index 0000000..b14dac8 --- /dev/null +++ b/application/admin/controller/oa/Doc.php @@ -0,0 +1,37 @@ +model = new \app\admin\model\oa\Doc; + $this->view->assign("typeList", $this->model->getTypeList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php new file mode 100644 index 0000000..c510701 --- /dev/null +++ b/application/admin/controller/oa/Schedule.php @@ -0,0 +1,37 @@ +model = new \app\admin\model\oa\Schedule; + $this->view->assign("typeList", $this->model->getTypeList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/controller/Task.php b/application/admin/controller/oa/Task.php similarity index 86% rename from application/admin/controller/Task.php rename to application/admin/controller/oa/Task.php index 1bc8dc3..57808fc 100644 --- a/application/admin/controller/Task.php +++ b/application/admin/controller/oa/Task.php @@ -1,6 +1,6 @@ model = new \app\admin\model\Task; + $this->model = new \app\admin\model\oa\Task; $this->view->assign("typeList", $this->model->getTypeList()); $this->view->assign("statusList", $this->model->getStatusList()); } diff --git a/application/admin/lang/zh-cn/oa/doc.php b/application/admin/lang/zh-cn/oa/doc.php new file mode 100644 index 0000000..10b780a --- /dev/null +++ b/application/admin/lang/zh-cn/oa/doc.php @@ -0,0 +1,15 @@ + 'ID', + 'Admin_id' => '创建人ID', + 'Type' => '培训资料类型', + 'Type 1' => '视频', + 'Type 2' => '图片', + 'Type 3' => '文档', + 'Title' => '标题', + 'Desc' => '描述', + 'Path' => '文件地址', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' +]; diff --git a/application/admin/lang/zh-cn/oa/schedule.php b/application/admin/lang/zh-cn/oa/schedule.php new file mode 100644 index 0000000..f3b2b83 --- /dev/null +++ b/application/admin/lang/zh-cn/oa/schedule.php @@ -0,0 +1,14 @@ + 'ID', + 'Admin_id' => '创建人ID', + 'Exec_admin_id' => '执行人ID', + 'Type' => '任务类型', + 'Type 1' => '早班', + 'Type 2' => '中班', + 'Type 3' => '晚班', + 'Date' => '日期', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' +]; diff --git a/application/admin/lang/zh-cn/task.php b/application/admin/lang/zh-cn/oa/task.php similarity index 100% rename from application/admin/lang/zh-cn/task.php rename to application/admin/lang/zh-cn/oa/task.php diff --git a/application/admin/model/oa/Doc.php b/application/admin/model/oa/Doc.php new file mode 100644 index 0000000..9fe7775 --- /dev/null +++ b/application/admin/model/oa/Doc.php @@ -0,0 +1,49 @@ + __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ?: ($data['type'] ?? ''); + $list = $this->getTypeList(); + return $list[$value] ?? ''; + } + + + + +} diff --git a/application/admin/model/oa/Schedule.php b/application/admin/model/oa/Schedule.php new file mode 100644 index 0000000..9776bca --- /dev/null +++ b/application/admin/model/oa/Schedule.php @@ -0,0 +1,49 @@ + __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ?: ($data['type'] ?? ''); + $list = $this->getTypeList(); + return $list[$value] ?? ''; + } + + + + +} diff --git a/application/admin/model/Task.php b/application/admin/model/oa/Task.php similarity index 97% rename from application/admin/model/Task.php rename to application/admin/model/oa/Task.php index aed4460..12aa218 100644 --- a/application/admin/model/Task.php +++ b/application/admin/model/oa/Task.php @@ -1,6 +1,6 @@ [], + 'edit' => [], + ]; + +} diff --git a/application/admin/validate/oa/Schedule.php b/application/admin/validate/oa/Schedule.php new file mode 100644 index 0000000..89fb753 --- /dev/null +++ b/application/admin/validate/oa/Schedule.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/validate/Task.php b/application/admin/validate/oa/Task.php similarity index 90% rename from application/admin/validate/Task.php rename to application/admin/validate/oa/Task.php index 05f2c4c..db3d442 100644 --- a/application/admin/validate/Task.php +++ b/application/admin/validate/oa/Task.php @@ -1,6 +1,6 @@ -
- -
- -
-
@@ -31,15 +25,21 @@
- +
- +
- +
- + +
+
+
+ +
+
diff --git a/application/admin/view/oa/doc/edit.html b/application/admin/view/oa/doc/edit.html new file mode 100644 index 0000000..e753afc --- /dev/null +++ b/application/admin/view/oa/doc/edit.html @@ -0,0 +1,51 @@ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/oa/doc/index.html b/application/admin/view/oa/doc/index.html new file mode 100644 index 0000000..4fc3950 --- /dev/null +++ b/application/admin/view/oa/doc/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/application/admin/view/oa/schedule/add.html b/application/admin/view/oa/schedule/add.html new file mode 100644 index 0000000..16931b5 --- /dev/null +++ b/application/admin/view/oa/schedule/add.html @@ -0,0 +1,45 @@ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/oa/schedule/edit.html b/application/admin/view/oa/schedule/edit.html new file mode 100644 index 0000000..4a3dbf1 --- /dev/null +++ b/application/admin/view/oa/schedule/edit.html @@ -0,0 +1,45 @@ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/oa/schedule/index.html b/application/admin/view/oa/schedule/index.html new file mode 100644 index 0000000..7f38eef --- /dev/null +++ b/application/admin/view/oa/schedule/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/application/admin/view/oa/task/add.html b/application/admin/view/oa/task/add.html new file mode 100644 index 0000000..235e8ee --- /dev/null +++ b/application/admin/view/oa/task/add.html @@ -0,0 +1,87 @@ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/task/edit.html b/application/admin/view/oa/task/edit.html similarity index 100% rename from application/admin/view/task/edit.html rename to application/admin/view/oa/task/edit.html diff --git a/application/admin/view/task/index.html b/application/admin/view/oa/task/index.html similarity index 77% rename from application/admin/view/task/index.html rename to application/admin/view/oa/task/index.html index 49a3519..2198a2d 100644 --- a/application/admin/view/task/index.html +++ b/application/admin/view/oa/task/index.html @@ -17,12 +17,12 @@
- {:__('Add')} - {:__('Edit')} - {:__('Delete')} + {:__('Add')} + {:__('Edit')} + {:__('Delete')} -
+
{:__('More')}
diff --git a/public/assets/js/backend/oa/doc.js b/public/assets/js/backend/oa/doc.js new file mode 100644 index 0000000..6ab8913 --- /dev/null +++ b/public/assets/js/backend/oa/doc.js @@ -0,0 +1,57 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'oa/doc/index' + location.search, + add_url: 'oa/doc/add', + edit_url: 'oa/doc/edit', + del_url: 'oa/doc/del', + multi_url: 'oa/doc/multi', + import_url: 'oa/doc/import', + table: 'doc', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'admin_id', title: __('Admin_id')}, + {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, + {field: 'title', title: __('Title'), operate: 'LIKE'}, + {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'path', title: __('Path'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js new file mode 100644 index 0000000..c8f239f --- /dev/null +++ b/public/assets/js/backend/oa/schedule.js @@ -0,0 +1,56 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'oa/schedule/index' + location.search, + add_url: 'oa/schedule/add', + edit_url: 'oa/schedule/edit', + del_url: 'oa/schedule/del', + multi_url: 'oa/schedule/multi', + import_url: 'oa/schedule/import', + table: 'schedule', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'admin_id', title: __('Admin_id')}, + {field: 'exec_admin_id', title: __('Exec_admin_id')}, + {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, + {field: 'date', title: __('Date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); diff --git a/public/assets/js/backend/task.js b/public/assets/js/backend/oa/task.js similarity index 91% rename from public/assets/js/backend/task.js rename to public/assets/js/backend/oa/task.js index dc72f7c..ddda30e 100644 --- a/public/assets/js/backend/task.js +++ b/public/assets/js/backend/oa/task.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'task/index' + location.search, - add_url: 'task/add', - edit_url: 'task/edit', - del_url: 'task/del', - multi_url: 'task/multi', - import_url: 'task/import', + index_url: 'oa/task/index' + location.search, + add_url: 'oa/task/add', + edit_url: 'oa/task/edit', + del_url: 'oa/task/del', + multi_url: 'oa/task/multi', + import_url: 'oa/task/import', table: 'task', } }); From a051e4136fbbd75c91788faca331ac7c51efe277 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sat, 22 Mar 2025 18:47:00 +0800 Subject: [PATCH 07/21] feature: task --- application/admin/controller/oa/Schedule.php | 34 ++++++++++ application/admin/controller/oa/Task.php | 34 ++++++++++ application/admin/lang/zh-cn/oa/schedule.php | 35 +++++++--- application/admin/lang/zh-cn/oa/task.php | 71 ++++++++++++-------- application/admin/model/oa/Schedule.php | 4 ++ application/admin/model/oa/Task.php | 4 ++ application/admin/view/oa/schedule/add.html | 2 +- application/admin/view/oa/schedule/edit.html | 2 +- application/admin/view/oa/task/add.html | 2 +- application/admin/view/oa/task/edit.html | 2 +- public/assets/js/backend/oa/schedule.js | 15 +++++ public/assets/js/backend/oa/task.js | 15 +++++ 12 files changed, 178 insertions(+), 42 deletions(-) diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index c510701..eaf62e1 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -34,4 +34,38 @@ class Schedule extends Backend */ + /** + * 查看 + */ + public function index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage，则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['admin']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + } diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 57808fc..7ed0e46 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -35,4 +35,38 @@ class Task extends Backend */ + /** + * 查看 + */ + public function index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage，则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['admin']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + } diff --git a/application/admin/lang/zh-cn/oa/schedule.php b/application/admin/lang/zh-cn/oa/schedule.php index f3b2b83..74d25ab 100644 --- a/application/admin/lang/zh-cn/oa/schedule.php +++ b/application/admin/lang/zh-cn/oa/schedule.php @@ -1,14 +1,29 @@ 'ID', - 'Admin_id' => '创建人ID', - 'Exec_admin_id' => '执行人ID', - 'Type' => '任务类型', - 'Type 1' => '早班', - 'Type 2' => '中班', - 'Type 3' => '晚班', - 'Date' => '日期', - 'Create_time' => '创建时间', - 'Update_time' => '编辑时间' + 'Id' => 'ID', + 'Admin_id' => '创建人ID', + 'Exec_admin_id' => '执行人ID', + 'Type' => '任务类型', + 'Type 1' => '早班', + 'Type 2' => '中班', + 'Type 3' => '晚班', + 'Date' => '日期', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间', + 'Admin.id' => 'ID', + 'Admin.username' => '用户名', + 'Admin.nickname' => '昵称', + 'Admin.password' => '密码', + 'Admin.salt' => '密码盐', + 'Admin.avatar' => '头像', + 'Admin.email' => '电子邮箱', + 'Admin.mobile' => '手机号码', + 'Admin.loginfailure' => '失败次数', + 'Admin.logintime' => '登录时间', + 'Admin.loginip' => '登录IP', + 'Admin.createtime' => '创建时间', + 'Admin.updatetime' => '更新时间', + 'Admin.token' => 'Session标识', + 'Admin.status' => '状态' ]; diff --git a/application/admin/lang/zh-cn/oa/task.php b/application/admin/lang/zh-cn/oa/task.php index f30d68f..08c8b86 100644 --- a/application/admin/lang/zh-cn/oa/task.php +++ b/application/admin/lang/zh-cn/oa/task.php @@ -1,32 +1,47 @@ 'ID', - 'Admin_id' => '创建人id', - 'Exec_admin_id' => '执行人id', - 'Type' => '任务类型', - 'Type 1' => '每日任务', - 'Type 2' => '每周任务', - 'Type 3' => '每月任务', - 'Title' => '任务标题', - 'Desc' => '任务描述', - 'Status' => '状态', - 'Status 1' => '待完成', - 'Set status to 1' => '设为待完成', - 'Status 2' => '已完成', - 'Set status to 2' => '设为已完成', - 'Status 3' => '待审核', - 'Set status to 3' => '设为待审核', - 'Status 4' => '已通过', - 'Set status to 4' => '设为已通过', - 'Status 5' => '已驳回', - 'Set status to 5' => '设为已驳回', - 'Status 6' => '未执行', - 'Set status to 6' => '设为未执行', - 'Refuse_reason' => '驳回原因', - 'Expire_start_time' => '有效期开始时间', - 'Expire_end_time' => '有效期结束时间', - 'Complete_time' => '完成时间', - 'Create_time' => '创建时间', - 'Update_time' => '编辑时间' + 'Id' => 'ID', + 'Admin_id' => '创建人id', + 'Exec_admin_id' => '执行人id', + 'Type' => '任务类型', + 'Type 1' => '每日任务', + 'Type 2' => '每周任务', + 'Type 3' => '每月任务', + 'Title' => '任务标题', + 'Desc' => '任务描述', + 'Status' => '状态', + 'Status 1' => '待完成', + 'Set status to 1' => '设为待完成', + 'Status 2' => '已完成', + 'Set status to 2' => '设为已完成', + 'Status 3' => '待审核', + 'Set status to 3' => '设为待审核', + 'Status 4' => '已通过', + 'Set status to 4' => '设为已通过', + 'Status 5' => '已驳回', + 'Set status to 5' => '设为已驳回', + 'Status 6' => '未执行', + 'Set status to 6' => '设为未执行', + 'Refuse_reason' => '驳回原因', + 'Expire_start_time' => '有效期开始时间', + 'Expire_end_time' => '有效期结束时间', + 'Complete_time' => '完成时间', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间', + 'Admin.id' => 'ID', + 'Admin.username' => '用户名', + 'Admin.nickname' => '昵称', + 'Admin.password' => '密码', + 'Admin.salt' => '密码盐', + 'Admin.avatar' => '头像', + 'Admin.email' => '电子邮箱', + 'Admin.mobile' => '手机号码', + 'Admin.loginfailure' => '失败次数', + 'Admin.logintime' => '登录时间', + 'Admin.loginip' => '登录IP', + 'Admin.createtime' => '创建时间', + 'Admin.updatetime' => '更新时间', + 'Admin.token' => 'Session标识', + 'Admin.status' => '状态' ]; diff --git a/application/admin/model/oa/Schedule.php b/application/admin/model/oa/Schedule.php index 9776bca..e01e4fb 100644 --- a/application/admin/model/oa/Schedule.php +++ b/application/admin/model/oa/Schedule.php @@ -46,4 +46,8 @@ class Schedule extends Model + public function admin() + { + return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/application/admin/model/oa/Task.php b/application/admin/model/oa/Task.php index 12aa218..43fa03e 100644 --- a/application/admin/model/oa/Task.php +++ b/application/admin/model/oa/Task.php @@ -60,4 +60,8 @@ class Task extends Model + public function admin() + { + return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + } } diff --git a/application/admin/view/oa/schedule/add.html b/application/admin/view/oa/schedule/add.html index 16931b5..c3f9af5 100644 --- a/application/admin/view/oa/schedule/add.html +++ b/application/admin/view/oa/schedule/add.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/oa/schedule/edit.html b/application/admin/view/oa/schedule/edit.html index 4a3dbf1..60590d8 100644 --- a/application/admin/view/oa/schedule/edit.html +++ b/application/admin/view/oa/schedule/edit.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/oa/task/add.html b/application/admin/view/oa/task/add.html index 235e8ee..175f2ee 100644 --- a/application/admin/view/oa/task/add.html +++ b/application/admin/view/oa/task/add.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/oa/task/edit.html b/application/admin/view/oa/task/edit.html index e18bc31..241c86b 100644 --- a/application/admin/view/oa/task/edit.html +++ b/application/admin/view/oa/task/edit.html @@ -3,7 +3,7 @@
- +
diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index c8f239f..989db7b 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -32,6 +32,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'date', title: __('Date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'admin.id', title: __('Admin.id')}, + {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'}, + {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, + {field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'}, + {field: 'admin.salt', title: __('Admin.salt'), operate: 'LIKE'}, + {field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'}, + {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'}, + {field: 'admin.loginfailure', title: __('Admin.loginfailure')}, + {field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'}, + {field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'}, + {field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ] diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js index ddda30e..20e3918 100644 --- a/public/assets/js/backend/oa/task.js +++ b/public/assets/js/backend/oa/task.js @@ -40,6 +40,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'admin.id', title: __('Admin.id')}, + {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'}, + {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, + {field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'}, + {field: 'admin.salt', title: __('Admin.salt'), operate: 'LIKE'}, + {field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, + {field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'}, + {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'}, + {field: 'admin.loginfailure', title: __('Admin.loginfailure')}, + {field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'}, + {field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + {field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'}, + {field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ] From 4a00bf7b5fa1ad56d7ed56c35963d755a661e13f Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 23 Mar 2025 22:10:20 +0800 Subject: [PATCH 08/21] feature: task --- application/admin/controller/oa/Schedule.php | 48 +++++++++++++++++++ .../admin/view/oa/schedule/custom_index.html | 26 ++++++++++ 2 files changed, 74 insertions(+) create mode 100644 application/admin/view/oa/schedule/custom_index.html diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index eaf62e1..d603fe5 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -68,4 +68,52 @@ class Schedule extends Backend return $this->view->fetch(); } + public function custom_index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage，则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['admin']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + + + $startDate = '2025-02-22'; + $endDate = '2025-03-22'; + + $queryData = $this->model + ->with([ + 'admin' + ]) + ->where('date', '>=', $startDate) + ->where('date', '<=', $endDate) + ->select(); + + + dd($queryData); + + $this->assign('a', '1111'); + return $this->view->fetch(); + } + } diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html new file mode 100644 index 0000000..df06b8f --- /dev/null +++ b/application/admin/view/oa/schedule/custom_index.html @@ -0,0 +1,26 @@ +
+ {:build_heading()} + +
+
+
+
+ + + {:$a} +
+
+ +
+
+
From c5a37912c092cf8a5bfe8109c2e4d6e5c456b5e4 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Mon, 24 Mar 2025 11:44:35 +0800 Subject: [PATCH 09/21] feature: task --- application/admin/controller/oa/Schedule.php | 41 ++++++++++++++++++- .../admin/view/oa/schedule/custom_index.html | 18 +++++++- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index d603fe5..4b8b174 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -3,6 +3,7 @@ namespace app\admin\controller\oa; use app\common\controller\Backend; +use think\Db; /** * 排班 @@ -101,6 +102,29 @@ class Schedule extends Backend $startDate = '2025-02-22'; $endDate = '2025-03-22'; + $res = []; + $admins = Db::name('admin')->field('id,nickname')->select(); + $admins = array_column($admins, NULL, 'id'); + $adminIds = array_keys($admins); + + $adminNames = array_column($admins, 'nickname', 'id'); + + $tmpDate = $startDate; + $dates = []; + while(true) { + + if ($tmpDate > $endDate) { + break; + } + + foreach ($adminIds as $adminId) { + $res[$adminId][$tmpDate] = '无'; + } + + $dates[] = $tmpDate; + $tmpDate = date('Y-m-d', strtotime($tmpDate) + 86400); + } + $queryData = $this->model ->with([ 'admin' @@ -108,11 +132,24 @@ class Schedule extends Backend ->where('date', '>=', $startDate) ->where('date', '<=', $endDate) ->select(); + foreach ($queryData as $queryDatum) { + $queryDatum = $queryDatum->toArray(); + + $adminId = $queryDatum['admin']['id']; + $date = $queryDatum['date']; + $type = $queryDatum['type']; + + if (isset($res[$adminId][$date])) { + $res[$adminId][$date] = $this->model->getTypeList()[$type]; + } + } - dd($queryData); + $this->assign('adminNames', $adminNames); + $this->assign('res', $res); + $this->assign('dates', $dates); + $this->assign('types', $this->model->getTypeList()); - $this->assign('a', '1111'); return $this->view->fetch(); } diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html index df06b8f..112fe93 100644 --- a/application/admin/view/oa/schedule/custom_index.html +++ b/application/admin/view/oa/schedule/custom_index.html @@ -16,8 +16,22 @@
- - {:$a} + + + + {foreach $dates as $date} + + {/foreach} + + {foreach $res as $adminId => $item} + + + {foreach $item as $typeId} + + {/foreach} + + {/foreach} +
用户\日期{$date}
{$adminNames[$adminId]}{$typeId}
From 1c76cdf45e25620a7ec10ac9d6ff0902e3f5e9ae Mon Sep 17 00:00:00 2001 From: zhuyu Date: Mon, 24 Mar 2025 15:23:06 +0800 Subject: [PATCH 10/21] feature: task --- application/admin/view/oa/doc/add.html | 24 ++++++++++-------------- application/admin/view/oa/doc/edit.html | 22 +++++++++------------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/application/admin/view/oa/doc/add.html b/application/admin/view/oa/doc/add.html index c4c5505..4402289 100644 --- a/application/admin/view/oa/doc/add.html +++ b/application/admin/view/oa/doc/add.html @@ -25,21 +25,17 @@
- +
- -
-
-
- -
- -
-
-
- -
- +
+ +
+ + +
+ +
+
    diff --git a/application/admin/view/oa/doc/edit.html b/application/admin/view/oa/doc/edit.html index e753afc..09a9cbc 100644 --- a/application/admin/view/oa/doc/edit.html +++ b/application/admin/view/oa/doc/edit.html @@ -27,19 +27,15 @@
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - +
    + +
    + + +
    + +
    +
      From 50e27370dd7963fcaebd2210e29cdb57e9148109 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Mon, 24 Mar 2025 18:09:16 +0800 Subject: [PATCH 11/21] feature: task --- application/admin/controller/oa/Schedule.php | 115 ++++++++---------- .../admin/view/oa/schedule/custom_index.html | 25 +--- public/assets/js/backend/oa/schedule.js | 42 +++++++ 3 files changed, 93 insertions(+), 89 deletions(-) diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index 4b8b174..88aa57a 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -76,80 +76,63 @@ class Schedule extends Backend //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if ($this->request->isAjax()) { - //如果发送的来源是Selectpage，则转发到Selectpage - if ($this->request->request('keyField')) { - return $this->selectpage(); - } - list($where, $sort, $order, $offset, $limit) = $this->buildparams(); - - $list = $this->model - ->with(['admin']) - ->where($where) - ->order($sort, $order) - ->paginate($limit); - - foreach ($list as $row) { + $startDate = '2025-02-22'; + $endDate = '2025-03-22'; + + $res = []; + $admins = Db::name('admin')->field('id,nickname')->select(); + $admins = array_column($admins, NULL, 'id'); + $adminIds = array_keys($admins); + + $adminNames = array_column($admins, 'nickname', 'id'); + + $tmpDate = $startDate; + $dates = []; + while(true) { + + if ($tmpDate > $endDate) { + break; + } + + foreach ($adminIds as $adminId) { + $res[$adminId][$tmpDate] = '无'; + $res[$adminId]['name'] = $adminNames[$adminId]; + } + + $dates[] = $tmpDate; + $tmpDate = date('Y-m-d', strtotime($tmpDate) + 86400); } - $result = array("total" => $list->total(), "rows" => $list->items()); + $queryData = $this->model + ->with([ + 'admin' + ]) + ->where('date', '>=', $startDate) + ->where('date', '<=', $endDate) + ->select(); + foreach ($queryData as $queryDatum) { + $queryDatum = $queryDatum->toArray(); + + $adminId = $queryDatum['admin']['id']; + $date = $queryDatum['date']; + $type = $queryDatum['type']; + + if (isset($res[$adminId][$date])) { + $res[$adminId][$date] = $this->model->getTypeList()[$type]; + } + } + + + $res = array_values($res); + + + $result = array("total" => count($res), "rows" => $res); return json($result); } - - $startDate = '2025-02-22'; - $endDate = '2025-03-22'; - - $res = []; - $admins = Db::name('admin')->field('id,nickname')->select(); - $admins = array_column($admins, NULL, 'id'); - $adminIds = array_keys($admins); - - $adminNames = array_column($admins, 'nickname', 'id'); - - $tmpDate = $startDate; - $dates = []; - while(true) { - - if ($tmpDate > $endDate) { - break; - } - - foreach ($adminIds as $adminId) { - $res[$adminId][$tmpDate] = '无'; - } - - $dates[] = $tmpDate; - $tmpDate = date('Y-m-d', strtotime($tmpDate) + 86400); - } - - $queryData = $this->model - ->with([ - 'admin' - ]) - ->where('date', '>=', $startDate) - ->where('date', '<=', $endDate) - ->select(); - foreach ($queryData as $queryDatum) { - $queryDatum = $queryDatum->toArray(); - - $adminId = $queryDatum['admin']['id']; - $date = $queryDatum['date']; - $type = $queryDatum['type']; - - if (isset($res[$adminId][$date])) { - $res[$adminId][$date] = $this->model->getTypeList()[$type]; - } - } - - - $this->assign('adminNames', $adminNames); - $this->assign('res', $res); - $this->assign('dates', $dates); - $this->assign('types', $this->model->getTypeList()); - return $this->view->fetch(); } diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html index 112fe93..c2f2428 100644 --- a/application/admin/view/oa/schedule/custom_index.html +++ b/application/admin/view/oa/schedule/custom_index.html @@ -6,31 +6,10 @@
      - - - - {foreach $dates as $date} - - {/foreach} - - {foreach $res as $adminId => $item} - - - {foreach $item as $typeId} - - {/foreach} - - {/foreach} +
      用户\日期{$date}
      {$adminNames[$adminId]}{$typeId}
      diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index 989db7b..ac38a5b 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -55,6 +55,48 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 为表格绑定事件 Table.api.bindevent(table); }, + custom_index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'oa/schedule/custom_index' + location.search, + // add_url: 'oa/schedule/add', + // edit_url: 'oa/schedule/edit', + // del_url: 'oa/schedule/del', + // multi_url: 'oa/schedule/multi', + // import_url: 'oa/schedule/import', + table: 'schedule', + } + }); + + var table = $("#table"); + + var columnArr = []; + columnArr.push({ + "title":"username", + "field":"name", + }); + + const startDate = new Date("2025-02-22"); + const endDate = new Date("2025-03-22"); + + for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) { + let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date + columnArr.push({ + "title": tmpDate, + "field": tmpDate, + }); + } + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + columns: columnArr + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, add: function () { Controller.api.bindevent(); }, From 7b268b1b841f1ba0de06c8e48fc2edb617c41d77 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Tue, 25 Mar 2025 15:46:52 +0800 Subject: [PATCH 12/21] feature: task --- application/admin/controller/oa/Schedule.php | 5 +++ .../admin/view/oa/schedule/custom_index.html | 45 +++++++++++++++++++ public/assets/js/backend/oa/schedule.js | 4 +- 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index 88aa57a..453938f 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -133,6 +133,11 @@ class Schedule extends Backend return json($result); } + $timeType = [ + 1 => '本月排班', + 2 => '本周排班', + ]; + $this->view->assign("timetype", $timeType); return $this->view->fetch(); } diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html index c2f2428..32fd4fe 100644 --- a/application/admin/view/oa/schedule/custom_index.html +++ b/application/admin/view/oa/schedule/custom_index.html @@ -17,3 +17,48 @@
      + diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index ac38a5b..277e5b4 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -91,7 +91,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格 table.bootstrapTable({ url: $.fn.bootstrapTable.defaults.extend.index_url, - columns: columnArr + columns: columnArr, + searchFormVisible: true, + searchFormTemplate: 'customformtpl', }); // 为表格绑定事件 From e281b3c65fe1fbea7e36b2948a814d4116e1c5cd Mon Sep 17 00:00:00 2001 From: zhuyu Date: Tue, 25 Mar 2025 18:20:03 +0800 Subject: [PATCH 13/21] feature: task --- application/admin/controller/oa/Schedule.php | 6 ++++++ public/assets/js/backend/oa/schedule.js | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index 453938f..d594740 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -128,6 +128,12 @@ class Schedule extends Backend $res = array_values($res); + $filter = $this->request->param('filter'); + $filter = json_decode($filter, true); + if (isset($filter['timetype']) && $filter['timetype'] == 2) { + unset($res[2]); + } + $result = array("total" => count($res), "rows" => $res); return json($result); diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index 277e5b4..a54c578 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -98,6 +98,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 为表格绑定事件 Table.api.bindevent(table); + + // 指定搜索条件 + $(document).on("click", ".btn-block", function () { + var timetype = $("#c-flag").val(); + let options = $table.bootstrapTable('getOptions'); + + table.bootstrapTable('refreshOptions', { + columns: [{ + "title":"username", + "field":"name", + }], + searchFormTemplate: options.searchFormTemplate + }); + return false; + }); }, add: function () { Controller.api.bindevent(); From df0aae4a229e4a63675d671eae3496b89b9dfa84 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Wed, 26 Mar 2025 14:24:42 +0800 Subject: [PATCH 14/21] feature: task --- .../admin/view/oa/schedule/custom_index.html | 3 -- public/assets/js/backend/oa/schedule.js | 47 ++++++++++++++++--- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html index 32fd4fe..991f097 100644 --- a/application/admin/view/oa/schedule/custom_index.html +++ b/application/admin/view/oa/schedule/custom_index.html @@ -52,9 +52,6 @@
      -
      - -
      diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index a54c578..43fc936 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -99,18 +99,51 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 为表格绑定事件 Table.api.bindevent(table); - // 指定搜索条件 $(document).on("click", ".btn-block", function () { - var timetype = $("#c-flag").val(); - let options = $table.bootstrapTable('getOptions'); - table.bootstrapTable('refreshOptions', { - columns: [{ + let selectedValue = $('#c-flag').val(); + + let changeColumn = []; + if (selectedValue == 2) { + changeColumn = [{ "title":"username", "field":"name", - }], - searchFormTemplate: options.searchFormTemplate + }]; + } else { + changeColumn = [{ + "title":"username", + "field":"name", + }]; + const startDate = new Date("2025-02-22"); + const endDate = new Date("2025-03-22"); + + for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) { + let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date + changeColumn.push({ + "title": tmpDate, + "field": tmpDate, + }); + } + } + + var options = table.bootstrapTable('getOptions'); + var queryParams = options.queryParams; + options.queryParams = function (params) { + //这一行必须要存在,否则在点击下一页时会丢失搜索栏数据 + params = queryParams(params); + + var filter = params.filter ? JSON.parse(params.filter) : {}; + filter.timetype = selectedValue; + + params.filter = JSON.stringify(filter); + return params; + }; + + table.bootstrapTable('refreshOptions', { + columns: changeColumn, }); + + $('#c-flag').val(selectedValue).change(); return false; }); }, From a41e1e5408cc94066492728eeb87432991c90c96 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 28 Mar 2025 11:11:22 +0800 Subject: [PATCH 15/21] feature: task --- application/admin/controller/oa/Schedule.php | 19 ++++++------ public/assets/js/backend/oa/schedule.js | 32 +++++++++++--------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index d594740..b65b0ae 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -78,8 +78,16 @@ class Schedule extends Backend if ($this->request->isAjax()) { - $startDate = '2025-02-22'; - $endDate = '2025-03-22'; + $filter = $this->request->param('filter'); + $filter = json_decode($filter, true); + + $startDate = date('Y-m-01'); + $endDate = date('Y-m-t'); + + if (isset($filter['timetype']) && $filter['timetype'] == 2) { + $startDate = date('Y-m-d', strtotime('monday this week')); + $endDate = date('Y-m-d', strtotime('sunday this week')); + } $res = []; $admins = Db::name('admin')->field('id,nickname')->select(); @@ -127,13 +135,6 @@ class Schedule extends Backend $res = array_values($res); - - $filter = $this->request->param('filter'); - $filter = json_decode($filter, true); - if (isset($filter['timetype']) && $filter['timetype'] == 2) { - unset($res[2]); - } - $result = array("total" => count($res), "rows" => $res); return json($result); diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index 43fc936..0803dbd 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -71,18 +71,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin var table = $("#table"); - var columnArr = []; - columnArr.push({ + var defaultColumnArr = []; + defaultColumnArr.push({ "title":"username", "field":"name", }); - const startDate = new Date("2025-02-22"); - const endDate = new Date("2025-03-22"); + const startDate = new Date(new Date().setDate(1)); + const endDate = new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0); + + console.log('Start Date:', startDate); + console.log('End Date:', endDate); for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) { - let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date - columnArr.push({ + let tmpDate = d.toISOString().split('T')[0]; + console.log('Current Date:', tmpDate); + defaultColumnArr.push({ "title": tmpDate, "field": tmpDate, }); @@ -91,7 +95,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格 table.bootstrapTable({ url: $.fn.bootstrapTable.defaults.extend.index_url, - columns: columnArr, + columns: defaultColumnArr, searchFormVisible: true, searchFormTemplate: 'customformtpl', }); @@ -109,13 +113,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin "title":"username", "field":"name", }]; - } else { - changeColumn = [{ - "title":"username", - "field":"name", - }]; - const startDate = new Date("2025-02-22"); - const endDate = new Date("2025-03-22"); + + const today = new Date(); + const startDate = new Date(today.setDate(today.getDate() - today.getDay() + 1)); // 星期一 + const endDate = new Date(today.setDate(today.getDate() - today.getDay() + 7)); // 星期天 for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) { let tmpDate = d.toISOString().split('T')[0]; // 使用 d，而不是 date @@ -124,6 +125,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin "field": tmpDate, }); } + + } else { + changeColumn = defaultColumnArr; } var options = table.bootstrapTable('getOptions'); From 7e535c03b0072880789eaaf0f03b86cbf716f772 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 30 Mar 2025 17:59:00 +0800 Subject: [PATCH 16/21] feature: task --- application/admin/controller/oa/Task.php | 66 ++++++++++++++ application/admin/lang/zh-cn/oa/task.php | 7 +- application/admin/model/oa/Task.php | 2 +- application/admin/view/oa/task/add.html | 43 ---------- application/admin/view/oa/task/edit.html | 66 -------------- public/assets/js/backend/oa/schedule.js | 18 +--- public/assets/js/backend/oa/task.js | 105 +++++++++++++++++++---- 7 files changed, 158 insertions(+), 149 deletions(-) diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 7ed0e46..4465789 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -69,4 +69,70 @@ class Task extends Backend return $this->view->fetch(); } + public function complete($ids) + { + if (false === $this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + + if (empty($ids)) { + $this->error(__('Parameter %s can not be empty', 'id')); + } + + $task = $this->model->where('id', '=', $ids)->where('status', 1)->find(); + + if (!$task) { + $this->error('任务状态已变更，请刷新后操作'); + } + $task->save(['status' => 3]); + + $this->success(); + } + + public function pass($ids) + { + if (false === $this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + + if (empty($ids)) { + $this->error(__('Parameter %s can not be empty', 'id')); + } + + $task = $this->model->where('id', '=', $ids)->where('status', 3)->find(); + + if (!$task) { + $this->error('任务状态已变更，请刷新后操作'); + } + $task->save(['status' => 4]); + + $this->success(); + } + + public function abort($ids) + { + if (false === $this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + + if (empty($ids)) { + $this->error(__('Parameter %s can not be empty', 'id')); + } + + $reason = $this->request->post('remark'); + if (empty($reason)) { + $this->error('驳回原因不能为空'); + } + + $task = $this->model->where('id', '=', $ids)->where('status', 3)->find(); + + if (!$task) { + $this->error('任务状态已变更，请刷新后操作'); + } + $task->save(['status' => 5, 'refuse_reason' => $reason]); + + $this->success(); + } + + } diff --git a/application/admin/lang/zh-cn/oa/task.php b/application/admin/lang/zh-cn/oa/task.php index 08c8b86..ba93a5b 100644 --- a/application/admin/lang/zh-cn/oa/task.php +++ b/application/admin/lang/zh-cn/oa/task.php @@ -3,7 +3,7 @@ return [ 'Id' => 'ID', 'Admin_id' => '创建人id', - 'Exec_admin_id' => '执行人id', + 'Review_admin_id' => '审核人id', 'Type' => '任务类型', 'Type 1' => '每日任务', 'Type 2' => '每周任务', @@ -21,8 +21,8 @@ return [ 'Set status to 4' => '设为已通过', 'Status 5' => '已驳回', 'Set status to 5' => '设为已驳回', - 'Status 6' => '未执行', - 'Set status to 6' => '设为未执行', + 'Status 6' => '待执行', + 'Set status to 6' => '设为待执行', 'Refuse_reason' => '驳回原因', 'Expire_start_time' => '有效期开始时间', 'Expire_end_time' => '有效期结束时间', @@ -34,6 +34,7 @@ return [ 'Admin.nickname' => '昵称', 'Admin.password' => '密码', 'Admin.salt' => '密码盐', + 'Admin.area_ids' => '地区ID,英文逗号分隔', 'Admin.avatar' => '头像', 'Admin.email' => '电子邮箱', 'Admin.mobile' => '手机号码', diff --git a/application/admin/model/oa/Task.php b/application/admin/model/oa/Task.php index 43fa03e..c536521 100644 --- a/application/admin/model/oa/Task.php +++ b/application/admin/model/oa/Task.php @@ -62,6 +62,6 @@ class Task extends Model public function admin() { - return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(0); + return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0); } } diff --git a/application/admin/view/oa/task/add.html b/application/admin/view/oa/task/add.html index 175f2ee..3ddd5c7 100644 --- a/application/admin/view/oa/task/add.html +++ b/application/admin/view/oa/task/add.html @@ -1,11 +1,4 @@
      - -
      - -
      - -
      -
      @@ -30,24 +23,6 @@
      -
      - -
      - -
      - {foreach name="statusList" item="vo"} - - {/foreach} -
      - -
      -
      -
      - -
      - -
      -
      @@ -60,24 +35,6 @@
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      diff --git a/application/admin/view/oa/task/edit.html b/application/admin/view/oa/task/edit.html index 241c86b..005b076 100644 --- a/application/admin/view/oa/task/edit.html +++ b/application/admin/view/oa/task/edit.html @@ -1,23 +1,5 @@ -
      - -
      - -
      -
      -
      - -
      - - - -
      -
      @@ -30,54 +12,6 @@
      -
      - -
      - -
      - {foreach name="statusList" item="vo"} - - {/foreach} -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index 0803dbd..c4dc9df 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -26,27 +26,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'admin_id', title: __('Admin_id')}, - {field: 'exec_admin_id', title: __('Exec_admin_id')}, + {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, {field: 'date', title: __('Date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'admin.id', title: __('Admin.id')}, - {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'}, - {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, - {field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'}, - {field: 'admin.salt', title: __('Admin.salt'), operate: 'LIKE'}, - {field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'}, - {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'}, - {field: 'admin.loginfailure', title: __('Admin.loginfailure')}, - {field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'}, - {field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'}, - {field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ] diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js index 20e3918..09ce35b 100644 --- a/public/assets/js/backend/oa/task.js +++ b/public/assets/js/backend/oa/task.js @@ -28,8 +28,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'admin_id', title: __('Admin_id')}, - {field: 'exec_admin_id', title: __('Exec_admin_id')}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, {field: 'title', title: __('Title'), operate: 'LIKE'}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, @@ -38,24 +36,93 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'admin.id', title: __('Admin.id')}, {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'}, - {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, - {field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'}, - {field: 'admin.salt', title: __('Admin.salt'), operate: 'LIKE'}, - {field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, - {field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'}, - {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'}, - {field: 'admin.loginfailure', title: __('Admin.loginfailure')}, - {field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'}, - {field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'}, - {field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, + buttons:[ + { + name: 'complete', + text:"完成任务", + title:"完成任务", + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-success btn-magic btn-ajax', + icon: 'fa fa-magic', + url: 'oa/task/complete', + confirm: '确认发送', + refresh: true, + success: function (data, ret) { + return false; + }, + error: function (data, ret) { + Layer.alert(ret.msg); + return false; + }, + visible: function (row) { + //返回true时按钮显示,返回false隐藏 + if (row.status != 1) { + return false; + } + return true; + } + }, + { + name: 'pass', + text:"审核通过", + title:"审核通过", + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-success btn-magic btn-ajax', + icon: 'fa fa-magic', + url: 'oa/task/pass', + confirm: '确认发送', + refresh: true, + success: function (data, ret) { + return false; + }, + error: function (data, ret) { + Layer.alert(ret.msg); + return false; + }, + visible: function (row) { + //返回true时按钮显示,返回false隐藏 + if (row.status != 3) { + return false; + } + return true; + } + }, + { + name: 'abort', + text:"驳回", + title: '驳回', + classname: 'btn btn-xs btn-info btn-click', + icon: 'fa fa-magic', + click: function (e, row) { + Layer.prompt({ + title: "填写驳回原因", + success: function (layero) { + $("input", layero).prop("placeholder", "填写驳回原因"); + } + }, function (value) { + Fast.api.ajax({ + url: "oa/task/abort/ids/"+ row.id, + data: {remark: value}, + }, function (data, ret) { + Layer.closeAll(); + $(".btn-refresh").trigger("click"); + //return false; + }); + }); + return false; + }, + + visible:function(row){ + if (row.status != 3) { + return false; + } + return true; + }, + } + + ]} ] ] }); From a3629141d3ac1fc12f5eda82eca0eac963df55f0 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 6 Apr 2025 13:41:02 +0800 Subject: [PATCH 17/21] feature: task --- application/admin/controller/oa/Doc.php | 159 ++++++++++++++++++ application/admin/view/oa/doc/add.html | 7 + application/admin/view/oa/doc/edit.html | 7 + .../admin/view/oa/schedule/custom_index.html | 9 - public/assets/js/backend/oa/schedule.js | 4 +- 5 files changed, 175 insertions(+), 11 deletions(-) diff --git a/application/admin/controller/oa/Doc.php b/application/admin/controller/oa/Doc.php index b14dac8..fd08188 100644 --- a/application/admin/controller/oa/Doc.php +++ b/application/admin/controller/oa/Doc.php @@ -2,7 +2,12 @@ namespace app\admin\controller\oa; +use app\admin\model\AuthGroup; use app\common\controller\Backend; +use fast\Tree; +use think\Db; +use think\exception\PDOException; +use think\exception\ValidateException; /** * 资料 @@ -22,7 +27,36 @@ class Doc extends Backend { parent::_initialize(); $this->model = new \app\admin\model\oa\Doc; + + + $this->childrenAdminIds = $this->auth->getChildrenAdminIds($this->auth->isSuperAdmin()); + $this->childrenGroupIds = $this->auth->getChildrenGroupIds($this->auth->isSuperAdmin()); + + $groupList = collection(AuthGroup::where('id', 'in', $this->childrenGroupIds)->select())->toArray(); + + Tree::instance()->init($groupList); + $groupdata = []; + if ($this->auth->isSuperAdmin()) { + $result = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(0)); + foreach ($result as $k => $v) { + $groupdata[$v['id']] = $v['name']; + } + } else { + $result = []; + $groups = $this->auth->getGroups(); + foreach ($groups as $m => $n) { + $childlist = Tree::instance()->getTreeList(Tree::instance()->getTreeArray($n['id'])); + $temp = []; + foreach ($childlist as $k => $v) { + $temp[$v['id']] = $v['name']; + } + $result[__($n['name'])] = $temp; + } + $groupdata = $result; + } + $this->view->assign("typeList", $this->model->getTypeList()); + $this->view->assign('groupdata', $groupdata); } @@ -34,4 +68,129 @@ class Doc extends Backend */ + + + public function index() + { + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + //如果发送的来源是 Selectpage，则转发到 Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + + $this->childrenAdminIds = $this->auth->getChildrenAdminIds($this->auth->isSuperAdmin()); + $list = $this->model + ->where($where) + ->whereRaw('JSON_OVERLAPS(group_ids, ?)', [json_encode($this->childrenAdminIds)]) + ->order($sort, $order) + ->paginate($limit); + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } + + + /** + * 添加 + * + * @return string + * @throws \think\Exception + */ + public function add() + { + if (false === $this->request->isPost()) { + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; + $this->model->validateFailException()->validate($validate); + } + + $group = $this->request->post("group/a"); + $group = array_map(function ($item) { + return intval($item); + }, $group); + $params['group_ids'] = json_encode($group); + + $result = $this->model->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } + + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { + $this->error(__('You have no permission')); + } + if (false === $this->request->isPost()) { + + $this->view->assign("groupids", json_decode($row['group_ids'])); + $this->view->assign('row', $row); + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; + $row->validateFailException()->validate($validate); + } + + + $group = $this->request->post("group/a"); + $group = array_map(function ($item) { + return intval($item); + }, $group); + $params['group_ids'] = json_encode($group); + + $result = $row->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if (false === $result) { + $this->error(__('No rows were updated')); + } + $this->success(); + } + + } diff --git a/application/admin/view/oa/doc/add.html b/application/admin/view/oa/doc/add.html index 4402289..d412acf 100644 --- a/application/admin/view/oa/doc/add.html +++ b/application/admin/view/oa/doc/add.html @@ -1,5 +1,12 @@ +
      + +
      + {:build_select('group[]', $groupdata, null, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])} +
      +
      +
      diff --git a/application/admin/view/oa/doc/edit.html b/application/admin/view/oa/doc/edit.html index 09a9cbc..b7c0ce2 100644 --- a/application/admin/view/oa/doc/edit.html +++ b/application/admin/view/oa/doc/edit.html @@ -1,5 +1,12 @@ + +
      + +
      + {:build_select('group[]', $groupdata, $groupids, ['class'=>'form-control selectpicker', 'multiple'=>'', 'data-rule'=>'required'])} +
      +
      diff --git a/application/admin/view/oa/schedule/custom_index.html b/application/admin/view/oa/schedule/custom_index.html index 991f097..45b5ec5 100644 --- a/application/admin/view/oa/schedule/custom_index.html +++ b/application/admin/view/oa/schedule/custom_index.html @@ -36,15 +36,6 @@
      -
      -
      - - -
      - -
      -
      -
      diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index c4dc9df..86a4a76 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -57,7 +57,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin var defaultColumnArr = []; defaultColumnArr.push({ - "title":"username", + "title":"用户名", "field":"name", }); @@ -94,7 +94,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin let changeColumn = []; if (selectedValue == 2) { changeColumn = [{ - "title":"username", + "title":"用户名", "field":"name", }]; From 0bd41bfb0f5509b621194071eb5808103e58f3e0 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 6 Apr 2025 13:58:37 +0800 Subject: [PATCH 18/21] feature: task --- application/admin/controller/oa/Task.php | 38 ++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 4465789..55b8b20 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -51,15 +51,47 @@ class Task extends Backend } list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + $dateTime = date('Y-m-d'); + foreach ($where as $k => $item) { + if ($item[0] != 'task.status') { + continue; + } + + if (in_array($item[2], [1, 4])) { + $where[] = ['expire_end_time', '<=', $dateTime]; + } + + if ($item[2] == 2) { + $where[$k][2] = 4; + $where[] = ['expire_end_time', '>', $dateTime]; + } + + if ($item[2] == 6) { + $where[$k][2] = 1; + $where[] = ['expire_end_time', '>', $dateTime]; + } + + } + + $list = $this->model ->with(['admin']) ->where($where) ->order($sort, $order) ->paginate($limit); - foreach ($list as $row) { - - + foreach ($list as $k => $row) { + + if (strtotime($row['expire_end_time']) > time()) { + if ($row['status'] == 1) { + $list[$k]['status'] = 6; + } + + if ($row['status'] == 4) { + $row[$k]['status'] = 2; + } + } + } $result = array("total" => $list->total(), "rows" => $list->items()); From a89e298e88c7d101ef9fa02ddb46aafb516af5e5 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 6 Apr 2025 14:05:52 +0800 Subject: [PATCH 19/21] feature: task --- application/admin/controller/oa/Task.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 55b8b20..be8399a 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -59,16 +59,19 @@ class Task extends Backend if (in_array($item[2], [1, 4])) { $where[] = ['expire_end_time', '<=', $dateTime]; + continue; } if ($item[2] == 2) { $where[$k][2] = 4; $where[] = ['expire_end_time', '>', $dateTime]; + continue; } if ($item[2] == 6) { $where[$k][2] = 1; $where[] = ['expire_end_time', '>', $dateTime]; + continue; } } From fad7b7d4a3ff6f0ddcd3f58136f1b396d237a9bd Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 6 Apr 2025 14:10:46 +0800 Subject: [PATCH 20/21] feature: task --- application/admin/controller/oa/Doc.php | 3 + application/admin/controller/oa/Schedule.php | 102 ++++++++++++++++++ application/admin/controller/oa/Task.php | 104 +++++++++++++++++++ application/admin/view/oa/schedule/add.html | 12 --- application/admin/view/oa/schedule/edit.html | 12 --- 5 files changed, 209 insertions(+), 24 deletions(-) diff --git a/application/admin/controller/oa/Doc.php b/application/admin/controller/oa/Doc.php index fd08188..d13df6f 100644 --- a/application/admin/controller/oa/Doc.php +++ b/application/admin/controller/oa/Doc.php @@ -129,6 +129,8 @@ class Doc extends Backend return intval($item); }, $group); $params['group_ids'] = json_encode($group); + $params['create_time'] = date('Y-m-d H:i:s'); + $params['update_time'] = date('Y-m-d H:i:s'); $result = $this->model->allowField(true)->save($params); Db::commit(); @@ -179,6 +181,7 @@ class Doc extends Backend return intval($item); }, $group); $params['group_ids'] = json_encode($group); + $params['update_time'] = date('Y-m-d H:i:s'); $result = $row->allowField(true)->save($params); Db::commit(); diff --git a/application/admin/controller/oa/Schedule.php b/application/admin/controller/oa/Schedule.php index b65b0ae..6387656 100644 --- a/application/admin/controller/oa/Schedule.php +++ b/application/admin/controller/oa/Schedule.php @@ -4,6 +4,9 @@ namespace app\admin\controller\oa; use app\common\controller\Backend; use think\Db; +use think\exception\DbException; +use think\exception\PDOException; +use think\exception\ValidateException; /** * 排班 @@ -148,4 +151,103 @@ class Schedule extends Backend return $this->view->fetch(); } + /** + * 添加 + * + * @return string + * @throws \think\Exception + */ + public function add() + { + if (false === $this->request->isPost()) { + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; + $this->model->validateFailException()->validate($validate); + } + + + $params['create_time'] = date('Y-m-d H:i:s'); + $params['update_time'] = date('Y-m-d H:i:s'); + + + $result = $this->model->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } + + /** + * 编辑 + * + * @param $ids + * @return string + * @throws DbException + * @throws \think\Exception + */ + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { + $this->error(__('You have no permission')); + } + if (false === $this->request->isPost()) { + $this->view->assign('row', $row); + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; + $row->validateFailException()->validate($validate); + } + + + $params['update_time'] = date('Y-m-d H:i:s'); + + $result = $row->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if (false === $result) { + $this->error(__('No rows were updated')); + } + $this->success(); + } + } diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index be8399a..9bcc1ba 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -3,6 +3,10 @@ namespace app\admin\controller\oa; use app\common\controller\Backend; +use think\Db; +use think\exception\DbException; +use think\exception\PDOException; +use think\exception\ValidateException; /** * 任务 @@ -170,4 +174,104 @@ class Task extends Backend } + + /** + * 添加 + * + * @return string + * @throws \think\Exception + */ + public function add() + { + if (false === $this->request->isPost()) { + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; + $this->model->validateFailException()->validate($validate); + } + + + $params['create_time'] = date('Y-m-d H:i:s'); + $params['update_time'] = date('Y-m-d H:i:s'); + + + $result = $this->model->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } + + /** + * 编辑 + * + * @param $ids + * @return string + * @throws DbException + * @throws \think\Exception + */ + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { + $this->error(__('You have no permission')); + } + if (false === $this->request->isPost()) { + $this->view->assign('row', $row); + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; + $row->validateFailException()->validate($validate); + } + + + $params['update_time'] = date('Y-m-d H:i:s'); + + $result = $row->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if (false === $result) { + $this->error(__('No rows were updated')); + } + $this->success(); + } + } diff --git a/application/admin/view/oa/schedule/add.html b/application/admin/view/oa/schedule/add.html index c3f9af5..cd4d268 100644 --- a/application/admin/view/oa/schedule/add.html +++ b/application/admin/view/oa/schedule/add.html @@ -24,18 +24,6 @@
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      diff --git a/application/admin/view/oa/schedule/edit.html b/application/admin/view/oa/schedule/edit.html index 60590d8..1634edf 100644 --- a/application/admin/view/oa/schedule/edit.html +++ b/application/admin/view/oa/schedule/edit.html @@ -24,18 +24,6 @@
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      From 0c557472c77483ab7a71b3716ff576fe42912b64 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Sun, 6 Apr 2025 15:32:08 +0800 Subject: [PATCH 21/21] feature: task --- application/admin/controller/oa/Doc.php | 3 +- application/admin/controller/oa/Task.php | 59 ++++++------------------ public/assets/js/backend/oa/task.js | 45 +++++++++++------- 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/application/admin/controller/oa/Doc.php b/application/admin/controller/oa/Doc.php index d13df6f..3329cd2 100644 --- a/application/admin/controller/oa/Doc.php +++ b/application/admin/controller/oa/Doc.php @@ -83,10 +83,9 @@ class Doc extends Backend } [$where, $sort, $order, $offset, $limit] = $this->buildparams(); - $this->childrenAdminIds = $this->auth->getChildrenAdminIds($this->auth->isSuperAdmin()); $list = $this->model ->where($where) - ->whereRaw('JSON_OVERLAPS(group_ids, ?)', [json_encode($this->childrenAdminIds)]) + ->whereRaw('JSON_OVERLAPS(group_ids, ?)', [json_encode($this->auth->getChildrenGroupIds(true))]) ->order($sort, $order) ->paginate($limit); $result = ['total' => $list->total(), 'rows' => $list->items()]; diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 9bcc1ba..3085afc 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -22,6 +22,8 @@ class Task extends Backend */ protected $model = null; + protected $dataLimit = 'personal'; + public function _initialize() { parent::_initialize(); @@ -95,60 +97,23 @@ class Task extends Backend } if ($row['status'] == 4) { - $row[$k]['status'] = 2; + $list[$k]['status'] = 2; } } + $list[$k]['refuse_reason'] = $list['refuse_reason'] ?? ''; } $result = array("total" => $list->total(), "rows" => $list->items()); return json($result); } + + $this->assignconfig("review", $this->auth->check("oa/task/review")); return $this->view->fetch(); } - public function complete($ids) - { - if (false === $this->request->isPost()) { - $this->error(__("Invalid parameters")); - } - - if (empty($ids)) { - $this->error(__('Parameter %s can not be empty', 'id')); - } - - $task = $this->model->where('id', '=', $ids)->where('status', 1)->find(); - - if (!$task) { - $this->error('任务状态已变更，请刷新后操作'); - } - $task->save(['status' => 3]); - - $this->success(); - } - - public function pass($ids) - { - if (false === $this->request->isPost()) { - $this->error(__("Invalid parameters")); - } - - if (empty($ids)) { - $this->error(__('Parameter %s can not be empty', 'id')); - } - - $task = $this->model->where('id', '=', $ids)->where('status', 3)->find(); - - if (!$task) { - $this->error('任务状态已变更，请刷新后操作'); - } - $task->save(['status' => 4]); - - $this->success(); - } - - public function abort($ids) + public function review($ids) { if (false === $this->request->isPost()) { $this->error(__("Invalid parameters")); @@ -158,9 +123,13 @@ class Task extends Backend $this->error(__('Parameter %s can not be empty', 'id')); } + $status = $this->request->post('status'); $reason = $this->request->post('remark'); - if (empty($reason)) { - $this->error('驳回原因不能为空'); + + if ($status == 5) { + if (empty($reason)) { + $this->error('驳回原因不能为空'); + } } $task = $this->model->where('id', '=', $ids)->where('status', 3)->find(); @@ -168,7 +137,7 @@ class Task extends Backend if (!$task) { $this->error('任务状态已变更，请刷新后操作'); } - $task->save(['status' => 5, 'refuse_reason' => $reason]); + $task->save(['status' => $status, 'refuse_reason' => $reason]); $this->success(); } diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js index 09ce35b..78229cb 100644 --- a/public/assets/js/backend/oa/task.js +++ b/public/assets/js/backend/oa/task.js @@ -66,28 +66,36 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin }, { name: 'pass', - text:"审核通过", - title:"审核通过", - extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs btn-success btn-magic btn-ajax', + text:"通过", + title: '通过', + classname: 'btn btn-xs btn-success btn-click', icon: 'fa fa-magic', - url: 'oa/task/pass', - confirm: '确认发送', - refresh: true, - success: function (data, ret) { + click: function (e, row) { + Layer.confirm("确定通过？", { + }, function (index) { + Fast.api.ajax({ + url: "oa/task/review/ids/"+ row.id, + data: {status:4} + }, function (data) { + Layer.closeAll(); + $(".btn-refresh").trigger("click"); + }); + layer.close(index); + }, function (index) { + layer.close(index); + }); return false; }, - error: function (data, ret) { - Layer.alert(ret.msg); - return false; - }, - visible: function (row) { - //返回true时按钮显示,返回false隐藏 + + visible:function(row){ if (row.status != 3) { return false; } + if (!Config.review) { + return false; + } return true; - } + }, }, { name: 'abort', @@ -103,8 +111,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin } }, function (value) { Fast.api.ajax({ - url: "oa/task/abort/ids/"+ row.id, - data: {remark: value}, + url: "oa/task/review/ids/"+ row.id, + data: {status:5, remark: value}, }, function (data, ret) { Layer.closeAll(); $(".btn-refresh").trigger("click"); @@ -118,6 +126,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin if (row.status != 3) { return false; } + if (!Config.review) { + return false; + } return true; }, }