Skip to content

T
tl_estate
Commit 407df9cd authored by hujun's avatar hujun
Browse files
Options

调整

parent e1e47db7
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment