elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

汇总公司与上游回退

Browse Source
master
zhengyongxing 4 years ago
parent 233fa89251
commit 54a0fde480
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File

8
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -681,8 +681,8 @@ class CompanyStatementPoolController extends ThinkController
//
// }
//
$handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
$v['statement_info'] = $handle_data;
// $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
// $v['statement_info'] = $handle_data;
// dump($handle_data);
@ -826,8 +826,8 @@ class CompanyStatementPoolController extends ThinkController
}
}
$handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
$v['statement_info'] = $handle_data;
// $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
// $v['statement_info'] = $handle_data;
// dump($v['statement_info']);
$v['matche_platform'] = $Partner[$v['company_id']];

12
Application/Admin/View/CompanyStatementPool/viewCpPool.html
Unescape Escape View File

@ -111,7 +111,7 @@
<th rowspan="2" style="border-right: solid 1px #b6cad2;">合作方待结算分成</th>
<th rowspan="2" style="border-right: solid 1px #b6cad2;">违规罚款</th>
<th rowspan="2" style="border-right: solid 1px #b6cad2;">奖励</th>
<th rowspan="2" style="border-right: solid 1px #b6cad2;">周结算金额</th>
<!-- <th rowspan="2" style="border-right: solid 1px #b6cad2;">周结算金额</th>-->
<th rowspan="2" style="border-right: solid 1px #b6cad2;">合作待结算金额</th>
<th rowspan=2 style="border-right: solid 1px #b6cad2;">是否结算</th>
@ -154,7 +154,7 @@
<td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
<td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
<td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>
<!-- <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>-->
<td rowspan="{$com.statement_count}">{$com['statement_money']}</td>
<td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
@ -187,10 +187,10 @@
<foreach name="com.statement_info" item="it" key="k">
<if condition="$k neq 0">
<tr>
<!-- <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>-->
<notempty name="it['time']">
<td rowspan="{$it['row']}">{$it['time']}</td>
</notempty>
<td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>
<!-- <notempty name="it['time']">-->
<!-- <td rowspan="{$it['row']}">{$it['time']}</td>-->
<!-- </notempty>-->
<td>{$it['game_name']}</td>
<td>{$it['pay_amount']}</td>
<td>{$it['pay_amount']}</td>

21
Application/Admin/View/CompanyStatementPool/viewPcPool.html
Unescape Escape View File

@ -107,7 +107,7 @@
<th>分成金额/元</th>
<th>罚款</th>
<th>奖励</th>
<th>周结算金额</th>
<!-- <th>周结算金额</th>-->
<th>合计/元</th>
<th>对账人</th>
<th>结算日期</th>
@ -137,11 +137,11 @@
<td>{$com['statement_info'][0]['d_statement_money']}</td>
<td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
<td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
<td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>
<!-- <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>-->
<td rowspan="{$com.statement_count}">{$com['statement_money']}</td>
<td rowspan="{$com.statement_count}">{$com.settlement_contact}</td>
<!--<td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>-->
<td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>
<td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>
<!-- <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>-->
<if condition="$com['is_payment'] eq 2">
<td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
@ -178,10 +178,13 @@
<td>{$it['increment_ratio']|showNumPercent}</td>
<td>{$it['fax_ratio']|showNumPercent}</td>
<td>{$it['d_statement_money']}</td>
<!-- <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>-->
<notempty name="it['time']">
<td rowspan="{$it['row']}">{$it['time']}</td>
</notempty>
<td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>
<!-- <notempty name="it['time']">-->
<!-- <td rowspan="{$it['row']}">{$it['week_amount']}</td>-->
<!-- </notempty>-->
<!-- <notempty name="it['time']">-->
<!-- <td rowspan="{$it['row']}">{$it['time']}</td>-->
<!-- </notempty>-->
</tr>
</if>
</foreach>
@ -195,7 +198,7 @@
<td>{$count.fine}</td>
<td>{$count.reward}</td>
<td>{$count.statement_money}</td>
<td>{$count.statement_money}</td>
<!-- <td>{$count.statement_money}</td>-->
<td></td>
<td></td>
<td></td>

Write Preview
Loading…
Cancel
Save