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', } });