修复菜单节点过多的时候，数据表字段长度不够的问题，审核模块新增应用到部门功能
This commit is contained in:
hdm
parent
367672e081
commit
3e02defc49
@ -37,6 +37,11 @@ class Cate extends BaseController
|
||||
$value['type_name'] = $val['title'];
|
||||
}
|
||||
}
|
||||
$value['department']='全公司';
|
||||
if($value['department_ids']!=''){
|
||||
$department = Db::name('Department')->whereIn('id',$value['department_ids'])->column('title');
|
||||
$value['department'] = implode(',',$department);
|
||||
}
|
||||
}
|
||||
return to_assign(0, '', $cate);
|
||||
} else {
|
||||
|
||||
@ -278,7 +278,6 @@ class Index extends BaseController
|
||||
{
|
||||
if (request()->isAjax()) {
|
||||
$param = get_params();
|
||||
//set_system_config('other','theme',$param['theme']);
|
||||
Db::name('Admin')->where('id',$this->uid)->update(['theme'=>$param['theme']]);
|
||||
return to_assign();
|
||||
}
|
||||
|
||||
@ -27,13 +27,14 @@
|
||||
,cellMinWidth: 120
|
||||
,cols: [[
|
||||
{field:'id',width:80, title: 'ID号', align:'center'}
|
||||
,{field:'title',title: '审批类型名称'}
|
||||
,{field:'name',title: '审批类型标识'}
|
||||
,{field:'icon',title: '审批类型图标',templet: function(d){
|
||||
,{field:'title',title: '名称',width:120}
|
||||
,{field:'department',title: '应用部门'}
|
||||
,{field:'name',title: '标识',width:150}
|
||||
,{field:'icon',title: '图标',width:220,templet: function(d){
|
||||
var html='<strong class="iconfont '+d.icon+'"></strong> '+d.icon;
|
||||
return html;
|
||||
}}
|
||||
,{field:'type_name', title: '所属分类',width:100,align:'center'}
|
||||
,{field:'type_name', title: '所属分类',width:90,align:'center'}
|
||||
,{field:'status', title: '状态',width:80,align:'center',templet: function(d){
|
||||
var html1='<span class="green">正常</span>';
|
||||
var html2='<span class="yellow">禁用</span>';
|
||||
|
||||
@ -20,6 +20,15 @@
|
||||
<input type="text" name="title" autocomplete="off" placeholder="请输入审批类型名称" lay-verify="required" lay-reqText="请输入审批类型名称" class="layui-input">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="layui-td-gray">应用部门</td>
|
||||
<td colspan="3">
|
||||
<div class="layui-input-inline" style="width:360px;">
|
||||
<select id="department_ids" name="department_ids" xm-selected="" xm-select="select1" xm-select-skin="default"></select>
|
||||
</div>
|
||||
<span class="red" style="font-size:12px;">（如果不选，默认是全公司）</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="layui-td-gray">标识<font>*</font></td>
|
||||
<td>
|
||||
@ -54,6 +63,15 @@
|
||||
<input type="text" name="title" value="{$detail.title}" placeholder="请输入审批类型名称" lay-verify="required" lay-reqText="请输入审批类型名称" class="layui-input">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="layui-td-gray">应用部门</td>
|
||||
<td colspan="3">
|
||||
<div class="layui-input-inline" style="width:360px;">
|
||||
<select id="department_ids" name="department_ids" xm-selected="{$detail.department_ids}" xm-select="select1" xm-select-skin="default"></select>
|
||||
</div>
|
||||
<span class="red" style="font-size:12px;">（如果不选，默认是全公司）</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="layui-td-gray">标识<font>*</font></td>
|
||||
<td>
|
||||
@ -79,9 +97,15 @@
|
||||
<!-- 脚本 -->
|
||||
{block name="script"}
|
||||
<script>
|
||||
const moduleInit = ['tool'];
|
||||
const moduleInit = ['tool','formSelects'];
|
||||
function gouguInit() {
|
||||
var form = layui.form,tool=layui.tool;
|
||||
var form = layui.form,tool=layui.tool,formSelects=layui.formSelects;
|
||||
//选择应用部门
|
||||
var selcted = $('#department_ids').attr('xm-selected');
|
||||
formSelects.data('select1', 'server', {
|
||||
url: '/api/index/get_department_select',
|
||||
keyword: selcted,
|
||||
});
|
||||
//监听提交
|
||||
form.on('submit(webform)', function(data){
|
||||
let callback = function (e) {
|
||||
|
||||
@ -39,8 +39,10 @@
|
||||
<tr>
|
||||
<td class="layui-td-gray">应用部门</td>
|
||||
<td colspan="5">
|
||||
<select id="department_ids" name="department_ids" xm-selected="" xm-select="select1" xm-select-skin="default"></select>
|
||||
<p style="padding:6px 0 0; font-size:12px; color:#999">不选，默认是全公司</p>
|
||||
<div class="layui-input-inline" style="width:360px;">
|
||||
<select id="department_ids" name="department_ids" xm-selected="" xm-select="select1" xm-select-skin="default"></select>
|
||||
</div>
|
||||
<span class="red" style="font-size:12px;">（如果不选，默认是全公司）</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -167,8 +169,10 @@
|
||||
<tr>
|
||||
<td class="layui-td-gray">应用部门</td>
|
||||
<td colspan="5">
|
||||
<select id="department_ids" name="department_ids" xm-selected="{$detail.department_ids}" xm-select="select1" xm-select-skin="default"></select>
|
||||
<p style="padding:6px 0 0; font-size:12px; color:#999">不选，默认是全公司</p>
|
||||
<div class="layui-input-inline" style="width:360px;">
|
||||
<select id="department_ids" name="department_ids" xm-selected="{$detail.department_ids}" xm-select="select1" xm-select-skin="default"></select>
|
||||
</div>
|
||||
<span class="red" style="font-size:12px;">（如果不选，默认是全公司）</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@ -382,7 +382,7 @@ CREATE TABLE `oa_admin_group` (
|
||||
`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`title` varchar(255) NOT NULL DEFAULT '',
|
||||
`status` int(1) NOT NULL DEFAULT 1,
|
||||
`rules` varchar(1000) NULL DEFAULT '' COMMENT '用户组拥有的规则id， 多个规则\",\"隔开',
|
||||
`rules` text NULL COMMENT '用户组拥有的规则id',
|
||||
`desc` text NULL COMMENT '备注',
|
||||
`create_time` int(11) NOT NULL DEFAULT 0,
|
||||
`update_time` int(11) NOT NULL DEFAULT 0,
|
||||
@ -532,6 +532,7 @@ CREATE TABLE `oa_flow_type` (
|
||||
`title` varchar(100) NOT NULL DEFAULT '' COMMENT '审批名称',
|
||||
`name` varchar(100) NOT NULL DEFAULT '' COMMENT '审批标识',
|
||||
`icon` varchar(255) NOT NULL DEFAULT '' COMMENT '图标',
|
||||
`department_ids` varchar(255) NOT NULL DEFAULT '' COMMENT '应用部门ID（空为全部）1,2,3',
|
||||
`status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：-1删除 0禁用 1启用',
|
||||
`create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间',
|
||||
`update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间',
|
||||
@ -541,30 +542,30 @@ CREATE TABLE `oa_flow_type` (
|
||||
-- ----------------------------
|
||||
-- Records of oa_flow_type
|
||||
-- ----------------------------
|
||||
INSERT INTO `oa_flow_type` VALUES (1, 1, '请假', 'qingjia', 'icon-kechengziyuanguanli', 1, 1639896302, 0);
|
||||
INSERT INTO `oa_flow_type` VALUES (2, 1, '出差', 'chuchai', 'icon-jiaoshiguanli', 1, 1641802838, 0);
|
||||
INSERT INTO `oa_flow_type` VALUES (3, 1, '外出', 'waichu', 'icon-tuiguangguanli', 1, 1641802858, 0);
|
||||
INSERT INTO `oa_flow_type` VALUES (4, 1, '加班', 'jiaban', 'icon-xueshengchengji', 1, 1641802892, 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 (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 (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-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);
|
||||
INSERT INTO `oa_flow_type` VALUES (1, 1, '请假', 'qingjia', 'icon-kechengziyuanguanli','', 1, 1639896302, 0);
|
||||
INSERT INTO `oa_flow_type` VALUES (2, 1, '出差', 'chuchai', 'icon-jiaoshiguanli','', 1, 1641802838, 0);
|
||||
INSERT INTO `oa_flow_type` VALUES (3, 1, '外出', 'waichu', 'icon-tuiguangguanli','', 1, 1641802858, 0);
|
||||
INSERT INTO `oa_flow_type` VALUES (4, 1, '加班', 'jiaban', 'icon-xueshengchengji','', 1, 1641802892, 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 (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 (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-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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for oa_city
|
||||
-- Table structure for oa_city（省市区）
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `oa_city`;
|
||||
CREATE TABLE `oa_city` (
|
||||
|
||||
@ -53,7 +53,22 @@ class Approve extends BaseController
|
||||
});
|
||||
return table_assign(0, '', $list);
|
||||
} else {
|
||||
$list = Db::name('FlowType')->where(['status'=>1])->select()->toArray();
|
||||
$uid = $this->uid;
|
||||
$department = $this->did;
|
||||
if($uid==1){
|
||||
$list = Db::name('FlowType')->where(['status'=>1])->select()->toArray();
|
||||
}
|
||||
else{
|
||||
$map1 = [];
|
||||
$map2 = [];
|
||||
$map1[] = ['status', '=', 1];
|
||||
$map1[] = ['department_ids', '=', ''];
|
||||
|
||||
$map2[] = ['status', '=', 1];
|
||||
$map2[] = ['', 'exp', Db::raw("FIND_IN_SET('{$department}',department_ids)")];
|
||||
|
||||
$list = Db::name('FlowType')->whereOr([$map1,$map2])->select()->toArray();
|
||||
}
|
||||
View::assign('list', $list);
|
||||
View::assign('type', get_config('approve.type'));
|
||||
return view();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user