Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
9796228e
Commit
9796228e
authored
Jun 15, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
进场记录列表--新增报备id
parent
7d8fdaaa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
MarchIn.php
application/index/controller/MarchIn.php
+2
-2
No files found.
application/index/controller/MarchIn.php
View file @
9796228e
...
...
@@ -31,7 +31,7 @@ class MarchIn extends Basic
*/
public
function
marchInList
(){
if
(
!
$this
->
request
->
isAjax
())
{
return
view
(
'marchin/marchin_list'
);
//
return view('marchin/marchin_list');
}
$result
=
''
;
...
...
@@ -89,7 +89,7 @@ class MarchIn extends Basic
}
//搜索条件 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
[
'total'
]
=
$this
->
oMarchInModel
->
findmarchInListCount
(
$fields_evaluate
,
$where
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment