Jonlin 6 лет назад
Родитель
Сommit
f15703c33b

+ 49 - 4
application/admin/controller/Admins.php

@@ -202,24 +202,56 @@ class Admins extends Base
     public function addpower()
     {
         if (request()->isPost()) {
-
+            $menu = db('menu')->select();
             $param = input('post.');
 
-            $has = db('admingroup')->field('group_id')->where('group_name', $param['group_name'])->find();
+            $has = db('admingroup')->where('group_name', $param['group_name'])->find();
             if (!empty($has)) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该权限组已经存在']);
             }
-
+            $info=array();
+            $info['group_name'] = $param['group_name'];
+            $info['status'] = $param['status'];
+            $info['addtime'] = time();
             try {
-                db('admingroup')->insert($param);
+                $group_id = db('admingroup')->insertGetId($info);
             } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
+            $data=array();
+            for($i=0;$i<count($menu);$i++){
+                if($param[$menu[$i]['name_cn']] != 0){
+                    $data[]  = [
+                        'group_id' => $group_id,
+                        'menu_id' => $param[$menu[$i]['name_cn']],
+                    ] ;
+                }
+            }
+            if(!empty($data)){
+                try {
+                    db('admingrouppower')->where('group_id',$param['group_id'])->delete();
+                    db('admingrouppower')->insertAll($data);
+                } catch (\Exception $e) {
+                    return json(['code' => -3, 'data' => '', 'msg' => $e->getMessage()]);
+                }
+            }
+
             return json(['code' => 1, 'data' => '', 'msg' => '添加权限组成功']);
         }
+        $menu = db('menu')->where('p_id',0)->select();
+        $menulist = db('menu')->where('p_id','<>',0)->select();
+        for($i=0;$i<count($menu);$i++){
+            for($j=0;$j<count($menulist);$j++){
+                $menulist[$j]['class'] = $menu[$i]['ico'];
+                if($menu[$i]['id'] == $menulist[$j]['p_id']){
+                    $menu[$i]['menulist'][$j] = $menulist[$j];
+                }
+            }
+        }
 
         $this->assign([
+            'info' => $menu,
             'status' => config('kf_status')
         ]);
 
@@ -235,6 +267,16 @@ class Admins extends Base
 
             $menu = db('menu')->select();
             $param = input('post.');
+
+            $has = db('admingroup')->where('group_name',$param['group_name'])->where('group_id','<>',$param['group_id'])->find();
+            if (!empty($has)) {
+                return json(['code' => -1, 'data' => '', 'msg' => '该权限组已经存在']);
+            }
+            $info=array();
+            $info['group_name'] = $param['group_name'];
+            $info['status'] = $param['status'];
+            $info['addtime'] = time();
+
             $data=array();
             for($i=0;$i<count($menu);$i++){
                 if($param[$menu[$i]['name_cn']] != 0){
@@ -246,6 +288,7 @@ class Admins extends Base
             }
             if(!empty($data)){
                 try {
+                    db('admingroup')->where('group_id',$param['group_id'])->update($info);
                     db('admingrouppower')->where('group_id',$param['group_id'])->delete();
                     db('admingrouppower')->insertAll($data);
                 } catch (\Exception $e) {
@@ -287,10 +330,12 @@ class Admins extends Base
                 }
             }
         }
+        $admingroup = db('admingroup')->where('group_id',$id)->find();
 
         $this->assign([
             'info' => $menu,
             'id' => $id,
+            'admingroup' => $admingroup,
             'status' => config('kf_status')
         ]);
         return $this->fetch();

+ 3 - 3
application/admin/controller/Users.php

@@ -102,9 +102,9 @@ class Users extends Base
                 return json(['code' => -3, 'data' => '', 'msg' => '请选择分组']);
             }
             // 检测头像
-            if(empty($param['user_avatar'])){
-                return json(['code' => -4, 'data' => '', 'msg' => '请上传头像']);
-            }
+//            if(empty($param['user_avatar'])){
+//                return json(['code' => -4, 'data' => '', 'msg' => '请上传头像']);
+//            }
 
             $param['user_pwd'] = md5('123456' . config('salt'));
             $param['online'] = 2; // 离线状态

+ 24 - 4
application/admin/view/admins/addpower.html

@@ -20,7 +20,7 @@
                     <h5>添加权限组</h5>
                 </div>
                 <div class="ibox-content">
-                    <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('admins/addPower')}">
+                    <form class="form-horizontal m-t" id="commentForm" method="post" action="{:url('admins/addPower')}">
 
                         <div class="form-group">
                             <label class="col-sm-3 control-label">权限组名称:</label>
@@ -28,12 +28,32 @@
                                 <input id="group_name" type="text" class="form-control" name="group_name" required="" aria-required="true">
                             </div>
                         </div>
-                        <div class="form-group layui-form-item">
+                        <div class="form-group">
                             <label class="col-sm-3 control-label">是否启用:</label>
