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
407df9cd
Commit
407df9cd
authored
Feb 19, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整
parent
e1e47db7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
Finance.php
application/index/controller/Finance.php
+12
-6
receivables_template_tpl.html
public/resource/template/receivables_template_tpl.html
+2
-2
No files found.
application/index/controller/Finance.php
View file @
407df9cd
...
@@ -2616,10 +2616,13 @@ class Finance extends Basic
...
@@ -2616,10 +2616,13 @@ class Finance extends Basic
$m_house
=
new
GHouses
();
$m_house
=
new
GHouses
();
$m_refund
=
new
ORefundModel
();
$m_refund
=
new
ORefundModel
();
foreach
(
$list
as
$k
=>
$v
)
{
foreach
(
$list
as
$k
=>
$v
)
{
$list
[
$k
][
'source_id'
]
=
''
;
$list
[
$k
][
'source_id'
]
=
$list
[
$k
][
'is_adjustment'
]
=
''
;
if
(
$v
[
'source'
]
==
0
)
{
if
(
$v
[
'source'
]
==
2
)
{
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'paylog_id'
=>
$v
[
'id'
]]);
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'
new_
paylog_id'
=>
$v
[
'id'
]]);
$list
[
$k
][
'source_id'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
$list
[
$k
][
'source_id'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
}
else
{
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'paylog_id'
=>
$v
[
'id'
]]);
$list
[
$k
][
'is_adjustment'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
}
}
$num
=
$m_refund
->
getFind
(
'id'
,[
'pay_log_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
$num
=
$m_refund
->
getFind
(
'id'
,[
'pay_log_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
...
@@ -4028,10 +4031,13 @@ class Finance extends Basic
...
@@ -4028,10 +4031,13 @@ class Finance extends Basic
$m_refund
=
new
ORefundModel
();
$m_refund
=
new
ORefundModel
();
$m_agent
=
new
AAgents
();
$m_agent
=
new
AAgents
();
foreach
(
$list
as
$k
=>
$v
)
{
foreach
(
$list
as
$k
=>
$v
)
{
$list
[
$k
][
'source_id'
]
=
''
;
$list
[
$k
][
'source_id'
]
=
$list
[
$k
][
'is_adjustment'
]
=
''
;
if
(
$v
[
'source'
]
==
0
)
{
if
(
$v
[
'source'
]
==
2
)
{
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'paylog_id'
=>
$v
[
'id'
]]);
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'
new_
paylog_id'
=>
$v
[
'id'
]]);
$list
[
$k
][
'source_id'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
$list
[
$k
][
'source_id'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
}
else
{
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'paylog_id'
=>
$v
[
'id'
]]);
$list
[
$k
][
'is_adjustment'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
}
}
$num
=
$m_refund
->
getFind
(
'id'
,[
'pay_log_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
$num
=
$m_refund
->
getFind
(
'id'
,[
'pay_log_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
...
...
public/resource/template/receivables_template_tpl.html
View file @
407df9cd
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
[
%
}
else
{
%
]
[
%
}
else
{
%
]
[
%
if
(
it
[
item
][
'source'
]
==
0
)
{
%
]
[
%
if
(
it
[
item
][
'source'
]
==
0
)
{
%
]
<
td
>
正常收款
<
/td
>
<
td
>
正常收款
<
/td
>
[
%
if
(
it
[
item
][
'
source_id
'
]){
%
]
[
%
if
(
it
[
item
][
'
is_adjustment
'
]){
%
]
<
td
>
被调整
<
a
class
=
"btn1 btn-success add-status"
href
=
"#modal-status"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
详情
<
/a> </
td
>
<
td
>
被调整
<
a
class
=
"btn1 btn-success add-status"
href
=
"#modal-status"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
详情
<
/a> </
td
>
[
%
}
else
{
%
]
[
%
}
else
{
%
]
<
td
>
正常
<
/td
>
<
td
>
正常
<
/td
>
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<
td
>
正常
<
/td
>
<
td
>
正常
<
/td
>
[
%
}
else
if
(
it
[
item
][
'source'
]
==
2
)
{
%
]
[
%
}
else
if
(
it
[
item
][
'source'
]
==
2
)
{
%
]
<
td
>
被调整收款
(
调整
ID
:[
%=
it
[
item
][
'source_id'
]
%
])
<
/td
>
<
td
>
被调整收款
(
调整
ID
:[
%=
it
[
item
][
'source_id'
]
%
])
<
/td
>
[
%
if
(
it
[
item
][
'
source_id
'
]){
%
]
[
%
if
(
it
[
item
][
'
is_adjustment
'
]){
%
]
<
td
>
被调整
<
a
class
=
"btn1 btn-success add-status"
href
=
"#modal-status"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
详情
<
/a> </
td
>
<
td
>
被调整
<
a
class
=
"btn1 btn-success add-status"
href
=
"#modal-status"
data
-
toggle
=
"modal"
data
-
id
=
'[%= it[item]["id"] %]'
>
详情
<
/a> </
td
>
[
%
}
else
{
%
]
[
%
}
else
{
%
]
<
td
>
正常
<
/td
>
<
td
>
正常
<
/td
>
...
...
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