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
c7b69533
Commit
c7b69533
authored
Jun 21, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
税费列表增加字段
parent
095edb3e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
Finance.php
application/index/controller/Finance.php
+1
-1
OPartialCommission.php
application/model/OPartialCommission.php
+0
-8
No files found.
application/index/controller/Finance.php
View file @
c7b69533
...
@@ -968,7 +968,7 @@ class Finance extends Basic
...
@@ -968,7 +968,7 @@ class Finance extends Basic
$pageNo
=
empty
(
$this
->
params
[
'pageNo'
])
?
1
:
$this
->
params
[
'pageNo'
];
$pageNo
=
empty
(
$this
->
params
[
'pageNo'
])
?
1
:
$this
->
params
[
'pageNo'
];
$pageSize
=
empty
(
$this
->
params
[
'pageSize'
])
?
15
:
$this
->
params
[
'pageSize'
];
$pageSize
=
empty
(
$this
->
params
[
'pageSize'
])
?
15
:
$this
->
params
[
'pageSize'
];
$fields
=
'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,a.agent_id,b.father_id,b.order_id'
;
$fields
=
'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,a.agent_id,b.father_id,b.
id as bargain_id,b.
order_id'
;
$where
[
'c.is_del'
]
=
0
;
$where
[
'c.is_del'
]
=
0
;
$where
[
'b.status'
]
=
[
'in'
,
[
10
,
11
,
13
]
];
//10已提交 11审核成功
$where
[
'b.status'
]
=
[
'in'
,
[
10
,
11
,
13
]
];
//10已提交 11审核成功
...
...
application/model/OPartialCommission.php
View file @
c7b69533
...
@@ -67,14 +67,6 @@ class OPartialCommission extends BaseModel
...
@@ -67,14 +67,6 @@ class OPartialCommission extends BaseModel
$data
[
$k
][
'role_name'
]
=
'无'
;
$data
[
$k
][
'role_name'
]
=
'无'
;
}
}
}
}
if
(
isset
(
$v
[
'bargain_id'
]))
{
$bargain_id
=
$m_bargain
->
where
(
'id'
,
$v
[
'bargain_id'
])
->
value
(
'father_id'
);
if
(
$bargain_id
!=
0
)
{
$data
[
$k
][
'bargain_id'
]
=
$bargain_id
;
}
}
}
}
return
$result
;
return
$result
;
}
}
...
...
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