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
6aeba8f6
Commit
6aeba8f6
authored
Mar 05, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
我的约带看
parent
df132cb0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
Report.php
application/api_broker/controller/Report.php
+13
-13
inspectionRecordAll.js
public/resource/js/inspectionRecordAll.js
+1
-1
No files found.
application/api_broker/controller/Report.php
View file @
6aeba8f6
...
...
@@ -137,6 +137,17 @@ class Report extends Basic
}
$result
=
$this
->
service_
->
orderListAll
(
$field
,
$params
,
$pageNo
,
$pageSize
,
$check_type
);
}
else
{
$result
=
$this
->
service_
->
orderList
(
$field
,
$params
,
$pageNo
,
$pageSize
);
}
...
...
@@ -198,19 +209,8 @@ class Report extends Basic
$params
[
"a.id"
]
=
$params
[
"report_id"
];
}
$params
[
"report_agent_id"
]
=
$params
[
"agent_id"
];
$where
[
"agents_id"
]
=
$this
->
agentId
;
$where
[
"type"
]
=
array
(
"in"
,
'2,3'
);
//盘方和独家
$where
[
"is_del"
]
=
0
;
$houseToAgentModel
=
new
GHousesToAgents
();
$house_id_arr
=
$houseToAgentModel
->
getAgentHouseOne
(
"houses_id"
,
$where
);
if
(
!
empty
(
$house_id_arr
))
{
$params
[
'b.house_id'
]
=
[
'in'
,
$house_id_arr
];
}
$result
=
$this
->
service_
->
orderListForPc
(
$field
,
$params
,
$pageNo
,
$pageSize
);
// $result = $this->service_->orderListForPc($field, $params, $pageNo, $pageSize);
$result
=
$this
->
service_
->
orderList
(
$field
,
$params
,
$pageNo
,
$pageSize
);
if
(
count
(
$result
)
>
0
)
{
return
$this
->
response
(
"200"
,
"request success"
,
$result
);
}
else
{
...
...
public/resource/js/inspectionRecordAll.js
View file @
6aeba8f6
...
...
@@ -181,7 +181,7 @@ define(['doT', 'text!temp/inspectionRecordAll_list_template_tpl.html', 'css!styl
if
(
data
.
data
.
list
)
{
$
(
"#follow_list"
).
html
(
doTtmpl
(
data
.
data
.
list
));
}
else
{
$
(
"#follow_list"
).
html
(
doTtmpl
(
data
.
data
.
result
));
$
(
"#follow_list"
).
html
(
doTtmpl
(
data
.
data
));
}
/*分页代码*/
add_page
(
data
.
data
.
total
,
pageNo
,
record
.
pageSize
,
record
.
getList
);
...
...
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