diff --git a/app/base/view/common/errortemplate.html b/app/base/view/common/errortemplate.html new file mode 100644 index 0000000..21e6a1d --- /dev/null +++ b/app/base/view/common/errortemplate.html @@ -0,0 +1,25 @@ + + + + + + 找不到模板 + + + +
+
404
+
+
+
出错啦！
+
对不起，找不到模板文件...
+
{$file | default=""}模板不存在，请检查对应的目录文件，注意区分大小写！
+
+ + \ No newline at end of file diff --git a/app/common.php b/app/common.php index 01452b7..369de6d 100644 --- a/app/common.php +++ b/app/common.php @@ -67,6 +67,15 @@ function is_installed() return $isInstalled; } +//判断cms是否存在模板 +function isTemplate($url='') +{ + static $isTemplate; + if (empty($isTemplate)) { + $isTemplate = file_exists(CMS_ROOT . 'app/'.$url); + } + return $isTemplate; +} //获取服务器信息 function get_system_info($key) diff --git a/app/finance/view/income/view.html b/app/finance/view/income/view.html index bf58950..e83b3b6 100644 --- a/app/finance/view/income/view.html +++ b/app/finance/view/income/view.html @@ -144,7 +144,7 @@ 未到账金额(元) {$detail.not_income} - 已到账金额(元) + 已到账金额(元) {$detail.enter_amount} diff --git a/app/finance/view/invoice/view.html b/app/finance/view/invoice/view.html index e1a261c..4e86afc 100644 --- a/app/finance/view/invoice/view.html +++ b/app/finance/view/invoice/view.html @@ -163,7 +163,7 @@ {/if} {if ( $detail.check_status gt 4)} - 开票人 + 开票人 {$detail.open_admin} 发票号码 {$detail.code} diff --git a/app/home/controller/Conf.php b/app/home/controller/Conf.php index b62b2b1..3c36dc2 100644 --- a/app/home/controller/Conf.php +++ b/app/home/controller/Conf.php @@ -103,13 +103,21 @@ class Conf extends BaseController } else { $id = isset($param['id']) ? $param['id'] : 0; $conf = Db::name('Config')->where('id', $id)->find(); + $module = strtolower(app('http')->getName()); + $class = strtolower(app('request')->controller()); + $action = strtolower(app('request')->action()); + $template = $module . '/view/'. $class .'/'.$conf['name'].'.html'; $config = []; if ($conf['content']) { $config = unserialize($conf['content']); } View::assign('id', $id); View::assign('config', $config); - return view($conf['name']); + if(isTemplate($template)){ + return view($conf['name']); + }else{ + return view('Base@common/errortemplate',['file' =>$template]); + } } } } diff --git a/app/home/view/cate/flow_type.html b/app/home/view/cate/flow_type.html index 611935a..cb118a7 100644 --- a/app/home/view/cate/flow_type.html +++ b/app/home/view/cate/flow_type.html @@ -48,6 +48,8 @@ html = '报销'; }else if(d.type==7){ html = '发票'; + }else if(d.type==8){ + html = '合同'; } return html; }} diff --git a/app/home/view/cate/flow_type_add.html b/app/home/view/cate/flow_type_add.html index b464535..a889ebe 100644 --- a/app/home/view/cate/flow_type_add.html +++ b/app/home/view/cate/flow_type_add.html @@ -17,6 +17,7 @@ + 名称* @@ -50,6 +51,7 @@ + 名称* @@ -90,9 +92,9 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); setTimeout(function () { parent.layui.tool.close(); + parent.layui.pageTable.reload(); }, 1000); } } diff --git a/app/home/view/conf/add.html b/app/home/view/conf/add.html index 9ae33f6..b9024d4 100644 --- a/app/home/view/conf/add.html +++ b/app/home/view/conf/add.html @@ -62,9 +62,9 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); setTimeout(function () { parent.layui.tool.close(); + parent.layui.pageTable.reload(); }, 1000); } } diff --git a/app/home/view/flow/add.html b/app/home/view/flow/add.html index f43acf6..d486bf7 100644 --- a/app/home/view/flow/add.html +++ b/app/home/view/flow/add.html @@ -31,6 +31,7 @@ + 审批类型* @@ -114,6 +115,7 @@ + 审批类型* @@ -206,7 +208,6 @@ form.on('select(type)', function(data){ let callback = function (e) { - layer.msg(e.msg); if (e.code == 0) { if(e.data.length>0){ let ops=''; @@ -231,9 +232,9 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); setTimeout(function () { parent.layui.tool.close(); + parent.layui.pageTable.reload(); }, 1000); } } @@ -275,7 +276,6 @@ form.on('select(flowtype)', function(data){ $(data.elem).parents('.layui-form-item').find('.layui-inline').eq(1).attr('class','layui-inline select-'+data.value); - // console.log(data.value); //得到被选中的值 }); diff --git a/app/home/view/flow/index.html b/app/home/view/flow/index.html index 76923cd..2ae2057 100644 --- a/app/home/view/flow/index.html +++ b/app/home/view/flow/index.html @@ -45,7 +45,15 @@ }else if(d.type==3){ html = '财务'; }else if(d.type==4){ + html = '人事'; + }else if(d.type==5){ html = '其他'; + }else if(d.type==6){ + html = '报销'; + }else if(d.type==7){ + html = '发票'; + }else if(d.type==8){ + html = '合同'; } return html; }} diff --git a/app/install/data/gouguoa.sql b/app/install/data/gouguoa.sql index fa72baf..f663dc6 100644 --- a/app/install/data/gouguoa.sql +++ b/app/install/data/gouguoa.sql @@ -271,8 +271,8 @@ INSERT INTO `oa_admin_rule` VALUES (94, 93, 'article/index/add', '新建/编辑' INSERT INTO `oa_admin_rule` VALUES (95, 93, 'article/index/delete', '删除', '知识文章', 'KQ', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (96, 93, 'article/index/view', '查看', '知识文章', 'KQ', '', 2, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (97, 7, 'oa/approve/index', '我发起的审批', '办公审批', 'OA', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (98, 7, 'oa/approve/list', '待我处理的审批', '办公审批', 'OA', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (97, 7, 'oa/approve/index', '我发起的', '办公审批', 'OA', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (98, 7, 'oa/approve/list', '我处理的', '办公审批', 'OA', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (99, 97, 'oa/approve/add', '新建/编辑', '办公审批', 'OA', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (100, 97, 'oa/approve/view', '查看', '办公审批', 'OA', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (101, 97, 'oa/approve/check', '审核', '办公审批', 'OA', '', 2, 1, 1, 0, 0); @@ -297,8 +297,8 @@ INSERT INTO `oa_admin_rule` VALUES (116, 113, 'oa/work/read', '查看', '工作 INSERT INTO `oa_admin_rule` VALUES (117, 113, 'oa/work/delete', '删除', '工作汇报', 'OA', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (118, 9, '', '报销管理', '报销', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (119, 118, 'finance/expense/index', '我申请的报销', '报销', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (120, 118, 'finance/expense/list', '我负责的报销', '报销', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (119, 118, 'finance/expense/index', '我申请的', '报销', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (120, 118, 'finance/expense/list', '我处理的', '报销', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (121, 118, 'finance/expense/checkedlist', '报销打款', '报销', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (122, 118, 'finance/expense/add', '新建/编辑', '报销', 'CF', '', 2, 1, 1, 0, 0); @@ -308,8 +308,8 @@ INSERT INTO `oa_admin_rule` VALUES (125, 118, 'finance/expense/check', '审核', INSERT INTO `oa_admin_rule` VALUES (126, 118, 'finance/expense/topay', '打款', '报销', 'CF', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (127, 9, '', '发票管理', '发票', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (128, 127, 'finance/invoice/index', '我申请的发票', '发票', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (129, 127, 'finance/invoice/list', '我负责的发票', '发票', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (128, 127, 'finance/invoice/index', '我申请的', '发票', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (129, 127, 'finance/invoice/list', '我处理的', '发票', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (130, 127, 'finance/invoice/checkedlist', '发票开具', '发票', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (131, 127, 'finance/invoice/add', '新建/编辑', '发票', 'CF', '', 2, 1, 1, 0, 0); @@ -505,7 +505,7 @@ CREATE TABLE `oa_personal_quit` ( DROP TABLE IF EXISTS `oa_flow_type`; CREATE TABLE `oa_flow_type` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `type` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1假勤,2行政,3财务,4人事,5其他', + `type` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1假勤,2行政,3财务,4人事,5其他,6报销,发票,合同', `title` varchar(100) NOT NULL DEFAULT '' COMMENT '审批名称', `name` varchar(100) NOT NULL DEFAULT '' COMMENT '审批标识', `icon` varchar(255) NOT NULL DEFAULT '' COMMENT '图标', @@ -525,20 +525,23 @@ INSERT INTO `oa_flow_type` VALUES (4, 1, '加班', 'jiaban', 'icon-xueshengcheng INSERT INTO `oa_flow_type` VALUES (5, 2, '会议室预定', 'huiyishi', 'icon-kehuguanli', 1, 1641802939, 0); INSERT INTO `oa_flow_type` VALUES (6, 2, '公文流转', 'gongwen', 'icon-jiaoxuejihua', 1, 1641802976, 0); INSERT INTO `oa_flow_type` VALUES (7, 2, '物品维修', 'weixiu', 'icon-chuangjianxitong', 1, 1641803005, 0); -INSERT INTO `oa_flow_type` VALUES (8, 2, '用章', 'yongzhang', 'icon-shenpishezhi', 1, 1641804126, 0); -INSERT INTO `oa_flow_type` VALUES (9, 2, '用车', 'yongche', 'icon-dongtaiguanli', 1, 1641804283, 0); +INSERT INTO `oa_flow_type` VALUES (8, 2, '用章申请', 'yongzhang', 'icon-shenpishezhi', 1, 1641804126, 0); +INSERT INTO `oa_flow_type` VALUES (9, 2, '用车申请', 'yongche', 'icon-dongtaiguanli', 1, 1641804283, 0); INSERT INTO `oa_flow_type` VALUES (10, 2, '用车归还', 'yongcheguihai', 'icon-kaoheguanli', 1, 1641804411, 0); INSERT INTO `oa_flow_type` VALUES (11, 3, '借款申请', 'jiekuan', 'icon-zhangbuguanli', 1, 1641804537, 0); INSERT INTO `oa_flow_type` VALUES (12, 3, '付款申请', 'fukuan', 'icon-gongziguanli', 1, 1641804601, 0); -INSERT INTO `oa_flow_type` VALUES (13, 3, '奖励申请', 'jiangli', 'icon-hetongguanli', 1, 1641804711, 0); -INSERT INTO `oa_flow_type` VALUES (14, 3, '采购', 'caigou', 'icon-xiaoshoupin', 1, 1641804917, 0); -INSERT INTO `oa_flow_type` VALUES (15, 3, '活动经费', 'huodong', 'icon-wangxiaoshezhi1', 1, 1641805110, 0); -INSERT INTO `oa_flow_type` VALUES (16, 4, '入职', 'ruzhi', 'icon-xueshengdaoru', 1, 1641893853, 0); -INSERT INTO `oa_flow_type` VALUES (17, 4, '转正', 'zhuanzheng', 'icon-xueshengyidong', 1, 1641893926, 0); -INSERT INTO `oa_flow_type` VALUES (18, 4, '离职', 'lizhi', 'icon-banjiguanli', 1, 1641894048, 0); -INSERT INTO `oa_flow_type` VALUES (19, 4, '招聘需求', 'zhaopin', 'icon-zhaopinguanli', 1, 1641894080, 0); -INSERT INTO `oa_flow_type` VALUES (20, 6, '报销', 'baoxiao', 'icon-jizhang', 1, 1641804488, 0); -INSERT INTO `oa_flow_type` VALUES (21, 7, '发票', 'fapiao', 'icon-fuwuliebiao', 1, 1642904833, 0); +INSERT INTO `oa_flow_type` VALUES (13, 3, '奖励申请', 'jiangli', 'icon-bulujiesuan', 1, 1641804711, 0); +INSERT INTO `oa_flow_type` VALUES (14, 3, '采购申请', 'caigou', 'icon-shoufeiguanli', 1, 1641804917, 0); +INSERT INTO `oa_flow_type` VALUES (15, 3, '活动经费', 'huodong', 'icon-shoufeipeizhi', 1, 1641805110, 0); +INSERT INTO `oa_flow_type` VALUES (16, 4, '入职申请', 'ruzhi', 'icon-xueshengdaoru', 1, 1641893853, 0); +INSERT INTO `oa_flow_type` VALUES (17, 4, '转正申请', 'zhuanzheng', 'icon-wodeshenpi', 1, 1641893926, 0); +INSERT INTO `oa_flow_type` VALUES (18, 4, '离职申请', 'lizhi', 'icon-xuexitongji', 1, 1641894048, 0); +INSERT INTO `oa_flow_type` VALUES (19, 4, '转岗申请', 'zhuangang', 'icon-xueshengyidong', 1, 1654681664, 0); +INSERT INTO `oa_flow_type` VALUES (20, 4, '招聘需求', 'zhaopin', 'icon-xiaoxizhongxin', 1, 1641894080, 0); +INSERT INTO `oa_flow_type` VALUES (21, 5, '通用审批', 'tongyong', 'icon-zhaoshengzhunbei', 1, 1654685923, 0); +INSERT INTO `oa_flow_type` VALUES (22, 6, '报销审批', 'baoxiao', 'icon-jizhang', 1, 1641804488, 0); +INSERT INTO `oa_flow_type` VALUES (23, 7, '发票审批', 'fapiao', 'icon-fuwuliebiao', 1, 1642904833, 0); +INSERT INTO `oa_flow_type` VALUES (24, 8, '合同审批', 'hetong', 'icon-hetongshezhi', 1, 1654692083, 0); -- ---------------------------- -- Table structure for oa_flow @@ -548,7 +551,7 @@ CREATE TABLE `oa_flow` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(50) NOT NULL COMMENT '审批流名称', `check_type` tinyint(4) NOT NULL COMMENT '1固定审批,2授权审批人', - `type` tinyint(4) NOT NULL COMMENT '应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票', + `type` tinyint(4) NOT NULL COMMENT '应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同', `flow_cate` tinyint(11) NOT NULL DEFAULT 0 COMMENT '应用审批类型id', `department_ids` varchar(500) NOT NULL DEFAULT '' COMMENT '应用部门ID（0为全部）1,2,3', `user_ids` varchar(500) NOT NULL DEFAULT '' COMMENT '员工ID', @@ -584,9 +587,12 @@ INSERT INTO `oa_flow` VALUES (15, '活动经费审批', 2, 3, 15, '', '', '活 INSERT INTO `oa_flow` VALUES (16, '入职申请审批', 2, 4, 16, '', '', '入职申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402791, 0, 1, 0, 0); INSERT INTO `oa_flow` VALUES (17, '转正申请审批', 2, 4, 17, '', '', '转正申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402812, 0, 1, 0, 0); INSERT INTO `oa_flow` VALUES (18, '离职申请审批', 2, 4, 18, '', '', '离职申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402834, 0, 1, 0, 0); -INSERT INTO `oa_flow` VALUES (19, '招聘需求审批', 2, 4, 19, '', '', '招聘需求审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402855, 0, 1, 0, 0); -INSERT INTO `oa_flow` VALUES (20, '报销审批', 2, 6, 20, '', '', '报销审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490024, 0, 1, 0, 0); -INSERT INTO `oa_flow` VALUES (21, '发票审批', 2, 7, 21, '', '', '报销审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490053, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (19, '转岗申请审批', 2, 4, 19, '', '', '转岗申请审核流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1654681954, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (20, '招聘需求审批', 2, 4, 21, '', '', '招聘需求审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402855, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (21, '通用审批', 2, 5, 21, '', '', '通用审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1654686338, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (22, '报销审批', 2, 6, 22, '', '', '报销审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490024, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (23, '发票审批', 2, 7, 23, '', '', '发票审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490053, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (24, '合同审批', 2, 8, 24, '', '', '合同审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1654692519, 0, 1, 0, 0); -- ---------------------------- -- Table structure for oa_cost_cate diff --git a/app/install/data/oa_reset.sql b/app/install/data/oa_reset.sql index 70dde7f..4c15adb 100644 --- a/app/install/data/oa_reset.sql +++ b/app/install/data/oa_reset.sql @@ -196,8 +196,8 @@ INSERT INTO `oa_admin_rule` VALUES (94, 93, 'article/index/add', '新建/编辑' INSERT INTO `oa_admin_rule` VALUES (95, 93, 'article/index/delete', '删除', '知识文章', 'KQ', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (96, 93, 'article/index/view', '查看', '知识文章', 'KQ', '', 2, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (97, 7, 'oa/approve/index', '我发起的审批', '办公审批', 'OA', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (98, 7, 'oa/approve/list', '待我处理的审批', '办公审批', 'OA', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (97, 7, 'oa/approve/index', '我发起的', '办公审批', 'OA', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (98, 7, 'oa/approve/list', '我处理的', '办公审批', 'OA', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (99, 97, 'oa/approve/add', '新建/编辑', '办公审批', 'OA', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (100, 97, 'oa/approve/view', '查看', '办公审批', 'OA', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (101, 97, 'oa/approve/check', '审核', '办公审批', 'OA', '', 2, 1, 1, 0, 0); @@ -222,8 +222,8 @@ INSERT INTO `oa_admin_rule` VALUES (116, 113, 'oa/work/read', '查看', '工作 INSERT INTO `oa_admin_rule` VALUES (117, 113, 'oa/work/delete', '删除', '工作汇报', 'OA', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (118, 9, '', '报销管理', '报销', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (119, 118, 'finance/expense/index', '我申请的报销', '报销', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (120, 118, 'finance/expense/list', '我负责的报销', '报销', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (119, 118, 'finance/expense/index', '我申请的', '报销', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (120, 118, 'finance/expense/list', '我处理的', '报销', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (121, 118, 'finance/expense/checkedlist', '报销打款', '报销', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (122, 118, 'finance/expense/add', '新建/编辑', '报销', 'CF', '', 2, 1, 1, 0, 0); @@ -233,8 +233,8 @@ INSERT INTO `oa_admin_rule` VALUES (125, 118, 'finance/expense/check', '审核', INSERT INTO `oa_admin_rule` VALUES (126, 118, 'finance/expense/topay', '打款', '报销', 'CF', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (127, 9, '', '发票管理', '发票', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (128, 127, 'finance/invoice/index', '我申请的发票', '发票', 'CF', '', 1, 1, 1, 0, 0); -INSERT INTO `oa_admin_rule` VALUES (129, 127, 'finance/invoice/list', '我负责的发票', '发票', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (128, 127, 'finance/invoice/index', '我申请的', '发票', 'CF', '', 1, 1, 1, 0, 0); +INSERT INTO `oa_admin_rule` VALUES (129, 127, 'finance/invoice/list', '我处理的', '发票', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (130, 127, 'finance/invoice/checkedlist', '发票开具', '发票', 'CF', '', 1, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (131, 127, 'finance/invoice/add', '新建/编辑', '发票', 'CF', '', 2, 1, 1, 0, 0); @@ -250,7 +250,6 @@ INSERT INTO `oa_admin_rule` VALUES (139, 137, 'finance/income/view', '查看', ' INSERT INTO `oa_admin_rule` VALUES (140, 137, 'finance/income/delete', '删除', '到账记录', 'CF', '', 2, 1, 1, 0, 0); INSERT INTO `oa_admin_rule` VALUES (141, 10, 'business/analysis/index', '智能分析', '智能分析', 'BI', '', 1, 1, 1, 0, 0); - -- ---------------------------- -- Table structure for oa_article_cate -- ---------------------------- @@ -396,7 +395,7 @@ CREATE TABLE `oa_personal_quit` ( DROP TABLE IF EXISTS `oa_flow_type`; CREATE TABLE `oa_flow_type` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `type` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1假勤,2行政,3财务,4人事,5其他', + `type` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '1假勤,2行政,3财务,4人事,5其他,6报销,发票,合同', `title` varchar(100) NOT NULL DEFAULT '' COMMENT '审批名称', `name` varchar(100) NOT NULL DEFAULT '' COMMENT '审批标识', `icon` varchar(255) NOT NULL DEFAULT '' COMMENT '图标', @@ -416,20 +415,23 @@ INSERT INTO `oa_flow_type` VALUES (4, 1, '加班', 'jiaban', 'icon-xueshengcheng INSERT INTO `oa_flow_type` VALUES (5, 2, '会议室预定', 'huiyishi', 'icon-kehuguanli', 1, 1641802939, 0); INSERT INTO `oa_flow_type` VALUES (6, 2, '公文流转', 'gongwen', 'icon-jiaoxuejihua', 1, 1641802976, 0); INSERT INTO `oa_flow_type` VALUES (7, 2, '物品维修', 'weixiu', 'icon-chuangjianxitong', 1, 1641803005, 0); -INSERT INTO `oa_flow_type` VALUES (8, 2, '用章', 'yongzhang', 'icon-shenpishezhi', 1, 1641804126, 0); -INSERT INTO `oa_flow_type` VALUES (9, 2, '用车', 'yongche', 'icon-dongtaiguanli', 1, 1641804283, 0); +INSERT INTO `oa_flow_type` VALUES (8, 2, '用章申请', 'yongzhang', 'icon-shenpishezhi', 1, 1641804126, 0); +INSERT INTO `oa_flow_type` VALUES (9, 2, '用车申请', 'yongche', 'icon-dongtaiguanli', 1, 1641804283, 0); INSERT INTO `oa_flow_type` VALUES (10, 2, '用车归还', 'yongcheguihai', 'icon-kaoheguanli', 1, 1641804411, 0); INSERT INTO `oa_flow_type` VALUES (11, 3, '借款申请', 'jiekuan', 'icon-zhangbuguanli', 1, 1641804537, 0); INSERT INTO `oa_flow_type` VALUES (12, 3, '付款申请', 'fukuan', 'icon-gongziguanli', 1, 1641804601, 0); -INSERT INTO `oa_flow_type` VALUES (13, 3, '奖励申请', 'jiangli', 'icon-hetongguanli', 1, 1641804711, 0); -INSERT INTO `oa_flow_type` VALUES (14, 3, '采购', 'caigou', 'icon-xiaoshoupin', 1, 1641804917, 0); -INSERT INTO `oa_flow_type` VALUES (15, 3, '活动经费', 'huodong', 'icon-wangxiaoshezhi1', 1, 1641805110, 0); -INSERT INTO `oa_flow_type` VALUES (16, 4, '入职', 'ruzhi', 'icon-xueshengdaoru', 1, 1641893853, 0); -INSERT INTO `oa_flow_type` VALUES (17, 4, '转正', 'zhuanzheng', 'icon-xueshengyidong', 1, 1641893926, 0); -INSERT INTO `oa_flow_type` VALUES (18, 4, '离职', 'lizhi', 'icon-banjiguanli', 1, 1641894048, 0); -INSERT INTO `oa_flow_type` VALUES (19, 4, '招聘需求', 'zhaopin', 'icon-zhaopinguanli', 1, 1641894080, 0); -INSERT INTO `oa_flow_type` VALUES (20, 6, '报销', 'baoxiao', 'icon-jizhang', 1, 1641804488, 0); -INSERT INTO `oa_flow_type` VALUES (21, 7, '发票', 'fapiao', 'icon-fuwuliebiao', 1, 1642904833, 0); +INSERT INTO `oa_flow_type` VALUES (13, 3, '奖励申请', 'jiangli', 'icon-bulujiesuan', 1, 1641804711, 0); +INSERT INTO `oa_flow_type` VALUES (14, 3, '采购申请', 'caigou', 'icon-shoufeiguanli', 1, 1641804917, 0); +INSERT INTO `oa_flow_type` VALUES (15, 3, '活动经费', 'huodong', 'icon-shoufeipeizhi', 1, 1641805110, 0); +INSERT INTO `oa_flow_type` VALUES (16, 4, '入职申请', 'ruzhi', 'icon-xueshengdaoru', 1, 1641893853, 0); +INSERT INTO `oa_flow_type` VALUES (17, 4, '转正申请', 'zhuanzheng', 'icon-wodeshenpi', 1, 1641893926, 0); +INSERT INTO `oa_flow_type` VALUES (18, 4, '离职申请', 'lizhi', 'icon-xuexitongji', 1, 1641894048, 0); +INSERT INTO `oa_flow_type` VALUES (19, 4, '转岗申请', 'zhuangang', 'icon-xueshengyidong', 1, 1654681664, 0); +INSERT INTO `oa_flow_type` VALUES (20, 4, '招聘需求', 'zhaopin', 'icon-xiaoxizhongxin', 1, 1641894080, 0); +INSERT INTO `oa_flow_type` VALUES (21, 5, '通用审批', 'tongyong', 'icon-zhaoshengzhunbei', 1, 1654685923, 0); +INSERT INTO `oa_flow_type` VALUES (22, 6, '报销审批', 'baoxiao', 'icon-jizhang', 1, 1641804488, 0); +INSERT INTO `oa_flow_type` VALUES (23, 7, '发票审批', 'fapiao', 'icon-fuwuliebiao', 1, 1642904833, 0); +INSERT INTO `oa_flow_type` VALUES (24, 8, '合同审批', 'hetong', 'icon-hetongshezhi', 1, 1654692083, 0); -- ---------------------------- -- Table structure for oa_flow @@ -439,7 +441,7 @@ CREATE TABLE `oa_flow` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(50) NOT NULL COMMENT '审批流名称', `check_type` tinyint(4) NOT NULL COMMENT '1固定审批,2授权审批人', - `type` tinyint(4) NOT NULL COMMENT '应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票', + `type` tinyint(4) NOT NULL COMMENT '应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同', `flow_cate` tinyint(11) NOT NULL DEFAULT 0 COMMENT '应用审批类型id', `department_ids` varchar(500) NOT NULL DEFAULT '' COMMENT '应用部门ID（0为全部）1,2,3', `user_ids` varchar(500) NOT NULL DEFAULT '' COMMENT '员工ID', @@ -475,9 +477,12 @@ INSERT INTO `oa_flow` VALUES (15, '活动经费审批', 2, 3, 15, '', '', '活 INSERT INTO `oa_flow` VALUES (16, '入职申请审批', 2, 4, 16, '', '', '入职申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402791, 0, 1, 0, 0); INSERT INTO `oa_flow` VALUES (17, '转正申请审批', 2, 4, 17, '', '', '转正申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402812, 0, 1, 0, 0); INSERT INTO `oa_flow` VALUES (18, '离职申请审批', 2, 4, 18, '', '', '离职申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402834, 0, 1, 0, 0); -INSERT INTO `oa_flow` VALUES (19, '招聘需求审批', 2, 4, 19, '', '', '招聘需求审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402855, 0, 1, 0, 0); -INSERT INTO `oa_flow` VALUES (20, '报销审批', 2, 6, 20, '', '', '报销审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490024, 0, 1, 0, 0); -INSERT INTO `oa_flow` VALUES (21, '发票审批', 2, 7, 21, '', '', '报销审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490053, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (19, '转岗申请审批', 2, 4, 19, '', '', '转岗申请审核流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1654681954, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (20, '招聘需求审批', 2, 4, 21, '', '', '招聘需求审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402855, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (21, '通用审批', 2, 5, 21, '', '', '通用审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1654686338, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (22, '报销审批', 2, 6, 22, '', '', '报销审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490024, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (23, '发票审批', 2, 7, 23, '', '', '发票审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644490053, 0, 1, 0, 0); +INSERT INTO `oa_flow` VALUES (24, '合同审批', 2, 8, 24, '', '', '合同审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1654692519, 0, 1, 0, 0); -- ---------------------------- -- Table structure for oa_cost_cate diff --git a/app/message/view/index/add.html b/app/message/view/index/add.html index f50633a..5c3e914 100644 --- a/app/message/view/index/add.html +++ b/app/message/view/index/add.html @@ -91,7 +91,7 @@ {if condition="($detail.fid > 0)"} - + {notempty name="$detail.from_file_array"} diff --git a/app/oa/controller/Approve.php b/app/oa/controller/Approve.php index 40feca8..9c57ad8 100644 --- a/app/oa/controller/Approve.php +++ b/app/oa/controller/Approve.php @@ -291,12 +291,20 @@ class Approve extends BaseController //获取审批流程 $flows = get_flows($type,$department); $moban=Db::name('FlowType')->where('id',$type)->value('name'); + $module = strtolower(app('http')->getName()); + $class = strtolower(app('request')->controller()); + $action = strtolower(app('request')->action()); + $template = $module . '/view/'. $class .'/add_'.$moban.'.html'; View::assign([ 'flows' => $flows, 'id' => $id, 'type' => $type, ]); - return view('add_'.$moban); + if(isTemplate($template)){ + return view('add_'.$moban); + }else{ + return view('Base@common/errortemplate',['file' =>$template]); + } } } @@ -355,11 +363,19 @@ class Approve extends BaseController } } $moban=Db::name('FlowType')->where('id',$detail['type'])->value('name'); + $module = strtolower(app('http')->getName()); + $class = strtolower(app('request')->controller()); + $action = strtolower(app('request')->action()); + $template = $module . '/view/'. $class .'/view_'.$moban.'.html'; View::assign('is_create_admin', $is_create_admin); View::assign('is_check_admin', $is_check_admin); View::assign('detail', $detail); View::assign('flows', $flows); - return view('view_'.$moban); + if(isTemplate($template)){ + return view('view_'.$moban); + }else{ + return view('Base@common/errortemplate',['file' =>$template]); + } } //审核 diff --git a/app/oa/view/approve/add.html b/app/oa/view/approve/add.html index f0af17d..a9c2de4 100644 --- a/app/oa/view/approve/add.html +++ b/app/oa/view/approve/add.html @@ -392,9 +392,9 @@ const moduleInit = ['tool','formSelects','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_caigou.html b/app/oa/view/approve/add_caigou.html index dcb6836..9c9919c 100644 --- a/app/oa/view/approve/add_caigou.html +++ b/app/oa/view/approve/add_caigou.html @@ -151,9 +151,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_chuchai.html b/app/oa/view/approve/add_chuchai.html index 7cfe609..6b7e56a 100644 --- a/app/oa/view/approve/add_chuchai.html +++ b/app/oa/view/approve/add_chuchai.html @@ -259,9 +259,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_fukuan.html b/app/oa/view/approve/add_fukuan.html index b1c1c5d..2d4ed77 100644 --- a/app/oa/view/approve/add_fukuan.html +++ b/app/oa/view/approve/add_fukuan.html @@ -186,9 +186,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_gongwen.html b/app/oa/view/approve/add_gongwen.html index 8cdbf2f..c0c5a7f 100644 --- a/app/oa/view/approve/add_gongwen.html +++ b/app/oa/view/approve/add_gongwen.html @@ -161,9 +161,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_huiyishi.html b/app/oa/view/approve/add_huiyishi.html index 49f399f..c23be58 100644 --- a/app/oa/view/approve/add_huiyishi.html +++ b/app/oa/view/approve/add_huiyishi.html @@ -260,9 +260,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.tableIns.reload(); - setTimeout(function(){ - parent.layui.rightpage.close(); + setTimeout(function(){ + parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_huodong.html b/app/oa/view/approve/add_huodong.html index 5c6ff66..1bd7bf3 100644 --- a/app/oa/view/approve/add_huodong.html +++ b/app/oa/view/approve/add_huodong.html @@ -278,9 +278,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_jiaban.html b/app/oa/view/approve/add_jiaban.html index 0a3dc70..64e6334 100644 --- a/app/oa/view/approve/add_jiaban.html +++ b/app/oa/view/approve/add_jiaban.html @@ -409,9 +409,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_jiangli.html b/app/oa/view/approve/add_jiangli.html index 30e7c55..6c4cf3b 100644 --- a/app/oa/view/approve/add_jiangli.html +++ b/app/oa/view/approve/add_jiangli.html @@ -139,9 +139,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_jiekuan.html b/app/oa/view/approve/add_jiekuan.html index 1d81a36..4eb0bae 100644 --- a/app/oa/view/approve/add_jiekuan.html +++ b/app/oa/view/approve/add_jiekuan.html @@ -178,9 +178,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_lizhi.html b/app/oa/view/approve/add_lizhi.html index d43bab8..f3282b9 100644 --- a/app/oa/view/approve/add_lizhi.html +++ b/app/oa/view/approve/add_lizhi.html @@ -181,9 +181,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_qingjia.html b/app/oa/view/approve/add_qingjia.html index bdd252b..f4e6d1a 100644 --- a/app/oa/view/approve/add_qingjia.html +++ b/app/oa/view/approve/add_qingjia.html @@ -385,9 +385,9 @@ const moduleInit = ['tool','formSelects','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_ruzhi.html b/app/oa/view/approve/add_ruzhi.html index d3f7b29..effa68d 100644 --- a/app/oa/view/approve/add_ruzhi.html +++ b/app/oa/view/approve/add_ruzhi.html @@ -184,9 +184,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_tongyong.html b/app/oa/view/approve/add_tongyong.html new file mode 100644 index 0000000..e4da8ef --- /dev/null +++ b/app/oa/view/approve/add_tongyong.html @@ -0,0 +1,199 @@ +{extend name="../../base/view/common/base" /} +{block name="style"} +{include file="/approve/add_style" /} +{/block} + +{block name="body"} + +

