Skip to content

T
tl_estate
Commit 2f11cd04 authored by hujun's avatar hujun
Browse files
Options

收款

parent 5d390894
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 42 deletions
application/index/controller/Finance.php
View file @ 2f11cd04
......@@ -2981,13 +2981,8 @@ class Finance extends Basic
}
$m_pay_adjustment = new OPayLogAdjustment();
if ($pay_data['source'] == 2) {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $pay_data['id']]);
$pay_data['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
} else {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $pay_data['id']]);
$pay_data['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
}
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $pay_data['id']]);
$pay_data['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$m_agent_house = new GHousesToAgents();
$m_store = new AStore();
......
public/resource/template/receivables_template_tpl.html
View file @ 2f11cd04
......@@ -13,41 +13,24 @@
<td>[%= it[item]['type'] %]</td>
<td>[%= it[item]['money'] %]</td>
<td>[%= it[item]['real_money'] %]</td>
[% if(it[item]['is_refund'] == 1){ %]
[% if(it[item]['source'] == 0) { %]
<td>正常收款,被退款</td>
<td>正常,被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a></td>
[% } else if ( it[item]['source'] == 1 ) { %]
<td>正常收款,被退款</td>
<td>正常,被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a></td>
[% } else if ( it[item]['source'] == 2) { %]
<td>被调整收款(调整ID:[%= it[item]['source_id'] %],被退款)</td>
<td>被调整+被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a></td>
[% } else{%]
<td>被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a></td>
[% } %]
[% }else{ %]
[% if(it[item]['source'] == 0) { %]
<td>正常收款</td>
[% 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>
[% } else {%]
<td>正常</td>
[% } %]
[% } else if ( it[item]['source'] == 1 ) { %]
<td>正常收款</td>
<td>正常</td>
[% } else if ( it[item]['source'] == 2) { %]
<td>被调整收款(调整ID:[%= it[item]['source_id'] %])</td>
[% 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>
[% } else {%]
<td>正常</td>
[% } %]
[% } else{%]
<td>--</td>
[% } %]
[% } %]
<td>
[% if(it[item]['is_adjustment']){ %]
被调整收款(调整ID:[%= it[item]['source_id'] %])
[% } else { %]
正常收款
[% } %]
</td>
<td>
[% if(it[item]['is_refund'] != 1 && !it[item]['is_adjustment']){ %]
正常
[% } else if(it[item]['is_refund'] == 1 && it[item]['is_adjustment']){ %]
被调整+被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
[% } else if ( it[item]['is_refund'] == 1 ) { %]
被退款 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
[% } else { %]
被调整 <a class="btn1 btn-success add-status" href="#modal-status" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
[% } %]
</td>
<!--<td>[%= it[item]['source_id'] %]</td>-->
<td>
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
......
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