-                            <div class="input-group col-sm-6">
+                            <div class="input-group col-sm-6" style="margin-top: 5px;">
                                 {if !empty($status)}
                                 {foreach name="status" item="vo" key="key"}
-                                <input type="radio" name="status" value="{$key}" title="{$vo}" {if $key eq 1}checked{/if}>
+                                <input type="radio" name="status" value="{$key}" title="{$vo}" {if $key eq 1}checked{/if}>{$vo}
+                                {/foreach}
+                                {/if}
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">选择权限:</label>
+                            <div class="input-group col-sm-6" style="margin-top: 5px;">
+                                <input type="text" style="display:none;" name="group_id" value="">
+                                {if !empty($info)}
+                                {foreach name="info" item="vo" key="key"}
+                                <div class="form-group" style="margin:0px;">
+                                    <input type="hidden" name="{$vo['name_cn']}" value="0">
+                                    <input type="checkbox" level='1' name="{$vo['name_cn']}" value="{$vo['id']}"><span style="font-weight: 600;">{$vo['name_cn']}:</span><br>
+                                    <div style="margin:5px 20px;">
+                                        {foreach name="$vo['menulist']" item="vo" key="key"}
+                                        <input type="hidden" name="{$vo['name_cn']}" value="0">
+                                        <input class="menulist" level='2' id="menulist"  type="checkbox" name="{$vo['name_cn']}" value="{$vo['id']}">{$vo['name_cn']}
+                                        {/foreach}
+                                    </div>
+                                </div>
                                 {/foreach}
                                 {/if}
                             </div>

+ 35 - 14
application/admin/view/admins/editpower.html

@@ -30,25 +30,46 @@
                 <div class="ibox-content">
                     <!--<form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('admins/editpower')}">-->
                     <form class="form-horizontal m-t" id="commentForm" method="post" action="{:url('admins/editpower')}">
-                        <h4>选择权限:</h4><br>
-                        <input type="text" style="display:none;" name="group_id" value="{$id}">
-                        {if !empty($info)}
-                        {foreach name="info" item="vo" key="key"}
-                        <div class="form-group" style="margin:5px 20px;">
-                            <input type="hidden" name="{$vo['name_cn']}" value="0">
-                            <input type="checkbox" level='1' name="{$vo['name_cn']}" value="{$vo['id']}" {if$vo['power']==1} checked {/if} ><span style="font-weight: 600;">{$vo['name_cn']}:</span><br>
-                            <div style="margin:5px 20px;">
-                                {foreach name="$vo['menulist']" item="vo" key="key"}
-                                <input type="hidden" name="{$vo['name_cn']}" value="0">
-                                <input class="menulist" level='2' id="menulist"  type="checkbox" name="{$vo['name_cn']}" value="{$vo['id']}" {if$vo['power']==1} checked {/if} >{$vo['name_cn']}
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">权限组名称:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="group_name" type="text" class="form-control" name="group_name" required="" aria-required="true" value="{$admingroup['group_name']}">
+                            </div>
+                        </div>
+                        <div class="form-group layui-form-item">
+                            <label class="col-sm-3 control-label">是否启用:</label>
+                            <div class="input-group col-sm-6" style="margin-top: 5px;">
+                                {if !empty($status)}
+                                {foreach name="status" item="vo" key="key"}
+                                <input type="radio" name="status" value="{$key}" title="{$vo}" {if $admingroup['status'] == $key}checked{/if}>{$vo}
                                 {/foreach}
+                                {/if}
                             </div>
                         </div>
-                        {/foreach}
-                        {/if}
+                        <div class="form-group layui-form-item">
+                            <label class="col-sm-3 control-label">选择权限:</label>
+                            <div class="input-group col-sm-6"  style="margin-top: 5px;">
+                                <input type="text" style="display:none;" name="group_id" value="{$id}">
+                                {if !empty($info)}
+                                {foreach name="info" item="vo" key="key"}
+                                <div class="form-group" style="margin:0px;">
+                                    <input type="hidden" name="{$vo['name_cn']}" value="0">
+                                    <input type="checkbox" level='1' name="{$vo['name_cn']}" value="{$vo['id']}" {if$vo['power']==1} checked {/if} ><span style="font-weight: 600;">{$vo['name_cn']}:</span><br>
+                                    <div style="margin:5px 20px;">
+                                        {foreach name="$vo['menulist']" item="vo" key="key"}
+                                        <input type="hidden" name="{$vo['name_cn']}" value="0">
+                                        <input class="menulist" level='2' id="menulist"  type="checkbox" name="{$vo['name_cn']}" value="{$vo['id']}" {if$vo['power']==1} checked {/if} >{$vo['name_cn']}
+                                        {/foreach}
+                                    </div>
+                                </div>
+                                {/foreach}
+                                {/if}
+                            </div>
+                        </div>
+
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>
+                                <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
                                 <button class="btn btn-primary" type="submit">提交</button>
                             </div>
                         </div>