xieruidong il y a 2 ans
Parent
commit
d4f5fb8cec

+ 2 - 0
application/admin/controller/seller/User.php

@@ -469,12 +469,14 @@ class User extends Backend
         if ($this->request->isAjax()) {
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $list=AdminMoneyLog::where('admin_id',$this->admin('id'))
+                ->with(['admin'])
                 ->order($sort, $order)
                 ->where($where)
                 ->paginate($limit);
             $result = array("total" => $list->total(), "rows" => $list->items());
             return json($result);
         }
+        $this->assign('types',AdminMoneyLog::getMoneyTypes());
         return $this->view->fetch();
     }
 }

+ 3 - 0
application/admin/model/AdminMoneyLog.php

@@ -26,4 +26,7 @@ class AdminMoneyLog extends Model
     public function scopeFilterTypeCommission(Query $query){
         $query->where($this->__('type'),self::T_COMMISSION);
     }
+    public function admin(){
+        return $this->belongsTo(Admin::class)->setEagerlyType(0);
+    }
 }

+ 4 - 8
public/assets/js/backend/seller/user.js

@@ -120,14 +120,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                 columns: [
                     [
                         {field: 'id', title: 'ID'},
-                        {field: 'username', title: __('Username')},
-                        {field: 'mobile', title: __('手机号')},
-                        {field: 'nickname', title: __('Nickname')},
-                        {field: 'depart_name', title: __('部门')},
-                        {field: 'job_name', title: __('职位')},
-                        {field: 'groups_text', title: __('Group'), operate:false, formatter: Table.api.formatter.label},
-                        {field: 'status', title: __("Status"), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status},
-                        {field: 'create_time', title: __('登录时间'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
+                        {field: 'admin.nickname', title: __('Username'),operate: 'like'},
+                        {field: 'amount', title: __('金额'),operate: 'between'},
+                        {field: 'type', title: __('金额'),operate: '=',searchList:types,formatter: Table.api.formatter.label},
+                        {field: 'create_time', title: __('时间'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                     ]
                 ]
             });