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
067d01fe
Commit
067d01fe
authored
Jul 19, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
2e046e26
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
CostDetail.php
application/index/controller/CostDetail.php
+9
-7
StoreFee.php
application/index/controller/StoreFee.php
+1
-1
No files found.
application/index/controller/CostDetail.php
View file @
067d01fe
...
@@ -39,14 +39,16 @@ class CostDetail extends Basic
...
@@ -39,14 +39,16 @@ class CostDetail extends Basic
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$activityModel
=
new
CActivity
();
$activityModel
=
new
CActivity
();
$field
=
'id,'
;
$conditions
=
[];
$conditions
=
[];
if
(
!
empty
(
$params
[
"title"
]))
{
// if (!empty($params["title"])) {
$conditions
[
"title"
]
=
array
(
"like"
,
"%"
.
trim
(
$params
[
'title'
])
.
"%"
);
// $conditions["title"] = array("like", "%" . trim($params['title']) . "%");
}
// }
if
(
!
empty
(
$params
[
"id"
]))
{
// if (!empty($params["id"])) {
$conditions
[
"id"
]
=
$params
[
'id'
];
// $conditions["id"] = $params['id'];
}
// }
$field
=
'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
'
;
$list
=
$this
->
storeCostExt
->
getStoreCostExt
(
$field
,
$conditions
,
$pageNo
,
$pageSize
);
$list
=
$this
->
storeCostExt
->
getStoreCostExt
(
$field
,
$conditions
,
$pageNo
,
$pageSize
);
$count
=
$this
->
storeCostExt
->
getStoreCostExtTotal
(
$field
,
$conditions
);
$count
=
$this
->
storeCostExt
->
getStoreCostExtTotal
(
$field
,
$conditions
);
$result
[
"list"
]
=
$list
;
$result
[
"list"
]
=
$list
;
...
...
application/index/controller/StoreFee.php
View file @
067d01fe
...
@@ -258,7 +258,7 @@ class StoreFee extends Basic
...
@@ -258,7 +258,7 @@ class StoreFee extends Basic
$m_store
=
new
AStore
();
$m_store
=
new
AStore
();
$store_result
=
$m_store
->
getStore
([
'id'
=>
$params
[
'store_id'
]],
'id'
);
$store_result
=
$m_store
->
getStore
([
'id'
=>
$params
[
'store_id'
]],
'id'
);
if
(
$store_result
)
if
(
!
$store_result
)
return
$this
->
response
(
"101"
,
"该门店不存在"
);
return
$this
->
response
(
"101"
,
"该门店不存在"
);
if
(
$params
[
'office_id'
]
==
0
)
{
if
(
$params
[
'office_id'
]
==
0
)
{
...
...
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