smishchuk/payg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

007 fomatting

Browse Source
This commit is contained in:
msyu
2025-08-19 14:46:35 +03:00
parent 798110c27f
commit e36742edb7
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.cfc
+1 -1
View File
@@ -99,7 +99,7 @@
<cfset request.RECORDS_PER_PAGE=500/>
<cfset request.APP_VERSION="0.00.006"/>
<cfset request.APP_VERSION="0.00.007"/>
<cfset request.STAND=getStand()/>
<cflock scope="application" type="readonly" timeout=3>
payg.cfm
+20 -13
View File
@@ -325,7 +325,7 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
<table class="worktable">
<thead>
<td width="1%"></td>
<th width="3%">WZ</th>
<!--- <th width="3%">WZ</th> --->
<th width="7%">Артикул</th>
<th width="7%">Кол-во (метрика)</th>
<th width="3%">Ед.изм.</th>
@@ -334,26 +334,33 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
<td width="3%">&nbsp;&nbsp;&nbsp;</td>
<td width="6%">Дата НОУ</td>
<td width="6%">Дата оконч.</td>
<td width="3%">Ключ строки</td>
<td width="3%">GPL с НДС</td>
<td width="3%">Скидка%</td>
<td width="10%">Услуга</td>
<td width="10%">Клиентс. назв.</td>
<td width="3%">Ключ строки</td>
<td width="3%">Сырая метрика</td>
<td width="3%">Приведен&shy;ная метрика</td>
<td width="7%">Контрагент</td>
<!--- <td width="7%">Контрагент</td> --->
<td width="5%">Договор</td>
<td width="10%">Допник</td>
<td width="10%">Сделка</td>
<td width="10%">Услуга</td>
<td width="8%">Клиентс. назв.</td>
</thead>
<cfoutput query="qCharge" group="wz">
<cfset var acc=0/>
<tr>
<td bgcolor="##ccc"></td>
<td bgcolor="##ccc" colspan="5" class="b"><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#</td>
<td colspan="99"></td>
</tr>
<cfoutput>
<cfset acc=acc+charge/>
<tr>
<td>#currentRow#</a></td>
<td><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a></td>
<!--- <td><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a></td> --->
<td>#code#</td>
<td class="r" style="font-size:120%; padding:0 1em;">#chargeable_metric#</td>
<td class="c" style="font-size:90%;">#ed_izm#</td>
@@ -362,23 +369,23 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
<td></td>
<td class="r">#dateFormat(dt_from,'YYYY-MM-DD')#</td>
<td class="r">#dateFormat(dt_to,'YYYY-MM-DD')#</td>
<td class="r">#line_key#</td>
<td class="r">#price#</td>
<td class="r">#discount#</td>
<td>#abstract_service# #modifier#</td>
<td>#user_description#</td>
<td class="r">#line_key#</td>
<td class="r" style="color:lightgray">#raw_metric#</td>
<td class="r">#metric#</td>
<td><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#contragent#</a></td>
<!--- <td><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#contragent#</a></td> --->
<td><a href="contract.cfm?__id=#contract_uid#&#tr.fwx#">#contract#</a></td>
<td><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
<td><a href="deal.cfm?__id=#deal_uid#&#tr.fwx#">#deal#</a></td>
<td>#abstract_service# #modifier#</td>
<td>#user_description#</td>
</tr>
</cfoutput>
<tr>
<td bgcolor="##ccc"></td>
<td bgcolor="##ccc" colspan="5" class="b"><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#</td>
<td bgcolor="##ccc" colspan="1" class="r b">#NumFmt(acc,2)#</td>
<td bgcolor="##eee"></td>
<td bgcolor="##eee" colspan="4" class="r"><b>Итого</b> <a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#:</td>
<td bgcolor="##eee" colspan="1" class="r b">#NumFmt(acc,2)#</td>
<td colspan="14"></td>
</tr>
</cfoutput>