tttt

application/admin/controller/Intention.php

@@ -17,6 +17,12 @@ class Intention extends Backend
 {
     //快速搜索的字段
     protected $searchFields = ['unit_name','contacts'];
+
+    /**
+     * 无需鉴权的方法,但需要登录
+     * @var array
+     */
+    protected $noNeedRight = ['unittypelist'];
     
     /**
      * Intention模型对象
@@ -36,6 +42,7 @@ class Intention extends Backend
      */
     public function index()
     {
+
         //设置过滤方法
         $this->request->filter(['strip_tags']);
         if ($this->request->isAjax())
@@ -46,6 +53,7 @@ class Intention extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
             $total = $this->model
                 ->where($where)
                 ->order($sort, $order)
@@ -91,7 +99,8 @@ class Intention extends Backend
                     $params['usr_id'] = Session::get('admin')['id'];      //usr id
                     $params['usr_nickname'] = Session::get('admin')['nickname'];      //nickname
                     $params['created_at'] = date('Y-m-d H:i:s');    //创建时间
-                    $params['usr_depart'] = AuthGroupAccess::getGroupName($params['usr_id']);   //获取所属组名
+                    $params['usr_depart'] = Session::get('admin')['usr_depart'];   //获取所属组名
+                    $params['depart_id'] = Session::get('admin')['depart_id'];   //获取所属组id
                     \app\admin\model\Intention::addUnitType($params['unit_type']);
 
 

application/admin/controller/Protector.php

@@ -156,8 +156,9 @@ class Protector extends Backend
                     $protect_day = Session::get('admin')['protect_day'];        //保护天数
                     $free_day = Session::get('admin')['free_day'];              // 冻结天数
 
-                    //  获取所属组名
-                    $params['usr_depart'] = AuthGroupAccess::getGroupName($params['usr_id']);
+                    //  获取所属组名,id
+                    $params['usr_depart'] = Session::get('admin')['usr_depart'];   //获取所属组名
+                    $params['depart_id'] = Session::get('admin')['depart_id'];   //获取所属组id
 
                     //  获取到期时间和冻结到期时间
                     $params['ex_date'] = date('Y-m-d',strtotime("+".$protect_day." day"));    //保护到期时间
@@ -421,6 +422,12 @@ class Protector extends Backend
         }
     }
 
+    public function departList()
+    {
+
+    }
+
+
 
 
 

application/admin/controller/auth/Group.php

@@ -21,7 +21,7 @@ class Group extends Backend
     //当前组别列表数据
     protected $groupdata = [];
     //无需要权限判断的方法
-    protected $noNeedRight = ['roletree'];
+    protected $noNeedRight = ['roletree','departlist'];
 
     public function _initialize()
     {
@@ -315,4 +315,13 @@ class Group extends Backend
         }
     }
 
+    public function departList()
+    {
+
+        return $this->groupdata;
+    }
+
+
+
+
 }

application/admin/library/Auth.php

@@ -3,6 +3,7 @@
 namespace app\admin\library;
 
 use app\admin\model\Admin;
+use app\admin\model\AuthGroupAccess;
 use fast\Random;
 use fast\Tree;
 use think\Config;
@@ -59,7 +60,12 @@ class Auth extends \fast\Auth
         $admin->loginfailure = 0;
         $admin->logintime = time();
         $admin->token = Random::uuid();
+        $group = AuthGroupAccess::getGroupName($admin['id']);
+
         $admin->save();
+        $admin->usr_depart = $group['name'];
+        $admin->depart_id = $group['id'];
+
         Session::set("admin", $admin->toArray());
         $this->keeplogin($keeptime);
         return true;

application/admin/model/AuthGroupAccess.php

