优化空值显示

master
chenzhi 5 years ago
parent 61e6d8131c
commit 1ec951d344

@ -1029,7 +1029,7 @@ function PromoteStatistics($orderNo) {
}
function showPercent($num)
{
if($num-0 > 0){
if($num-0 >= 0){
if(strpos($num,"%")){
return $num;
}else{

@ -94,15 +94,15 @@
<volist name="listData" id="data">
<tr>
<td rowspan="{$data.row}">{$data.partner}</td>
<td rowspan="{$data.row}">{$data.matche_platform}</td>
<td rowspan="{$data.row}">{$data.company_type}</td>
<td rowspan="{$data.row}">{$data.matche_platform|default="--"}</td>
<td rowspan="{$data.row}">{$data.company_type|default="--"}</td>
<notempty name="data.game">
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['original_package_name']}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['relation_game_name']}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['game_type_name']}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['original_package_name']|default="--"}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['relation_game_name']|default="--"}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['game_type_name']|default="--"}</td>
<notempty name="data['game'][0]['game_ratio']">
<td>{$data['game'][0]['game_ratio'][0]['name']}</td>
<td>{$data['game'][0]['game_ratio'][0]['ratio']}%</td>
<td>{$data['game'][0]['game_ratio'][0]['name']|default="--"}</td>
<td>{$data['game'][0]['game_ratio'][0]['ratio']|showPercent}</td>
<else />
<td >-</td>
<td>-</td>
@ -115,37 +115,37 @@
<td>-</td>
</notempty>
<td rowspan="{$data.row}">{$data.settlement_type}</td>
<td rowspan="{$data.row}">{$data.payee_name}</td>
<td rowspan="{$data.row}">&nbsp;{$data.bank_account}</td>
<td rowspan="{$data.row}">{$data.opening_bank}</td>
<td rowspan="{$data.row}">{$data.has_advance_charge}</td>
<td rowspan="{$data.row}">{$data.is_collection}</td>
<td rowspan="{$data.row}">{$data.settlement_type|default="--"}</td>
<td rowspan="{$data.row}">{$data.payee_name|default="--"}</td>
<td rowspan="{$data.row}">&nbsp;{$data.bank_account|default="--"}</td>
<td rowspan="{$data.row}">{$data.opening_bank|default="--"}</td>
<td rowspan="{$data.row}">{$data.has_advance_charge|default="--"}</td>
<td rowspan="{$data.row}">{$data.is_collection|default="--"}</td>
<td rowspan="{$data.row}">{$data.advance_amount}</td>
<td rowspan="{$data.row}">{$data.is_sign_contract}</td>
<td rowspan="{$data.row}">{$data.advance_amount|default="--"}</td>
<td rowspan="{$data.row}">{$data.is_sign_contract|default="--"}</td>
<td rowspan="{$data.row}">{$data.contract_time}</td>
<td rowspan="{$data.row}">{$data.validity_time}</td>
<td rowspan="{$data.row}">{$data.invoice_rate}%</td>
<td rowspan="{$data.row}">{$data.invoice_rate|showPercent}</td>
<td rowspan="{$data.row}">{$data.invoice_type}</td>
<td rowspan="{$data.row}">{$data.taxation_rate}%</td>
<td rowspan="{$data.row}">{$data.invoice_type|default="--"}</td>
<td rowspan="{$data.row}">{$data.taxation_rate|showPercent}</td>
<td rowspan="{$data.row}">{$data.channel_rate}%</td>
<td rowspan="{$data.row}">{$data.reg_address}</td>
<td rowspan="{$data.row}">{$data.reg_phone}</td>
<td rowspan="{$data.row}">{$data.link_man}</td>
<td rowspan="{$data.row}">{$data.channel_rate|showPercent}</td>
<td rowspan="{$data.row}">{$data.reg_address|default="--"}</td>
<td rowspan="{$data.row}">{$data.reg_phone|default="--"}</td>
<td rowspan="{$data.row}">{$data.link_man|default="--"}</td>
<td rowspan="{$data.row}">{$data.link_phone}</td>
<td rowspan="{$data.row}">{$data.address}</td>
<td rowspan="{$data.row}">{$data.link_phone|default="--"}</td>
<td rowspan="{$data.row}">{$data.address|default="--"}</td>
</tr>
<if condition="$data['game'][0]['row'] gt 1">
<foreach name="data['game'][0]['game_ratio']" item="game_ratio" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td>{$game_ratio['name']}</td>
<td>{$game_ratio['ratio']}%</td>
<td>{$game_ratio['name']|default="--"}</td>
<td>{$game_ratio['ratio']|showPercent}</td>
</tr>
</if>
</foreach>
@ -155,12 +155,12 @@
<foreach name="data['game']" item="game" key="gkey">
<if condition="$gkey gt 0">
<tr>
<td rowspan="{$game['row']}">{$game['original_package_name']}</td>
<td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
<td rowspan="{$game['row']}">{$game['game_type_name']}</td>
<td rowspan="{$game['row']}">{$game['original_package_name']|default="--"}</td>
<td rowspan="{$game['row']}">{$game['relation_game_name']|default="--"}</td>
<td rowspan="{$game['row']}">{$game['game_type_name']|default="--"}</td>
<notempty name="game['game_ratio']">
<td>{$game['game_ratio'][0]['name']}</td>
<td>{$game['game_ratio'][0]['ratio']}%</td>
<td>{$game['game_ratio'][0]['name']|default="--"}</td>
<td>{$game['game_ratio'][0]['ratio']|showPercent}</td>
<else />
<td >-</td>
<td>-</td>
@ -171,8 +171,8 @@
<foreach name="game['game_ratio']" item="game_ratio" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td>{$game_ratio['name']}</td>
<td>{$game_ratio['ratio']}%</td>
<td>{$game_ratio['name']|default="--"}</td>
<td>{$game_ratio['ratio']|showPercent}</td>
</tr>
</if>
</foreach>

