From 432a6c2978d628eab06ed05435c5bb97aa7f32a4 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Mon, 18 Aug 2025 15:50:36 +0300
Subject: [PATCH] 005 appearance

---
 Application.cfc |  2 +-
 layout/page.cfm |  2 +-
 payg.cfm        | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index bd73635..3454b33 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -99,7 +99,7 @@
 		
 		
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.004"/>
+		<cfset request.APP_VERSION="0.00.005"/>
 		<cfset request.STAND=getStand()/>		
 		
 		<cflock scope="application" type="readonly" timeout=3>
diff --git a/layout/page.cfm b/layout/page.cfm
index 8f68c66..5b43472 100644
--- a/layout/page.cfm
+++ b/layout/page.cfm
@@ -126,7 +126,7 @@ select login, firstname, middlename, lastname from worker where id='#request.usr
 				<!--- <div style="width:20px; height:30px; margin: 5px; background: url('img/logo0.png') 0 0 no-repeat; background-size:contain; display:inline-block;"></div>--->
 				<div style="width:138px; height:30px; margin: 5px 0 0 5px; background: url('img/logo0.png') 0 0 no-repeat; background-size:contain; display:inline-block; -border:1px solid red;">				
 					<p class="b r" style="color:white; margin:0 10px 10px 10px; font-size:130%;">
-						Спецификации
+						Отчет PAYG
 					</p>
 				</div> 
 				<p style="color:lightgray; margin:10px 12px; text-align:right;">
diff --git a/payg.cfm b/payg.cfm
index 3beec5c..6d5c650 100644
--- a/payg.cfm
+++ b/payg.cfm
@@ -306,12 +306,12 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 <table class="worktable">	
 	<thead>
 		<td width="1%"></td>
-		<td width="3%">WZ</td>
-		<td width="5%">Артикул</td>		
-		<td width="3%">Кол-во (метрика)</td>
-		<td width="3%">Ед.изм.</td>
-		<td width="3%">Цена с НДС</td>
-		<td width="3%">Ст-ть</td>
+		<th width="3%">WZ</th>
+		<th width="7%">Артикул</th>		
+		<th width="7%">Кол-во (метрика)</th>
+		<th width="3%">Ед.изм.</th>
+		<th width="3%">Цена &#8381; с НДС</th>
+		<th width="3%">Стоимость &#8381; с НДС</th>
 		<td width="3%">&nbsp;&nbsp;&nbsp;</td>			
 		<td width="6%">Дата НОУ</td>
 		<td width="6%">Дата оконч.</td>
@@ -321,9 +321,9 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 		<td width="3%">Сырая метрика</td>
 		<td width="3%">Приведен&shy;ная метрика</td>
 		<td width="7%">Контрагент</td>
-		<td width="3%">Договор</td>
-		<td width="3%">Допник</td>
-		<td width="3%">Сделка</td>
+		<td width="5%">Договор</td>
+		<td width="10%">Допник</td>
+		<td width="10%">Сделка</td>
 		<td width="10%">Услуга</td>
 		<td width="8%">Клиентс. назв.</td>
 	</thead>
@@ -336,8 +336,8 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 			<td>#currentRow#</a></td>
 			<td><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a></td>
 			<td>#code#</td>	
-			<td class="r">#chargeable_metric#</td>
-			<td>#ed_izm#</td>
+			<td class="r" style="font-size:120%; padding:0 1em;">#chargeable_metric#</td>
+			<td class="c" style="font-size:90%;">#ed_izm#</td>
 			<td class="r">#discounted_price#</td>
 			<td class="r">#charge#</td>
 			<td></td>								
@@ -357,9 +357,9 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
 		</tr>
 		</cfoutput>
 		<tr>
-			<td></td>
-			<td colspan="5" class="b"><a href="contragent.cfm?__id=#contragent_uid#&#tr.fwx#">#wz#</a> #contragent#</td>
-			<td colspan="1" class="r b">#NumFmt(acc,2)#</td>
+			<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 colspan="14"></td>
 		</tr>
 	</cfoutput>