锁屏bug修正
This commit is contained in:
hdm
parent
7405585a36
commit
af81062c08
@ -84,7 +84,8 @@ class Login
|
|||||||
public function lock()
|
public function lock()
|
||||||
{
|
{
|
||||||
$session_admin = get_config('app.session_admin');
|
$session_admin = get_config('app.session_admin');
|
||||||
$admin= Session::get($session_admin);
|
$admin_id= Session::get($session_admin);
|
||||||
|
$admin = Db::name('admin')->where(['id' => $admin_id])->find();
|
||||||
if (request()->isAjax()) {
|
if (request()->isAjax()) {
|
||||||
$param = get_params();
|
$param = get_params();
|
||||||
if($param['lock_password'] == ''){
|
if($param['lock_password'] == ''){
|
||||||
|
|||||||
@ -557,23 +557,24 @@ 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 (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 (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 (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 (8, 2, '资质借用', 'zizhi', 'icon-luquchengji', '', 1, 1677661531, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (9, 2, '用车', 'yongche', 'icon-dongtaiguanli','', 1, 1641804283, 0);
|
INSERT INTO `oa_flow_type` VALUES (9, 2, '用章', 'yongzhang', 'icon-shenpishezhi','', 1, 1641804126, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (10, 2, '用车归还', 'yongcheguihai', 'icon-kaoheguanli','', 1, 1641804411, 0);
|
INSERT INTO `oa_flow_type` VALUES (10, 2, '用车', 'yongche', 'icon-dongtaiguanli','', 1, 1641804283, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (11, 3, '借款', 'jiekuan', 'icon-zhangbuguanli','', 1, 1641804537, 0);
|
INSERT INTO `oa_flow_type` VALUES (11, 2, '用车归还', 'yongcheguihai', 'icon-kaoheguanli','', 1, 1641804411, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (12, 3, '付款', 'fukuan', 'icon-gongziguanli','', 1, 1641804601, 0);
|
INSERT INTO `oa_flow_type` VALUES (12, 3, '借款', 'jiekuan', 'icon-zhangbuguanli','', 1, 1641804537, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (13, 3, '奖励', 'jiangli', 'icon-bulujiesuan','', 1, 1641804711, 0);
|
INSERT INTO `oa_flow_type` VALUES (13, 3, '付款', 'fukuan', 'icon-gongziguanli','', 1, 1641804601, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (14, 3, '采购', 'caigou', 'icon-shoufeiguanli','', 1, 1641804917, 0);
|
INSERT INTO `oa_flow_type` VALUES (14, 3, '奖励', 'jiangli', 'icon-bulujiesuan','', 1, 1641804711, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (15, 3, '活动经费', 'huodong', 'icon-shoufeipeizhi','', 1, 1641805110, 0);
|
INSERT INTO `oa_flow_type` VALUES (15, 3, '采购', 'caigou', 'icon-shoufeiguanli','', 1, 1641804917, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (16, 4, '入职', 'ruzhi', 'icon-xueshengdaoru','', 1, 1641893853, 0);
|
INSERT INTO `oa_flow_type` VALUES (16, 3, '活动经费', 'huodong', 'icon-shoufeipeizhi','', 1, 1641805110, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (17, 4, '转正', 'zhuanzheng', 'icon-wodeshenpi','', 1, 1641893926, 0);
|
INSERT INTO `oa_flow_type` VALUES (17, 4, '入职', 'ruzhi', 'icon-xueshengdaoru','', 1, 1641893853, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (18, 4, '离职', 'lizhi', 'icon-xuexitongji','', 1, 1641894048, 0);
|
INSERT INTO `oa_flow_type` VALUES (18, 4, '转正', 'zhuanzheng', 'icon-wodeshenpi','', 1, 1641893926, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (19, 4, '转岗', 'zhuangang', 'icon-xueshengyidong','', 1, 1654681664, 0);
|
INSERT INTO `oa_flow_type` VALUES (19, 4, '离职', 'lizhi', 'icon-xuexitongji','', 1, 1641894048, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (20, 4, '招聘需求', 'zhaopin', 'icon-xiaoxizhongxin','', 1, 1641894080, 0);
|
INSERT INTO `oa_flow_type` VALUES (20, 4, '转岗', 'zhuangang', 'icon-xueshengyidong','', 1, 1654681664, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (21, 5, '通用审批', 'tongyong', 'icon-zhaoshengzhunbei','', 1, 1654685923, 0);
|
INSERT INTO `oa_flow_type` VALUES (21, 4, '招聘需求', 'zhaopin', 'icon-xiaoxizhongxin','', 1, 1641894080, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (22, 6, '报销', 'baoxiao', 'icon-jizhang','', 1, 1641804488, 0);
|
INSERT INTO `oa_flow_type` VALUES (22, 5, '通用审批', 'tongyong', 'icon-zhaoshengzhunbei','', 1, 1654685923, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (23, 7, '发票', 'fapiao', 'icon-fuwuliebiao','', 1, 1642904833, 0);
|
INSERT INTO `oa_flow_type` VALUES (23, 6, '报销', 'baoxiao', 'icon-jizhang','', 1, 1641804488, 0);
|
||||||
INSERT INTO `oa_flow_type` VALUES (24, 8, '合同', 'hetong', 'icon-hetongshezhi','', 1, 1654692083, 0);
|
INSERT INTO `oa_flow_type` VALUES (24, 7, '发票', 'fapiao', 'icon-fuwuliebiao','', 1, 1642904833, 0);
|
||||||
|
INSERT INTO `oa_flow_type` VALUES (25, 8, '合同', 'hetong', 'icon-hetongshezhi','', 1, 1654692083, 0);
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for oa_flow
|
-- Table structure for oa_flow
|
||||||
@ -582,7 +583,7 @@ DROP TABLE IF EXISTS `oa_flow`;
|
|||||||
CREATE TABLE `oa_flow` (
|
CREATE TABLE `oa_flow` (
|
||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
`name` varchar(50) NOT NULL COMMENT '审批流名称',
|
`name` varchar(50) NOT NULL COMMENT '审批流名称',
|
||||||
`check_type` tinyint(4) NOT NULL COMMENT '1固定审批,2授权审批人',
|
`check_type` tinyint(4) NOT NULL COMMENT '1固定审批流,2自由审批流,3可回退的审批流',
|
||||||
`type` tinyint(4) NOT NULL COMMENT '应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同',
|
`type` tinyint(4) NOT NULL COMMENT '应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同',
|
||||||
`flow_cate` tinyint(11) NOT NULL DEFAULT 0 COMMENT '应用审批类型id',
|
`flow_cate` tinyint(11) NOT NULL DEFAULT 0 COMMENT '应用审批类型id',
|
||||||
`department_ids` varchar(500) NOT NULL DEFAULT '' COMMENT '应用部门ID（0为全部）1,2,3',
|
`department_ids` varchar(500) NOT NULL DEFAULT '' COMMENT '应用部门ID（0为全部）1,2,3',
|
||||||
@ -601,30 +602,31 @@ CREATE TABLE `oa_flow` (
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of oa_flow
|
-- Records of oa_flow
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `oa_flow` VALUES (1, '请假审批', 2, 1, 1, '', '', '请假审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644401970, 1644402071, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (1, '请假审批', 2, 1, 1, '', '', '请假审批流程', '', 1, 1644401970, 1644402071, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (2, '出差审批', 2, 1, 2, '', '', '请假审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402054, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (2, '出差审批', 2, 1, 2, '', '', '请假审批流程', '', 1, 1644402054, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (3, '外出审批', 2, 1, 3, '', '', '外出审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402116, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (3, '外出审批', 2, 1, 3, '', '', '外出审批流程', '', 1, 1644402116, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (4, '加班申请审批', 2, 1, 4, '', '', '加班申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402147, 1644456735, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (4, '加班申请审批', 2, 1, 4, '', '', '加班申请审批流程', '', 1, 1644402147, 1644456735, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (5, '会议室预定审批', 2, 2, 5, '', '', '会议室预定审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402193, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (5, '会议室预定审批', 2, 2, 5, '', '', '会议室预定审批流程', '', 1, 1644402193, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (6, '公文流转审批', 2, 2, 6, '', '', '公文流转审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402386, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (6, '公文流转审批', 2, 2, 6, '', '', '公文流转审批流程', '', 1, 1644402386, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (7, '物品维修审批', 2, 2, 7, '', '', '物品维修审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402473, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (7, '物品维修审批', 2, 2, 7, '', '', '物品维修审批流程', '', 1, 1644402473, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (8, '用章审批', 2, 2, 8, '', '', '用章审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402499, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (8, '资质借用审批', 2, 2, 8, '', '', '资质借用审批流程', '', 1, 1677661607, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (9, '用车审批', 2, 2, 9, '', '', '用车审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402525, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (9, '用章审批', 2, 2, 9, '', '', '用章审批流程', '', 1, 1644402499, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (10, '用车归还审批', 2, 2, 10, '', '', '用车归还审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402549, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (10, '用车审批', 2, 2, 10, '', '', '用车审批流程', '', 1, 1644402525, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (11, '借款申请审批', 2, 3, 11, '', '', '借款申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402611, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (11, '用车归还审批', 2, 2, 11, '', '', '用车归还审批流程', '', 1, 1644402549, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (12, '付款申请审批', 2, 3, 12, '', '', '付款申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402679, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (12, '借款申请审批', 2, 3, 12, '', '', '借款申请审批流程', '', 1, 1644402611, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (13, '奖励申请审批', 2, 3, 13, '', '', '奖励申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402705, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (13, '付款申请审批', 2, 3, 13, '', '', '付款申请审批流程', '', 1, 1644402679, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (14, '采购申请审批', 2, 3, 14, '', '', '采购申请审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402739, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (14, '奖励申请审批', 2, 3, 14, '', '', '奖励申请审批流程', '', 1, 1644402705, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (15, '活动经费审批', 2, 3, 15, '', '', '活动经费审批流程', 'a:1:{i:0;a:2:{s:9:\"flow_type\";s:1:\"1\";s:9:\"flow_uids\";s:0:\"\";}}', 1, 1644402762, 0, 1, 0, 0);
|
INSERT INTO `oa_flow` VALUES (15, '采购申请审批', 2, 3, 15, '', '', '采购申请审批流程', '', 1, 1644402739, 0, 1, 0, 0);
|
||||||
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 (16, '活动经费审批', 2, 3, 16, '', '', '活动经费审批流程', '', 1, 1644402762, 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 (17, '入职申请审批', 2, 4, 17, '', '', '入职申请审批流程', '', 1, 1644402791, 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 (18, '转正申请审批', 2, 4, 18, '', '', '转正申请审批流程', '', 1, 1644402812, 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 (19, '离职申请审批', 2, 4, 19, '', '', '离职申请审批流程', '', 1, 1644402834, 0, 1, 0, 0);
|
||||||
INSERT INTO `oa_flow` VALUES (20, '招聘需求审批', 2, 4, 20, '', '', '招聘需求审批流程', '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, 4, 20, '', '', '转岗申请审核流程', '', 1, 1654681954, 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 (21, '招聘需求审批', 2, 4, 21, '', '', '招聘需求审批流程', '', 1, 1644402855, 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 (22, '通用审批', 2, 5, 22, '', '', '通用审批流程', '', 1, 1654686338, 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 (23, '报销审批', 2, 6, 23, '', '', '报销审批流程', '', 1, 1644490024, 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);
|
INSERT INTO `oa_flow` VALUES (24, '发票审批', 2, 7, 24, '', '', '发票审批流程', '', 1, 1644490053, 0, 1, 0, 0);
|
||||||
|
INSERT INTO `oa_flow` VALUES (25, '合同审批', 2, 8, 25, '', '', '合同审批流程', '', 1, 1654692519, 0, 1, 0, 0);
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for oa_cost_cate
|
-- Table structure for oa_cost_cate
|
||||||
@ -1164,7 +1166,9 @@ CREATE TABLE `oa_approve` (
|
|||||||
`flow_id` int(11) NOT NULL DEFAULT 0 COMMENT '审批流程ID',
|
`flow_id` int(11) NOT NULL DEFAULT 0 COMMENT '审批流程ID',
|
||||||
`content` varchar(500) NOT NULL DEFAULT '' COMMENT '内容',
|
`content` varchar(500) NOT NULL DEFAULT '' COMMENT '内容',
|
||||||
`name` varchar(255) NOT NULL DEFAULT '' COMMENT '名称',
|
`name` varchar(255) NOT NULL DEFAULT '' COMMENT '名称',
|
||||||
|
`mobile` varchar(255) NOT NULL DEFAULT '' COMMENT '手机号码',
|
||||||
`remark` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',
|
`remark` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',
|
||||||
|
`remark1` varchar(500) NOT NULL DEFAULT '' COMMENT '备注1',
|
||||||
`detail_time` int(11) NOT NULL DEFAULT 0 COMMENT '时间日期',
|
`detail_time` int(11) NOT NULL DEFAULT 0 COMMENT '时间日期',
|
||||||
`start_time` int(11) NOT NULL DEFAULT 0 COMMENT '开始时间',
|
`start_time` int(11) NOT NULL DEFAULT 0 COMMENT '开始时间',
|
||||||
`end_time` int(11) NOT NULL DEFAULT 0 COMMENT '结束时间',
|
`end_time` int(11) NOT NULL DEFAULT 0 COMMENT '结束时间',
|
||||||
|
|||||||
@ -240,7 +240,7 @@ class Approve extends BaseController
|
|||||||
}
|
}
|
||||||
if (isset($param['end_time'])) {
|
if (isset($param['end_time'])) {
|
||||||
$param['end_time'] = strtotime($param['end_time']);
|
$param['end_time'] = strtotime($param['end_time']);
|
||||||
if ($param['end_time'] <= $param['start_time']) {
|
if ($param['end_time'] < $param['start_time']) {
|
||||||
return to_assign(1, "时间选择有误");
|
return to_assign(1, "时间选择有误");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -420,6 +420,7 @@ class Approve extends BaseController
|
|||||||
'flows' => $flows,
|
'flows' => $flows,
|
||||||
'id' => $id,
|
'id' => $id,
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
|
'admin_info' => get_admin($this->uid)
|
||||||
]);
|
]);
|
||||||
if(isTemplate($template)){
|
if(isTemplate($template)){
|
||||||
return view('add_'.$moban);
|
return view('add_'.$moban);
|
||||||
|
|||||||
188
app/oa/view/approve/add_zizhi.html
Normal file
188
app/oa/view/approve/add_zizhi.html
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
{extend name="../../base/view/common/base" /}
|
||||||
|
{block name="style"}
|
||||||
|
{include file="/approve/add_style" /}
|
||||||
|
{/block}
|
||||||
|
<!-- 主体 -->
|
||||||
|
{block name="body"}
|
||||||
|
<form class="layui-form p-4">
|
||||||
|
<h3 class="pb-3">资质借用审批</h3>
|
||||||
|
{eq name="$id" value="0"}
|
||||||
|
<table class="layui-table layui-table-form">
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray-2">借用人<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="name" value="" autocomplete="off" readonly placeholder="请输入借用人" lay-verify="required" lay-reqText="请输入借用人" class="layui-input picker-one"><input type="hidden" name="uid">
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray-2">借用人手机<font>*</font></td>
|
||||||
|
<td><input type="text" name="mobile" value="" autocomplete="off" placeholder="请输入借用人手机" lay-verify="required" lay-reqText="请输入借用人手机" class="layui-input"></td>
|
||||||
|
<tr>
|
||||||
|
</tr>
|
||||||
|
<td class="layui-td-gray-2">借用部门<font>*</font></td>
|
||||||
|
<td colspan="3">
|
||||||
|
<select name="department_type" lay-verify="required" lay-reqText="请选择借用部门">
|
||||||
|
<option value="">--请选择--</option>
|
||||||
|
{volist name=":get_department()" id="vo"}
|
||||||
|
<option value="{$vo.id}">{$vo.title}</option>
|
||||||
|
{/volist}
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用类型<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<select name="detail_type" lay-verify="required" lay-reqText="请选择">
|
||||||
|
<option value="">--请选择--</option>
|
||||||
|
<option value="1">原件</option>
|
||||||
|
<option value="2">扫描件</option>
|
||||||
|
<option value="3">复印件</option>
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray">档案类型<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<select name="other_type" lay-verify="required" lay-reqText="请选择">
|
||||||
|
<option value="">--请选择--</option>
|
||||||
|
<option value="1">公司资质</option>
|
||||||
|
<option value="2">人员资质</option>
|
||||||
|
<option value="3">离职/清退人员资质</option>
|
||||||
|
<option value="4">注册人员执业印章</option>
|
||||||
|
<option value="5">劳动合同</option>
|
||||||
|
<option value="6">社保缴费记录</option>
|
||||||
|
<option value="7">收入证明</option>
|
||||||
|
<option value="8">其它</option>
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">所借档案用途<font>*</font></td>
|
||||||
|
<td colspan="3">
|
||||||
|
<textarea name="content" placeholder="请输入所借档案用途" class="layui-textarea" lay-verify="required" lay-reqText="请输入所借档案用途"></textarea></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用日期<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<input type="text" id="start_time" name="start_time" class="layui-input" value="" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray-2">拟归还日期<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<input type="text" id="end_time" name="end_time" value="" readonly placeholder="请选择时间" lay-verify="required" lay-reqText="请选择时间" class="layui-input">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用档案明细<font>*</font</td>
|
||||||
|
<td colspan="3">
|
||||||
|
<textarea name="remark" placeholder="请输入借用档案明细" class="layui-textarea" lay-verify="required" lay-reqText="请输入借用档案明细"></textarea>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">备注</td>
|
||||||
|
<td colspan="3">
|
||||||
|
<textarea name="remark1" placeholder="请输入备注" class="layui-textarea"></textarea>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
{else/}
|
||||||
|
<table class="layui-table layui-table-form">
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray-2">借用人<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="name" value="{$detail.name}" autocomplete="off" readonly placeholder="请输入借用人" lay-verify="required" lay-reqText="请输入借用人" class="layui-input picker-one"><input type="hidden" name="uid">
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray-2">借用人手机<font>*</font></td>
|
||||||
|
<td><input type="text" name="mobile" value="{$detail.mobile}" autocomplete="off" placeholder="请输入借用人手机" lay-verify="required" lay-reqText="请输入借用人手机" class="layui-input"></td>
|
||||||
|
<tr>
|
||||||
|
</tr>
|
||||||
|
<td class="layui-td-gray-2">借用部门<font>*</font></td>
|
||||||
|
<td colspan="3">
|
||||||
|
<select name="department_type" lay-verify="required" lay-reqText="请选择借用部门">
|
||||||
|
<option value="">--请选择--</option>
|
||||||
|
{volist name=":get_department()" id="vo"}
|
||||||
|
<option value="{$vo.id}" {eq name="$vo.id" value="$detail.department_type"}selected=""{/eq}>{$vo.title}</option>
|
||||||
|
{/volist}
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用类型<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<select name="detail_type" lay-verify="required" lay-reqText="请选择">
|
||||||
|
<option value="">--请选择--</option>
|
||||||
|
<option value="1" {eq name="$detail.detail_type" value="1"}selected=""{/eq}>原件</option>
|
||||||
|
<option value="2" {eq name="$detail.detail_type" value="2"}selected=""{/eq}>扫描件</option>
|
||||||
|
<option value="3" {eq name="$detail.detail_type" value="3"}selected=""{/eq}>复印件</option>
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray">档案类型<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<select name="other_type" lay-verify="required" lay-reqText="请选择">
|
||||||
|
<option value="">--请选择--</option>
|
||||||
|
<option value="1" {eq name="$detail.other_type" value="1"}selected=""{/eq}>公司资质</option>
|
||||||
|
<option value="2" {eq name="$detail.other_type" value="2"}selected=""{/eq}>人员资质</option>
|
||||||
|
<option value="3" {eq name="$detail.other_type" value="3"}selected=""{/eq}>离职/清退人员资质</option>
|
||||||
|
<option value="4" {eq name="$detail.other_type" value="4"}selected=""{/eq}>注册人员执业印章</option>
|
||||||
|
<option value="5" {eq name="$detail.other_type" value="5"}selected=""{/eq}>劳动合同</option>
|
||||||
|
<option value="6" {eq name="$detail.other_type" value="6"}selected=""{/eq}>社保缴费记录</option>
|
||||||
|
<option value="7" {eq name="$detail.other_type" value="7"}selected=""{/eq}>收入证明</option>
|
||||||
|
<option value="8" {eq name="$detail.other_type" value="8"}selected=""{/eq}>其它</option>
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">所借档案用途<font>*</font></td>
|
||||||
|
<td colspan="3">
|
||||||
|
<textarea name="content" placeholder="请输入所借档案用途" class="layui-textarea" lay-verify="required" lay-reqText="请输入所借档案用途">{$detail.content}</textarea></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用日期<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<input type="text" id="start_time" name="start_time" class="layui-input" value="{$detail.start_time|date='Y-m-d'}" readonly lay-verify="required" placeholder="请选择时间" lay-reqText="请选择时间">
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray-2">拟归还日期<font>*</font></td>
|
||||||
|
<td>
|
||||||
|
<input type="text" id="end_time" name="end_time" value="{$detail.end_time|date='Y-m-d'}" readonly placeholder="请选择时间" lay-verify="required" lay-reqText="请选择时间" class="layui-input">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用档案明细<font>*</font></td>
|
||||||
|
<td colspan="3">
|
||||||
|
<textarea name="remark" placeholder="请输入借用档案明细" class="layui-textarea" lay-verify="required" lay-reqText="请输入借用档案明细">{$detail.remark}</textarea>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">备注</td>
|
||||||
|
<td colspan="3">
|
||||||
|
<textarea name="remark1" placeholder="请输入备注" class="layui-textarea">{$detail.remark1}</textarea>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
{/eq}
|
||||||
|
{include file="/approve/add_flow" /}
|
||||||
|
</form>
|
||||||
|
{/block}
|
||||||
|
<!-- /主体 -->
|
||||||
|
|
||||||
|
<!-- 脚本 -->
|
||||||
|
{block name="script"}
|
||||||
|
<script>
|
||||||
|
const moduleInit = ['tool','employeepicker'];
|
||||||
|
function gouguInit() {
|
||||||
|
var form = layui.form,tool=layui.tool, employeepicker = layui.employeepicker,laydate = layui.laydate;
|
||||||
|
if (typeof (flowStep) == "function") {
|
||||||
|
flowStep();
|
||||||
|
}
|
||||||
|
//日期时间范围
|
||||||
|
laydate.render({
|
||||||
|
elem: '#start_time',
|
||||||
|
type: 'date',
|
||||||
|
format: 'yyyy-MM-dd',
|
||||||
|
showBottom: false
|
||||||
|
});
|
||||||
|
laydate.render({
|
||||||
|
elem: '#end_time',
|
||||||
|
type: 'date',
|
||||||
|
format: 'yyyy-MM-dd',
|
||||||
|
showBottom: false
|
||||||
|
});
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
{/block}
|
||||||
|
<!-- /脚本 -->
|
||||||
71
app/oa/view/approve/view_zizhi.html
Normal file
71
app/oa/view/approve/view_zizhi.html
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
{extend name="../../base/view/common/base" /}
|
||||||
|
{block name="style"}
|
||||||
|
{include file="/approve/view_style" /}
|
||||||
|
{/block}
|
||||||
|
<!-- 主体 -->
|
||||||
|
{block name="body"}
|
||||||
|
<form class="layui-form p-4">
|
||||||
|
<h3 class="pb-3">资质借用审批</h3>
|
||||||
|
<table class="layui-table layui-table-form">
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray-2">借用人</td>
|
||||||
|
<td>{$detail.name}</td>
|
||||||
|
<td class="layui-td-gray-2">借用人手机</td>
|
||||||
|
<td>{$detail.mobile}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray-2">借用部门</td>
|
||||||
|
<td colspan="3">
|
||||||
|
{volist name=":get_department()" id="vo"}
|
||||||
|
{eq name="$detail.department_type" value="$vo.id"}{$vo.title}{/eq}
|
||||||
|
{/volist}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用类型</td>
|
||||||
|
<td>
|
||||||
|
{eq name="$detail.detail_type" value="1"}原件{/eq}
|
||||||
|
{eq name="$detail.detail_type" value="2"}扫描件{/eq}
|
||||||
|
{eq name="$detail.detail_type" value="3"}复印件{/eq}
|
||||||
|
</td>
|
||||||
|
<td class="layui-td-gray">档案类型</td>
|
||||||
|
<td>
|
||||||
|
{eq name="$detail.other_type" value="1"}公司资质{/eq}
|
||||||
|
{eq name="$detail.other_type" value="2"}人员资质{/eq}
|
||||||
|
{eq name="$detail.other_type" value="3"}离职/清退人员资质{/eq}
|
||||||
|
{eq name="$detail.other_type" value="4"}注册人员执业印章{/eq}
|
||||||
|
{eq name="$detail.other_type" value="5"}劳动合同{/eq}
|
||||||
|
{eq name="$detail.other_type" value="6"}社保缴费记录{/eq}
|
||||||
|
{eq name="$detail.other_type" value="7"}收入证明{/eq}
|
||||||
|
{eq name="$detail.other_type" value="8"}其它{/eq}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">所借档案用途</td>
|
||||||
|
<td colspan="3">{$detail.content}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用日期</td>
|
||||||
|
<td>{$detail.start_time|date='Y-m-d'}</td>
|
||||||
|
<td class="layui-td-gray-2">拟归还日期</td>
|
||||||
|
<td>{$detail.end_time|date='Y-m-d'}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">借用档案明细</td>
|
||||||
|
<td colspan="3">{$detail.remark}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="layui-td-gray">备注</td>
|
||||||
|
<td colspan="3">{$detail.remark1}</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
{include file="/approve/view_step" /}
|
||||||
|
</div>
|
||||||
|
{/block}
|
||||||
|
<!-- /主体 -->
|
||||||
|
|
||||||
|
<!-- 脚本 -->
|
||||||
|
{block name="script"}
|
||||||
|
{include file="/approve/view_script" /}
|
||||||
|
{/block}
|
||||||
|
<!-- /脚本 -->
|
||||||
Loading…
x
Reference in New Issue
Block a user