Commit fca1d5a6 authored by wuxiaoli's avatar wuxiaoli

no message

parent 2b5c8b05
......@@ -51,7 +51,7 @@ class Agent extends Backend
->order($sort, $order)
->count();
$list = $this->model
->with("users,agent,family")
->with("users,agent")
->where($where)
->order($sort, $order)
->limit($offset, $limit)
......@@ -68,8 +68,10 @@ class Agent extends Backend
$province = Db::name('addr')->where(['ID' => $val['province_id']])->find();
$list[$key]['MergerName'] = $province['MergerName'];
}
$list[$key]['family'] = Family::where(['id'=>$val['family_id']])->find();
}
$result = array("total" => $total, "rows" => $list,"where"=>$where);
$result = array("total" => $total, "rows" => $list);
return json($result);
}
return $this->view->fetch();
......
......@@ -57,10 +57,4 @@ class Agent extends Model
return self::hasOne("app\admin\model\User",'id',"parent_user_id");
}
public function family()
{
return self::hasOne("app\admin\model\Family\Family",'id',"family_id")->bind("family_name");
}
}
......@@ -69,7 +69,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'family_id', title: __('Family_id'),
formatter:function (value,row,index) {
if(row.family_id){
return "id:"+row.family_id + "<br/>"+row.family_name + "氏谱";
return "id:"+row.family_id + "<br/>"+row.family.family_name + "氏谱"+"<br/>"+row.family.address;
}
}},
{field: 'level', title: __('Level'),operate:false},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment