Commit 9796228e authored by zhuwei's avatar zhuwei

进场记录列表--新增报备id

parent 7d8fdaaa
...@@ -31,7 +31,7 @@ class MarchIn extends Basic ...@@ -31,7 +31,7 @@ class MarchIn extends Basic
*/ */
public function marchInList(){ public function marchInList(){
if (!$this->request->isAjax()) { if (!$this->request->isAjax()) {
return view('marchin/marchin_list'); //return view('marchin/marchin_list');
} }
$result = ''; $result = '';
...@@ -89,7 +89,7 @@ class MarchIn extends Basic ...@@ -89,7 +89,7 @@ class MarchIn extends Basic
} }
//搜索条件 end //搜索条件 end
$fields_evaluate = 'd.user_name,d.user_phone,a.create_time,d.report_agent_name,d.report_agent_phone,e.store_name,c.house_title'; $fields_evaluate = 'a.report_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,d.report_agent_phone,e.store_name,c.house_title';
$data['list'] = $this->oMarchInModel->findmarchInList($pageNo, $pageSize, 'a.id desc', $fields_evaluate, $where); $data['list'] = $this->oMarchInModel->findmarchInList($pageNo, $pageSize, 'a.id desc', $fields_evaluate, $where);
$data['total'] = $this->oMarchInModel->findmarchInListCount($fields_evaluate, $where); $data['total'] = $this->oMarchInModel->findmarchInListCount($fields_evaluate, $where);
......
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