通用审批

+ {eq name="$id" value="0"} +
引用消息内容引用消息内容 {$detail.from_content}
+ + + + + + + + + + + + + + + + + + +
审批内容*紧急程度* + +
审批详细描述* + +
审批流程* + +
审核人* + +
+ {else/} + + + + + + + + + + + + + + + + + + + +
审批内容*紧急程度* + +
审批详细描述* + +
审批流程* + +
审核人* + +
+ {/eq} +
+ + + + +
+ +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/oa/view/approve/add_waichu.html b/app/oa/view/approve/add_waichu.html index 53933b9..9c2c990 100644 --- a/app/oa/view/approve/add_waichu.html +++ b/app/oa/view/approve/add_waichu.html @@ -358,9 +358,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_weixiu.html b/app/oa/view/approve/add_weixiu.html index dc92291..d216420 100644 --- a/app/oa/view/approve/add_weixiu.html +++ b/app/oa/view/approve/add_weixiu.html @@ -56,7 +56,7 @@ {else/} - + - + - + - + diff --git a/app/oa/view/approve/view_yongcheguihai.html b/app/oa/view/approve/view_yongcheguihai.html index 0e88431..0274218 100644 --- a/app/oa/view/approve/view_yongcheguihai.html +++ b/app/oa/view/approve/view_yongcheguihai.html @@ -14,13 +14,13 @@ {eq name="$detail.detail_type" value="$vo.id"}{$vo.title}{/eq} {/volist} - + - + diff --git a/app/oa/view/approve/view_zhaopin.html b/app/oa/view/approve/view_zhaopin.html index e056c43..3edaf0a 100644 --- a/app/oa/view/approve/view_zhaopin.html +++ b/app/oa/view/approve/view_zhaopin.html @@ -24,7 +24,7 @@ - + diff --git a/app/oa/view/approve/view_zhuangang.html b/app/oa/view/approve/view_zhuangang.html new file mode 100644 index 0000000..3a3abf6 --- /dev/null +++ b/app/oa/view/approve/view_zhuangang.html @@ -0,0 +1,65 @@ +{extend name="../../base/view/common/base" /} +{block name="style"} +{include file="/approve/view_style" /} +{/block} + +{block name="body"} + +

离职申请审批

+
故障设备名称*故障设备名称* 紧急程度* @@ -69,7 +69,7 @@
预计维修费用*预计维修费用* 报修日期 * @@ -151,9 +151,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_yongche.html b/app/oa/view/approve/add_yongche.html index 3af28dc..760a630 100644 --- a/app/oa/view/approve/add_yongche.html +++ b/app/oa/view/approve/add_yongche.html @@ -433,9 +433,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_yongcheguihai.html b/app/oa/view/approve/add_yongcheguihai.html index 8d08f98..fffc6b0 100644 --- a/app/oa/view/approve/add_yongcheguihai.html +++ b/app/oa/view/approve/add_yongcheguihai.html @@ -152,9 +152,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_yongzhang.html b/app/oa/view/approve/add_yongzhang.html index 6b17792..d0d6a74 100644 --- a/app/oa/view/approve/add_yongzhang.html +++ b/app/oa/view/approve/add_yongzhang.html @@ -184,9 +184,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_zhaopin.html b/app/oa/view/approve/add_zhaopin.html index 9e2e480..debd929 100644 --- a/app/oa/view/approve/add_zhaopin.html +++ b/app/oa/view/approve/add_zhaopin.html @@ -182,9 +182,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/add_zhuangang.html b/app/oa/view/approve/add_zhuangang.html new file mode 100644 index 0000000..aa4d356 --- /dev/null +++ b/app/oa/view/approve/add_zhuangang.html @@ -0,0 +1,295 @@ +{extend name="../../base/view/common/base" /} +{block name="style"} +{include file="/approve/add_style" /} +{/block} + +{block name="body"} +
+

