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

009 reports

Browse Source
This commit is contained in:
msyu
2025-06-21 17:06:29 +03:00
parent 89a3407fc3
commit 672123968b
12 changed files with 729 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specification_version.cfm
+9 -4
View File
@@ -61,7 +61,7 @@
</cfquery>
<cfquery name="qAgreement" datasource="#request.DS#">
select a.agreement, a.agreement_version, a.dt_agreement, a.is_actual
select a.agreement, a.agreement_version, a.dt_agreement, a.is_actual, a.probability_perc
from agreement a
where a.contract_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#d.contract_id#"/>
AND a.agreement_version=<cfqueryparam cfsqltype="cf_sql_integer" value="#agreement_version#" null=#!isValid('integer', agreement_version)#>
@@ -143,7 +143,7 @@
<div class="th">Соглашение</div>
<div class="td">
<a href="argeement.cfm?contract_id=#d.contract_id#&agreement_version=#agreement_version#&#tr.fwx#">
#qAgreement.agreement# [#qAgreement.agreement_version#] #dateFormat(qAgreement.dt_agreement,'DD.MM.YYYY')#
#qAgreement.agreement# [#qAgreement.agreement_version#] #dateFormat(qAgreement.dt_agreement,'DD.MM.YYYY')# <cfif len(qAgreement.probability_perc)>#qAgreement.probability_perc#%</cfif>
</a>
</div>
@@ -203,16 +203,18 @@
,p.pricing_model_short
,s.specification_id
,s.contract_id
,(select count(*) from specification_item_version siv where siv.specification_item_uid=i.specification_item_uid) as item_version_count
,(select count(*) from specification_item_version siv where siv.specification_item_uid=i.specification_item_uid) as item_version_count
,ver.agreement_version
,ver.specification_item_uid
,ver.agreement
,ver.dt_agreement
,ver.is_actual
,ver.probability_perc
,ver.specification_item_version as specification_item
,ver.quantity
,ver.price
,ver.quantity*ver.price as cost
,ver.quantity*ver.price*probability_perc/100 as cost_p
,ver.dt_from
,ver.dt_to
from specification_item i
@@ -225,6 +227,7 @@
,a.contract_id
,a.dt_agreement
,a.is_actual
,a.probability_perc
,siv.specification_item_version
,siv.quantity
,siv.price
@@ -281,6 +284,7 @@
<th>Кол-во</th>
<th>Цена</th>
<th>Стоимость</th>
<th>Ст-ть с вер.</th>
<th>Дата с</th>
<th>Дата по</th>
@@ -311,6 +315,7 @@
<td class="r">#quantity#</td>
<td class="r">#price#</td>
<td class="r">#cost#</td>
<td class="r">#cost_p#</td>
<td class="c">#dateFormat(dt_from,'DD.MM.YYYY')#</td>
<td class="c">#dateFormat(dt_to,'DD.MM.YYYY')#</td>
@@ -318,7 +323,7 @@
<td class="c"></td>
<td class="c">#item_version_count#</td>
<td><a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#agreement# #dateFormat(dt_agreement,'DD.MM.YYYY')#</td>
<td><a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#agreement# #dateFormat(dt_agreement,'DD.MM.YYYY')# <cfif len(probability_perc)>#probability_perc#%</cfif></td>
<td class="c"><a href="specification_item_version.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#qItem.agreement_version#&#tr.fwx#">#qItem.agreement_version#</a> <cfif is_actual><img src="img/ok.png"/></cfif></td>