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

024 contragent_ls and minor improvements

Browse Source
This commit is contained in:
msyu
2025-09-07 11:20:39 +03:00
parent 09612a470c
commit 951588a929
8 changed files with 312 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deal_ls.cfm
+21 -7
View File
@@ -47,12 +47,17 @@
<d:field title="Договор">g.__name as contract</d:field>
<d:field title="Договор">g.__id as contract_uid</d:field>
<d:field title="Дата дог.">g.date_of_aggrement as dt_contract</d:field>
<!--- <d:field>(select sum(param_cost)
from component
where d.__id = ANY(component.deal_uids) AND component.type IN (1)
) as install
</d:field>
<d:field>(select sum(param_cost)
<!--- <d:field>(select count(*)
from elma.deals_services siv
where d.__id = ANY(siv.deal)
) as line_cnt
</d:field> --->
<!--- <d:field>(select count(*)
from elma.deals_services siv
where d.__id = ANY(siv.deal) AND siv.is_actual
) as line_cnt_actual
</d:field> --->
<!---<d:field>(select sum(param_cost)
from component
where d.__id = ANY(component.deal_uids) AND component.type IN (2)
) as periodical
@@ -119,6 +124,9 @@ select count(*) as cnt from elma.deals d where 1=1
<cfset queryAddColumn(qRead,'f_link_view_edit')/>
<cfset titleMap.f_link_view_edit={ordinal=#StructCount(titleMap)+1#}/><!--- *** Это легко забыть, потому что TitleMap никак не сцеплен с qRead. Напрашивается: упаковать их в одну обертку (но тогда обращение станет длиннее). Еще идея - назвать qRead и TitleMap так, чтобы была видна их связь. --->
<!--- <cfdump var=#titleMap#/> --->
<cfset queryAddColumn(qRead,'f_deal')/>
<cfset titleMap.f_deal=titleMap.__name/>
<cfset queryAddColumn(qRead,'f_additional_agreement')/>
<cfset titleMap.f_additional_agreement=titleMap.additional_agreement/>
@@ -136,6 +144,10 @@ select count(*) as cnt from elma.deals d where 1=1
<a href="deal.cfm?__id=#__id#&#tr.fwx#" name="#__id#" title="просмотр" class="view"></a>
</cfsavecontent>
<cfsavecontent variable="qRead.f_deal">
<a href="deal.cfm?__id=#__id#&#tr.fwx#">#__name#</a>
</cfsavecontent>
<cfsavecontent variable="qRead.f_additional_agreement">
<a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a>
</cfsavecontent>
@@ -157,7 +169,7 @@ select count(*) as cnt from elma.deals d where 1=1
</c:column>
<c:column width="3%" field="__index"><c:td class="r"/></c:column>
<c:column width="10%" field="__name"/>
<c:column width="10%" field="f_deal"/>
<!--- <c:column width="10%" field="_companies"/> --->
<c:column width="10%" field="f_contragent"/>
<c:column width="3%" field="wz"/>
@@ -169,6 +181,8 @@ select count(*) as cnt from elma.deals d where 1=1
<c:column width="5%" field="f_additional_agreement"><c:td class="l"/></c:column>
<c:column width="5%" field="f_contract"><c:td class="l"/></c:column>
<c:column width="5%" field="dt_contract" formatter=#function(dt){return dateformat(dt,"YYYY-MM-DD");}#><c:td class="c"/></c:column>
<!--- <c:column width="1%" field="line_cnt"><c:td class="c"/></c:column> --->
<!--- <c:column width="1%" field="line_cnt_actual"><c:td class="c"/></c:column> --->
<!--- <c:column width="5%" field="install" formatter=#nFmt#><c:td class="c"/></c:column>
<c:column width="5%" field="periodical" formatter=#nFmt#><c:td class="c"/></c:column>
<c:column width="5%" field="metered" formatter=#nFmt#><c:td class="c"/></c:column> --->