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
c2ce7f32
Commit
c2ce7f32
authored
Jul 24, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
26c33c04
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
CostParameter.php
application/index/controller/CostParameter.php
+7
-3
CostParameterValidate.php
application/index/validate/CostParameterValidate.php
+1
-0
No files found.
application/index/controller/CostParameter.php
View file @
c2ce7f32
...
...
@@ -50,8 +50,12 @@ class CostParameter extends Basic
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$conditions
=
[];
$checkResult
=
$this
->
validate
(
$params
,
"CostParameterValidate.getStoreCostParameterList"
);
if
(
true
!==
$checkResult
)
{
return
$this
->
response
(
"101"
,
$checkResult
);
}
$conditions
=
[];
//门店
if
(
!
empty
(
$params
[
'store_id'
]))
{
$conditions
[
"a.id"
]
=
$params
[
"store_id"
];
...
...
@@ -70,9 +74,9 @@ class CostParameter extends Basic
$f_params
[
'c.setting_date'
]
=
$params
[
'setting_date'
];
$store_data_res
=
$this
->
m_store
->
getStoreCostParameter
(
$field
,
$f_params
);
if
(
!
$store_data_res
){
$transfer_charge
=
$this
->
getTransferCharge
(
730
);
$transfer_charge
=
$this
->
getTransferCharge
(
$v
[
'id'
]
);
$list
[
$k
][
'transfer_charge'
]
=
$transfer_charge
;
//手续费
$social_security_fee
=
$this
->
getLastSocialSecurityFee
(
730
);
$social_security_fee
=
$this
->
getLastSocialSecurityFee
(
$v
[
'id'
]
);
$list
[
$k
][
'social_security_fee'
]
=
$social_security_fee
;
//当月社保报销
$list
[
$k
][
'attendance_num'
]
=
0
;
//当月考勤
$list
[
$k
][
'official_receipts'
]
=
0
;
//当月合计总实收
...
...
application/index/validate/CostParameterValidate.php
View file @
c2ce7f32
...
...
@@ -28,6 +28,7 @@ class CostParameterValidate extends Validate {
protected
$scene
=
[
'editCostParameter'
=>
[
'store_id'
,
'setting_date'
],
'getCompanyCostParameterList'
=>
[
'setting_date'
],
'getStoreCostParameterList'
=>
[
'setting_date'
],
'editCompanyData'
=>
[
'type'
,
'setting_date'
],
];
...
...
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