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
a5505a3f
Commit
a5505a3f
authored
May 28, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
id
parent
b6627397
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
Finance.php
application/index/controller/Finance.php
+4
-1
BaseModel.php
application/model/BaseModel.php
+0
-1
OTaxes.php
application/model/OTaxes.php
+3
-2
No files found.
application/index/controller/Finance.php
View file @
a5505a3f
...
...
@@ -641,6 +641,8 @@ class Finance extends Basic
* @throws \Exception
*/
public
function
addTallAge
()
{
if
(
empty
(
$this
->
params
[
'bargain_id'
]))
{
return
$this
->
response
(
101
,
'新增实收参数错误'
);
}
...
...
@@ -681,7 +683,8 @@ class Finance extends Basic
$insert_data
[
'operation_date'
]
=
$operation_date
;
//开票日期
$m_fee
=
new
OTaxes
();
$m_fee
->
editData
(
$insert_data
,
$this
->
params
[
'id'
]);
//开票新增和编辑
$ids
=
$m_fee
->
editData
(
$insert_data
,
$this
->
params
[
'id'
]);
//开票新增和编辑
echo
$ids
;
$father_id
=
$m_fee
->
id
;
$m_agent
=
new
AAgents
();
...
...
application/model/BaseModel.php
View file @
a5505a3f
...
...
@@ -45,7 +45,6 @@ class BaseModel extends Model
}
if
(
$kv
){
//编辑
$res
=
$this
->
save
(
$data
,[
$key
=>
$kv
]);
}
else
{
...
...
application/model/OTaxes.php
View file @
a5505a3f
...
...
@@ -59,7 +59,7 @@ class OTaxes extends BaseModel
*/
public
function
addTaxes
(
$data
,
$bargain_id
,
int
$agent_id
,
$father_id
=
0
,
$total_fee
=
0
,
$operation_date
=
''
)
{
echo
222
;
$insert_data
=
[];
foreach
(
$data
as
$k
=>
$v
)
{
$insert_data
[
$k
][
'id'
]
=
$v
[
'fee_id'
];
...
...
@@ -133,7 +133,8 @@ class OTaxes extends BaseModel
foreach
(
$data
as
$k
=>
$v
)
{
if
(
isset
(
$v
[
'role'
]))
{
$agent_name
=
$m_agent
->
getAgentInfo
(
'id,name,phone'
,
$v
[
'agent_id'
]);
$result
[
$k
][
'id'
]
=
$agent_name
[
'id'
];
$result
[
$k
][
'id'
]
=
$v
[
'id'
];
$result
[
$k
][
'agent_id'
]
=
$agent_name
[
'id'
];
$result
[
$k
][
'name'
]
=
$agent_name
[
'name'
];
$result
[
$k
][
'phone'
]
=
$agent_name
[
'phone'
];
$result
[
$k
][
'role'
]
=
$v
[
'role'
];
...
...
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