pc

application/admin/controller/user/User.php

@@ -44,7 +44,7 @@ class User extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $list = $this->model
-                ->with('group')
+                ->with(['group','admin'])
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);

application/admin/model/User.php

@@ -121,4 +121,8 @@ class User extends \app\common\model\User
     {
         return $this->hasOne(UserInfo::class, 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+    public function admin()
+    {
+        return $this->belongsTo(Admin::class,'admin_id','id',[],'left');
+    }
 }

application/common/model/User.php

@@ -2,6 +2,7 @@
 
 namespace app\common\model;
 
+use app\admin\model\Admin;
 use app\common\service\DiscountService;
 use think\Cache;
 use think\Db;
@@ -310,6 +311,9 @@ class User extends Model
     public function province(){
         return $this->belongsTo(Area::class,'province_id')->cache(true);
     }
+    public function admin(){
+        return $this->belongsTo(Admin::class);
+    }
     public function city(){
         return $this->belongsTo(Area::class,'city_id')->cache(true);
     }

public/assets/js/backend/user/user.js

@@ -33,10 +33,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         {field: 'level', title: __('Level'), operate: 'BETWEEN', sortable: true,formatter: Table.api.formatter.label,searchList: levels},
                         {field: 'gender', title: __('Gender'), visible: false, searchList: {1: __('Male'), 0: __('Female')}},
+                        {field: 'com_name', title: __('公司名称'), operate: 'LIKE'},
+                        {field: 'admin.nickname', title: __('销售人员'), operate: 'LIKE'},
                         //{field: 'score', title: __('Score'), operate: 'BETWEEN', sortable: true},
                         //{field: 'successions', title: __('Successions'), visible: false, operate: 'BETWEEN', sortable: true},
                         //{field: 'maxsuccessions', title: __('Maxsuccessions'), visible: false, operate: 'BETWEEN', sortable: true},
-                        {field: 'logintime', title: __('Logintime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
+                        //{field: 'logintime', title: __('Logintime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         //{field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},
                         {field: 'jointime', title: __('Jointime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         //{field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},