转岗申请审批

+ {eq name="$id" value="0"} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
员工姓名*入职日期 * + +
当前所在部门* + + 当前担任职务* + +
转岗后部门* + + 转岗后职务* + +
申请转岗日期*预计转岗日期* + +
转岗原因* + +
审批流程* + +
审核人* + +
+ {else/} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
员工姓名*入职日期 * + +
所在部门* + + 担任职务* + +
转岗后部门* + + 转岗后职务* + +
申请转岗日期*预计转岗日期* + +
转岗原因* + +
审批流程* + +
审核人* + +
+ {/eq} +
+ + + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/oa/view/approve/add_zhuanzheng.html b/app/oa/view/approve/add_zhuanzheng.html index cf30d4e..fb90976 100644 --- a/app/oa/view/approve/add_zhuanzheng.html +++ b/app/oa/view/approve/add_zhuanzheng.html @@ -166,9 +166,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/view_lizhi.html b/app/oa/view/approve/view_lizhi.html index 0d02d64..49f438b 100644 --- a/app/oa/view/approve/view_lizhi.html +++ b/app/oa/view/approve/view_lizhi.html @@ -8,9 +8,9 @@

离职申请审批

- + - + diff --git a/app/oa/view/approve/view_script.html b/app/oa/view/approve/view_script.html index 857c760..b1fec71 100644 --- a/app/oa/view/approve/view_script.html +++ b/app/oa/view/approve/view_script.html @@ -211,9 +211,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } @@ -242,9 +242,9 @@ const moduleInit = ['tool','employeepicker']; success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ + setTimeout(function(){ parent.layui.tool.close(); + parent.layui.pageTable.reload(); },1000); } } diff --git a/app/oa/view/approve/view_tongyong.html b/app/oa/view/approve/view_tongyong.html new file mode 100644 index 0000000..245df06 --- /dev/null +++ b/app/oa/view/approve/view_tongyong.html @@ -0,0 +1,35 @@ +{extend name="../../base/view/common/base" /} +{block name="style"} +{include file="/approve/view_style" /} +{/block} + +{block name="body"} + +

