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

017 improvements

Browse Source
This commit is contained in:
msyu
2025-08-27 16:42:41 +03:00
parent 9752bc9742
commit 517585258d
4 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deal_ls.cfm
+19 -6
View File
@@ -27,18 +27,26 @@
select
<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
<d:field title="ID" cfSqlType="CF_SQL_OTHER">d.__id</d:field>
<d:field title="index" cfSqlType="CF_SQL_INTEGER">d.__index</d:field>
<d:field title="Название">d.__name</d:field>
<d:field title="company_uid">d._companies</d:field>
<d:field title="Создана">d."__createdAt" as __createdAt</d:field><!--- *** косяк d:field, если взять в кавычки имя поля, оно не попадает в массив полей --->
<d:field title="Контрагент">k.__name as contragent</d:field>
<d:field title="WZ">k.id_klienta as wz</d:field>
<d:field title="status_id">d.__status_status</d:field>
<d:field title="Статус">s.status</d:field>
<d:field title="Вероятность%">s.probability_pc</d:field>
<d:field title="Ответственный">c.__name as owner</d:field>
<d:field title="Допник">a.__name as additional_agreement</d:field>
<d:field title="Договор">g.__name as contract</d:field>
<d:field title="Дата дог.">g.date_of_aggrement as dt_contract</d:field>
</d:field_set>
from elma.deals d
left outer join elma.companies k on (d._companies=k.__id)
left outer join status s on (d.__status_status=s.status_id)
left outer join elma.comp_users_ext c on (d._owner=c.__id)
left outer join elma.additional_agreements a on (d.__id=a.deal_uid)
left outer join elma.aggrements g on (a.contract_uid = g.__id)
where 1=1 <m:filter_build filter=#pageInfo.settings.filter#/>
order by <m:order_build sortArray=#pageInfo.settings.sort.sortArray# fieldCount=#fieldCount#/>
</cfquery>
@@ -103,14 +111,19 @@ select count(*) as cnt from elma.deals d where 1=1
<c:td field="f_link_view_edit" class="c"/>
</c:column>
<c:column width="10%" field="__id"><c:td class="l"/></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="_companies"/>
<!--- <c:column width="10%" field="_companies"/> --->
<c:column width="10%" field="contragent"/>
<c:column width="5%" field="wz"/>
<c:column width="3%" field="wz"/>
<c:column width="3%" field="__status_status"><c:td class="c"/></c:column>
<c:column width="10%" field="status"><c:td class="c"/></c:column>
<c:column width="5%" field="probability_pc"><c:td class="c"/></c:column>
<c:column width="5%" field="status"><c:td class="c"/></c:column>
<c:column width="3%" field="probability_pc"><c:td class="c"/></c:column>
<c:column width="5%" field="__createdAt" formatter=#function(dt){return dateformat(dt,"YYYY-MM-DD");}#><c:td class="c"/></c:column>
<c:column width="8%" field="owner"><c:td class="l"/></c:column>
<c:column width="5%" field="additional_agreement"><c:td class="l"/></c:column>
<c:column width="5%" field="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:table>