@@ -7,6 +7,8 @@ use think\Model;
 class AuthGroupAccess extends Model
 {
 
+
+
     /**
      * 获取所属组名
      * @param $usr_id
@@ -14,10 +16,12 @@ class AuthGroupAccess extends Model
      */
     public static function getGroupName($usr_id)
     {
-        $name = self::where('uid',$usr_id)
+        $name = self::where('a.uid',$usr_id)
             ->alias('a')
-            ->join(['auth_group'=>'g'],'a.uid')
-            ->value('g.name');
+            ->join(['auth_group'=>'g'],'a.group_id = g.id')
+            ->field('g.name,g.id')
+            ->find();
+
         if($name){
             return $name;
         }

application/admin/view/common/menu.html

@@ -29,10 +29,10 @@
     <!--如果想始终显示子菜单,则给ul加上show-submenu类即可-->
     <ul class="sidebar-menu">
         {$menulist}
-        <li class="header" data-rel="external">{:__('Links')}</li>
-        <li data-rel="external"><a href="https://doc.fastadmin.net" target="_blank"><i class="fa fa-list text-red"></i> <span>{:__('Docs')}</span></a></li>
-        <li data-rel="external"><a href="https://forum.fastadmin.net" target="_blank"><i class="fa fa-comment text-yellow"></i> <span>{:__('Forum')}</span></a></li>
-        <li data-rel="external"><a href="https://jq.qq.com/?_wv=1027&k=487PNBb" target="_blank"><i class="fa fa-qq text-aqua"></i> <span>{:__('QQ qun')}</span></a></li>
+        <!--<li class="header" data-rel="external">{:__('Links')}</li>-->
+        <!--<li data-rel="external"><a href="https://doc.fastadmin.net" target="_blank"><i class="fa fa-list text-red"></i> <span>{:__('Docs')}</span></a></li>-->
+        <!--<li data-rel="external"><a href="https://forum.fastadmin.net" target="_blank"><i class="fa fa-comment text-yellow"></i> <span>{:__('Forum')}</span></a></li>-->
+        <!--<li data-rel="external"><a href="https://jq.qq.com/?_wv=1027&k=487PNBb" target="_blank"><i class="fa fa-qq text-aqua"></i> <span>{:__('QQ qun')}</span></a></li>-->
     </ul>
 </section>
 <!-- /.sidebar -->

application/database.php

@@ -22,7 +22,7 @@ return [
     // 用户名
     'username'        => Env::get('database.username', 'root'),
     // 密码
-    'password'        => Env::get('database.password', '123456'),
+    'password'        => Env::get('database.password', ''),
     // 端口
     'hostport'        => Env::get('database.hostport', ''),
     // 连接dsn

public/assets/js/addons.js

@@ -1,3 +1,8 @@
-define([], function () {
-    
-});
+define([], function () {});
+
+//获取url参数
+function GetQueryString(name) {
+    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+    var r = window.location.search.substr(1).match(reg);
+    if (r != null) return unescape(r[2]);return null;
+}

public/assets/js/backend/comment.js

@@ -1,6 +0,0 @@
-//获取url参数
-function GetQueryString(name) {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-    var r = window.location.search.substr(1).match(reg);
-    if (r != null) return unescape(r[2]);return null;
-}

public/assets/js/backend/intention.js

@@ -27,15 +27,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'selectpage'], functi
                     [
                         {field: 'unit_name', title: __('Unit_name')},
                         {field: 'contacts', title: __('Contacts')},
-                        {field: 'con_position', title: __('Con_position')},
-                        {field: 'unit_type', title: __('Unit_type')},
-                        {field: 'number', title: __('Number')},
+                        {field: 'con_position', title: __('Con_position'), searchable: false},
+                        {field: 'unit_type', title: __('Unit_type'), searchable: false},
+                        {field: 'number', title: __('Number'), searchable: false},
                         {field: 'price', title: '单价', formatter:function (value) {
                                 return '¥  ' + value;
                         }},
                         {field: 'usr_nickname', title: '操作人'},
-                        {field: 'usr_depart', title: '操作人部门'},
-                        {field: 'created_at', title: '创建时间', operate:'RANGE', addclass:'datetimerange'},
+                        {field: 'depart_id', title: '操作人部门',searchList: $.getJSON('auth/group/departList'),formatter:function (value, row) {
+                                return row.usr_depart;
+                        }},
+                        {field: 'created_at', title: '创建时间', operate:'RANGE', addclass:'datetimerange', searchable: false},
                         // {field: 'operate', title: __('Operate'),
                         //     table: table, events: Table.api.events.operate,
                         //     formatter: Table.api.formatter.operate,

public/assets/js/backend/protector.js

@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'comment'], function ($, undefined, Backend, Table, Form, Comment) {
+define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'comment', 'selectpage'], function ($, undefined, Backend, Table, Form, Comment, Selectpage) {
 
     var Controller = {
         index: function () {
@@ -28,17 +28,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'comment'], function
                     [
                         {field: 'unit_name', title: __('Unit_name')},
                         {field: 'contacts', title: __('Contacts')},
-                        {field: 'con_position', title: __('Con_position')},
-                        {field: 'unit_type', title: __('Unit_type')},
-                        {field: 'number', title: __('Number')},
-                        {field: 'price', title: '单价', formatter:function (value) {
-                                return '¥' + value;
-                        }},
+                        {field: 'con_position', title: __('Con_position'),searchable: false},
+                        {field: 'unit_type', title: __('Unit_type'),searchable: false},
+                        {field: 'number', title: __('Number'),searchable: false},
+                        {field: 'depart_id', title: '操作人部门',searchList: $.getJSON('auth/group/departList'),formatter:function (value, row) {
+                                return row.usr_depart;
+                            }},
                         {field: 'usr_nickname', title: '操作人'},
                         {field: 'usr_depart', title: '操作人部门'},
-                        {field: 'pro_date', title: __('Pro_date'), operate:'RANGE', addclass:'datetimerange'},
-                        {field: 'ex_date', title: __('Ex_date'), operate:'RANGE', addclass:'datetimerange'},
-                        {field: 'operate', title: __('Operate'),
+                        {field: 'pro_date', title: __('Pro_date'), operate:'RANGE', addclass:'datetimerange',searchable: false},
+                        {field: 'ex_date', title: __('Ex_date'),searchable: false, operate:'RANGE', addclass:'datetimerange'},
+                        {field: 'operate', title: __('Operate'),searchable: false,
                             table: table,
                             events: Controller.api.events.operate,
                             formatter: Controller.api.formatter.operate
@@ -51,7 +51,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'comment'], function
             Table.api.bindevent(table);
         },
         add: function () {
-
+            $.ajax({
+                url: 'intention/unitTypeList',
+                type: 'post',
+                dataType: 'json',
+                success: function success(res) {
+                    var data = res.rows;
+                    $('#c-unit_type').selectPage({
+                        data : data,
+                    });
+                    console.log(data);
+                }
+            });
             Controller.api.bindevent();
         },
         edit: function () {

runtime/temp/d61dfef44e1c7e05abe938cc282b19ba.php

@@ -1,4 +1,4 @@
-<?php if (!defined('THINK_PATH')) exit(); /*a:6:{s:74:"/Users/matielong/promote/public/../application/admin/view/index/index.html";i:1525797756;s:64:"/Users/matielong/promote/application/admin/view/common/meta.html";i:1525797756;s:66:"/Users/matielong/promote/application/admin/view/common/header.html";i:1525797756;s:64:"/Users/matielong/promote/application/admin/view/common/menu.html";i:1525797756;s:67:"/Users/matielong/promote/application/admin/view/common/control.html";i:1525797756;s:66:"/Users/matielong/promote/application/admin/view/common/script.html";i:1525797756;}*/ ?>
+<?php if (!defined('THINK_PATH')) exit(); /*a:6:{s:74:"/Users/matielong/promote/public/../application/admin/view/index/index.html";i:1525797756;s:64:"/Users/matielong/promote/application/admin/view/common/meta.html";i:1525797756;s:66:"/Users/matielong/promote/application/admin/view/common/header.html";i:1525797756;s:64:"/Users/matielong/promote/application/admin/view/common/menu.html";i:1527604641;s:67:"/Users/matielong/promote/application/admin/view/common/control.html";i:1525797756;s:66:"/Users/matielong/promote/application/admin/view/common/script.html";i:1525797756;}*/ ?>
 <!DOCTYPE html>
 <html lang="<?php echo $config['language']; ?>">
     <head>
@@ -191,10 +191,10 @@
     <!--如果想始终显示子菜单,则给ul加上show-submenu类即可-->
     <ul class="sidebar-menu">
         <?php echo $menulist; ?>
-        <li class="header" data-rel="external"><?php echo __('Links'); ?></li>
-        <li data-rel="external"><a href="https://doc.fastadmin.net" target="_blank"><i class="fa fa-list text-red"></i> <span><?php echo __('Docs'); ?></span></a></li>
-        <li data-rel="external"><a href="https://forum.fastadmin.net" target="_blank"><i class="fa fa-comment text-yellow"></i> <span><?php echo __('Forum'); ?></span></a></li>
-        <li data-rel="external"><a href="https://jq.qq.com/?_wv=1027&k=487PNBb" target="_blank"><i class="fa fa-qq text-aqua"></i> <span><?php echo __('QQ qun'); ?></span></a></li>
+        <!--<li class="header" data-rel="external"><?php echo __('Links'); ?></li>-->
+        <!--<li data-rel="external"><a href="https://doc.fastadmin.net" target="_blank"><i class="fa fa-list text-red"></i> <span><?php echo __('Docs'); ?></span></a></li>-->
+        <!--<li data-rel="external"><a href="https://forum.fastadmin.net" target="_blank"><i class="fa fa-comment text-yellow"></i> <span><?php echo __('Forum'); ?></span></a></li>-->
+        <!--<li data-rel="external"><a href="https://jq.qq.com/?_wv=1027&k=487PNBb" target="_blank"><i class="fa fa-qq text-aqua"></i> <span><?php echo __('QQ qun'); ?></span></a></li>-->
     </ul>
 </section>
 <!-- /.sidebar -->