sth
This commit is contained in:
parent
d5dd883101
commit
e947683638
|
|
@ -137,7 +137,7 @@ class Worker extends Backend
|
||||||
|
|
||||||
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
|
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
|
||||||
$list = $this->model->alias('fa_worker')
|
$list = $this->model->alias('fa_worker')
|
||||||
->with(['area','items'])
|
->with(['area2','items'])
|
||||||
->field([
|
->field([
|
||||||
'fa_worker.*',
|
'fa_worker.*',
|
||||||
'IFNULL(a.dispatch_count, 0) AS dispatch_count',
|
'IFNULL(a.dispatch_count, 0) AS dispatch_count',
|
||||||
|
|
|
||||||
|
|
@ -87,11 +87,11 @@ class Worker extends Backend
|
||||||
$q->withField(['id','username']);
|
$q->withField(['id','username']);
|
||||||
}])
|
}])
|
||||||
->where($where)
|
->where($where)
|
||||||
->field('worker.id,admin_id,type,fa_worker.name,tel,area_id,create_time,deposit_amount,update_time,status,star')
|
->field('worker.id,admin_id,type,name,tel,area_id,create_time,deposit_amount,update_time,status,star')
|
||||||
->order($sort, $order);
|
->order($sort, $order);
|
||||||
if ($keyword) {
|
if ($keyword) {
|
||||||
$build->where(function ($q) use ($keyword) {
|
$build->where(function ($q) use ($keyword) {
|
||||||
$q->where('fa_worker.name', 'like', '%' . $keyword . '%')->whereOr('tel', 'like', '%' . $keyword . '%');
|
$q->where('name', 'like', '%' . $keyword . '%')->whereOr('tel', 'like', '%' . $keyword . '%');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if ($item_id) {
|
if ($item_id) {
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,11 @@ class Worker extends BaseModel
|
||||||
|
|
||||||
|
|
||||||
public function area()
|
public function area()
|
||||||
|
{
|
||||||
|
return $this->belongsTo('area', 'area_id', 'area_code');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function area2()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('area', 'area_id', 'area_code')->setEagerlyType(0);
|
return $this->belongsTo('area', 'area_id', 'area_code')->setEagerlyType(0);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
|
||||||
{field: 'id', title: __('ID'),visible:true},
|
{field: 'id', title: __('ID'),visible:true},
|
||||||
{field: 'name', title: __('姓名'),operate: "="},
|
{field: 'name', title: __('姓名'),operate: "="},
|
||||||
{field: 'tel', title: __('电话'),operate: "="},
|
{field: 'tel', title: __('电话'),operate: "="},
|
||||||
{field: 'area.name', title: __('城市'),operate: false},
|
{field: 'area2.name', title: __('城市'),operate: false},
|
||||||
{field: 'star', title: __('评分'),operate: false},
|
{field: 'star', title: __('评分'),operate: false},
|
||||||
{field: 'performance', title: __('总业绩(¥)'), operate: false},
|
{field: 'performance', title: __('总业绩(¥)'), operate: false},
|
||||||
{field: 'get_count', title: __('接单数'),operate: false},
|
{field: 'get_count', title: __('接单数'),operate: false},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user