通用审批

+
员工姓名员工姓名 {$detail.name}入职日期入职日期 {$detail.detail_time}
+ + + + + + + + + + +
紧急程度 + {eq name="$detail.detail_type" value="1"}普通{/eq} + {eq name="$detail.detail_type" value="2"}紧急{/eq} + {eq name="$detail.detail_type" value="3"}特急{/eq} + 审批内容{$detail.name}
审批详细描述{$detail.content}
+ + {include file="/approve/view_step" /} + +{/block} + + + +{block name="script"} +{include file="/approve/view_script" /} +{/block} + \ No newline at end of file diff --git a/app/oa/view/approve/view_weixiu.html b/app/oa/view/approve/view_weixiu.html index a6bdf47..2294b76 100644 --- a/app/oa/view/approve/view_weixiu.html +++ b/app/oa/view/approve/view_weixiu.html @@ -14,13 +14,13 @@ {eq name="$detail.detail_type" value="2"}紧急{/eq} {eq name="$detail.detail_type" value="3"}特急{/eq} 		故障设备名称故障设备名称 {$detail.name}
报修日期 {$detail.detail_time}预计维修费用预计维修费用 {$detail.amount}
用车前公里数用车前公里数 {$detail.num}
归还时间 {$detail.detail_time}用车后公里数用车后公里数 {$detail.num1}
招聘人数 {$detail.num}期望到岗日期期望到岗日期 {$detail.detail_time}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
员工姓名{$detail.name}入职日期{$detail.detail_time}
当前所在部门 + {volist name=":get_department()" id="vo"} + {eq name="$detail.department_type" value="$vo.id"}{$vo.title}{/eq} + {/volist} + 当前担任职务 + {volist name=":get_position()" id="vo"} + {eq name="$detail.position_type" value="$vo.id"}{$vo.title}{/eq} + {/volist} +
转岗后部门 + {volist name=":get_department()" id="vo"} + {eq name="$detail.num" value="$vo.id"}{$vo.title}{/eq} + {/volist} + 转岗后职务 + {volist name=":get_position()" id="vo"} + {eq name="$detail.num1" value="$vo.id"}{$vo.title}{/eq} + {/volist} +
申请转岗日期{$detail.start_time}预计转岗日期{$detail.end_time}
申请转岗原因{$detail.content}
+ + {include file="/approve/view_step" /} + +{/block} + + + +{block name="script"} +{include file="/approve/view_script" /} +{/block} + \ No newline at end of file diff --git a/public/static/home/images/404.gif b/public/static/home/images/404.gif new file mode 100644 index 0000000..dd9a44b Binary files /dev/null and b/public/static/home/images/404.gif differ