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
5c4004fa
Commit
5c4004fa
authored
Jul 29, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
8a84b34d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
CostParameter.php
application/index/controller/CostParameter.php
+8
-1
No files found.
application/index/controller/CostParameter.php
View file @
5c4004fa
...
@@ -91,6 +91,13 @@ class CostParameter extends Basic
...
@@ -91,6 +91,13 @@ class CostParameter extends Basic
$list
[
$k
][
'official_receipts'
]
=
0
;
//当月合计总实收
$list
[
$k
][
'official_receipts'
]
=
0
;
//当月合计总实收
$list
[
$k
][
'last_official_receipts'
]
=
0
;
//当月守护者实收
$list
[
$k
][
'last_official_receipts'
]
=
0
;
//当月守护者实收
$list
[
$k
][
'deduct'
]
=
0
;
//盈利不足2万扣除
$list
[
$k
][
'deduct'
]
=
0
;
//盈利不足2万扣除
$save_params
[
'store_id'
]
=
$v
[
'id'
];
$save_params
[
'setting_date'
]
=
$params
[
'setting_date'
];
$save_params
[
'is_del'
]
=
0
;
$save_params
[
'transfer_charge'
]
=
$transfer_charge
;
$save_params
[
'social_security_fee'
]
=
$social_security_fee
;
$this
->
saveStoreData
(
$save_params
);
}
else
{
}
else
{
$list
[
$k
][
'is_discounts'
]
=
$store_data_res
[
'is_discounts'
];
$list
[
$k
][
'is_discounts'
]
=
$store_data_res
[
'is_discounts'
];
$list
[
$k
][
'transfer_charge'
]
=
$store_data_res
[
'transfer_charge'
];
//手续费
$list
[
$k
][
'transfer_charge'
]
=
$store_data_res
[
'transfer_charge'
];
//手续费
...
@@ -433,7 +440,7 @@ class CostParameter extends Basic
...
@@ -433,7 +440,7 @@ class CostParameter extends Basic
$data
[
'apply_for_fee'
]
=
$this
->
getApplyForFee
(
$params
[
'type'
],
$params
[
'setting_date'
]);
//本月报销费用 (其他费用);;
$data
[
'apply_for_fee'
]
=
$this
->
getApplyForFee
(
$params
[
'type'
],
$params
[
'setting_date'
]);
//本月报销费用 (其他费用);;
if
((
isset
(
$params
[
'discounts'
]))
&&
(
$params
[
'discounts'
]
>
0
))
if
((
isset
(
$params
[
'discounts'
]))
&&
(
$params
[
'discounts'
]
>
=
0
))
$data
[
'discounts'
]
=
$params
[
'discounts'
];
$data
[
'discounts'
]
=
$params
[
'discounts'
];
$res
=
$this
->
m_company_data
->
updateCompanyData
(
$data
);
$res
=
$this
->
m_company_data
->
updateCompanyData
(
$data
);
...
...
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