资金日志受公会限制，类型搜索改用IN

application/admin/controller/Moneylog.php

@@ -53,9 +53,23 @@ class Moneylog extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
+            //公会分权限
+            $gh_map = [];
+            $gh_ids = db('admin')->where('id',$this->auth->id)->value('gh_ids');
+            if(empty($gh_ids)){
+                $gh_map = ['moneylog.user_id' => '-1'];
+            }else{
+                $user_ids = db('user')->where('gh_id','IN',$gh_ids)->column('id');
+                $gh_map = ['moneylog.user_id' => ['IN',$user_ids]];
+            }
+            if($gh_ids == '*'){
+                $gh_map = [];
+            }
+
             $list = $this->model
                     ->with(['user'])
                     ->where($where)
+                    ->where($gh_map)
                     ->order($sort, $order)
                     ->paginate($limit);
 

public/assets/js/backend/ghuser.js

@@ -98,7 +98,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'wechat_account', title: __('Wechat_account'), operate: 'LIKE'},
                         {field: 'secretvideo_status', title: __('Secretvideo_status'), searchList: {"-1":__('Secretvideo_status -1'),"0":__('Secretvideo_status 0'),"1":__('Secretvideo_status 1'),"2":__('Secretvideo_status 2')}, formatter: Table.api.formatter.status},
                         {field: 'profit', title: '累计收益', operate: false},
-//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), table: table,
+                            buttons:[
+                                {
+                                    name:'moneylog',
+                                    text:'收益日志',
+                                    title:'收益日志',
+                                    icon:'fa fa-exclamation-circle',
+                                    classname:'btn btn-xs btn-info btn-dialog',
+                                    url:function(row){
+                                        return "moneylog/index?user_id="+ row.id +"&log_type=21,22,23,52,54,56";
+                                    },
+                                    target:'_self',
+                                    /*hidden:function(row){
+                                     return row.status==100 ? false : false;
+                                     }*/
+                                }
+                            ],
+                            events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

public/assets/js/backend/moneylog.js

@@ -28,8 +28,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
 //                        {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'log_type', title: __('Log_type')},
-                        {field: 'log_type_text', title: __('Log_type')},
+                        {field: 'log_type', title: __('Log_type'),operate:'IN'},
+                        {field: 'log_type_text', title: __('Log_type'),operate:false},
 //                        {field: 'money_type', title: __('Money_type'), operate: 'LIKE'},
                         {field: 'change_value', title: __('Change_value'), operate:'BETWEEN'},
                         {field: 'remain', title: __('Remain'), operate:'BETWEEN'},