@ -124,15 +124,15 @@
<volist name="listData" id="data">
<tr>
<td rowspan="{$data.row}">{$data.partner}</td>
<td rowspan="{$data.row}">{$data.matche_platform}</td>
<td rowspan="{$data.row}">{$data.company_type}</td>
<td rowspan="{$data.row}">{$data.matche_platform|default="--"}</td>
<td rowspan="{$data.row}">{$data.company_type|default="--"}</td>
<notempty name="data.game">
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['original_package_name']}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['relation_game_name']}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['game_type_name']}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['original_package_name']|default="--"}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['relation_game_name']|default="--"}</td>
<td rowspan="{$data['game'][0]['row']}">{$data['game'][0]['game_type_name']|default="--"}</td>
<notempty name="data['game'][0]['game_ratio']">
<td>{$data['game'][0]['game_ratio'][0]['name']}</td>
<td>{$data['game'][0]['game_ratio'][0]['ratio']}%</td>
<td>{$data['game'][0]['game_ratio'][0]['name']|default="--"}</td>
<td>{$data['game'][0]['game_ratio'][0]['ratio']|showPercent}</td>
<else />
<td >-</td>
<td>-</td>
@ -145,11 +145,11 @@
<td>-</td>
</notempty>
<td rowspan="{$data.row}">{$data.settlement_type}</td>
<td rowspan="{$data.row}">{$data.payee_name}</td>
<td rowspan="{$data.row}">{$data.bank_account}</td>
<td rowspan="{$data.row}">{$data.opening_bank}</td>
<td rowspan="{$data.row}">{$data.has_advance_charge}</td>
<td rowspan="{$data.row}">{$data.settlement_type|default="--"}</td>
<td rowspan="{$data.row}">{$data.payee_name|default="--"}</td>
<td rowspan="{$data.row}">{$data.bank_account|default="--"}</td>
<td rowspan="{$data.row}">{$data.opening_bank|default="--"}</td>
<td rowspan="{$data.row}">{$data.has_advance_charge|default="--"}</td>
<td rowspan="{$data.row}">{$data.is_collection}</td>
@ -163,8 +163,8 @@
<foreach name="data['game'][0]['game_ratio']" item="game_ratio" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td>{$game_ratio['name']}</td>
<td>{$game_ratio['ratio']}%</td>
<td>{$game_ratio['name']|default="--"}</td>
<td>{$game_ratio['ratio']|showPercent}</td>
</tr>
</if>
</foreach>
@ -174,12 +174,12 @@
<foreach name="data['game']" item="game" key="gkey">
<if condition="$gkey gt 0">
<tr>
<td rowspan="{$game['row']}">{$game['original_package_name']}</td>
<td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
<td rowspan="{$game['row']}">{$game['game_type_name']}</td>
<td rowspan="{$game['row']}">{$game['original_package_name']|default="--"}</td>
<td rowspan="{$game['row']}">{$game['relation_game_name']|default="--"}</td>
<td rowspan="{$game['row']}">{$game['game_type_name']|default="--"}</td>
<notempty name="game['game_ratio']">
<td>{$game['game_ratio'][0]['name']}</td>
<td>{$game['game_ratio'][0]['ratio']}%</td>
<td>{$game['game_ratio'][0]['name']|default="--"}</td>
<td>{$game['game_ratio'][0]['ratio']|showPercent}</td>
<else />
<td >-</td>
<td>-</td>
@ -190,8 +190,8 @@
<foreach name="game['game_ratio']" item="game_ratio" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td>{$game_ratio['name']}</td>
<td>{$game_ratio['ratio']}%</td>
<td>{$game_ratio['name']|default="--"}</td>
<td>{$game_ratio['ratio']|showPercent}</td>
</tr>
</if>
</foreach>

Loading…
Cancel
Save