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
f0bcde2d
Commit
f0bcde2d
authored
Dec 19, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款删除
parent
c4f51a39
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
Finance.php
application/index/controller/Finance.php
+2
-1
No files found.
application/index/controller/Finance.php
View file @
f0bcde2d
...
@@ -2474,6 +2474,7 @@ class Finance extends Basic
...
@@ -2474,6 +2474,7 @@ class Finance extends Basic
$list
[
$k
][
'pay_type_num'
]
=
$v
[
'pay_type'
];
$list
[
$k
][
'pay_type_num'
]
=
$v
[
'pay_type'
];
$list
[
$k
][
'type_num'
]
=
$v
[
'type'
];
$list
[
$k
][
'type_num'
]
=
$v
[
'type'
];
}
}
$data
[
'list'
]
=
$list
;
$data
[
'list'
]
=
$list
;
//加时间条件
//加时间条件
if
(
$is_show
)
{
if
(
$is_show
)
{
...
@@ -3360,7 +3361,7 @@ class Finance extends Basic
...
@@ -3360,7 +3361,7 @@ class Finance extends Basic
}
}
$m_pay_adjustment
=
new
OPayLogAdjustment
();
$m_pay_adjustment
=
new
OPayLogAdjustment
();
$pay_id
=
$m_pay_adjustment
->
getFieldValue
(
'id'
,
[
'paylog_id'
=>
$this
->
params
[
'pay_id'
]]);
$pay_id
=
$m_pay_adjustment
->
getFieldValue
(
'id'
,
[
'
new_
paylog_id'
=>
$this
->
params
[
'pay_id'
]]);
if
(
$pay_id
)
{
if
(
$pay_id
)
{
return
$this
->
response
(
$code
,
'该收款有调整信息,不能删除'
);
return
$this
->
response
(
$code
,
'该收款有调整信息,不能删除'
);
}
}
...
...
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