From 951588a929c4f03134a7e1214a72f661bd06869c Mon Sep 17 00:00:00 2001 From: msyu Date: Sun, 7 Sep 2025 11:20:39 +0300 Subject: [PATCH] 024 contragent_ls and minor improvements --- Application.cfc | 2 +- additional_agreement_ls.cfm | 29 +++++++-- contract_ls.cfm | 24 +++++-- contragent_filter.cfm | 95 +++++++++++++++++++++++++++ contragent_ls.cfm | 124 ++++++++++++++++++++++++++++++++++++ deal_ls.cfm | 28 ++++++-- inc/menu.cfm | 6 +- payg.cfm | 41 +++++++----- 8 files changed, 312 insertions(+), 37 deletions(-) create mode 100644 contragent_filter.cfm create mode 100644 contragent_ls.cfm diff --git a/Application.cfc b/Application.cfc index fe4540b..04f7b3b 100644 --- a/Application.cfc +++ b/Application.cfc @@ -99,7 +99,7 @@ - + diff --git a/additional_agreement_ls.cfm b/additional_agreement_ls.cfm index d7ab93a..98ed814 100644 --- a/additional_agreement_ls.cfm +++ b/additional_agreement_ls.cfm @@ -28,6 +28,7 @@ d.__name as deal d.__id as deal_uid g.__name as contract + g.__id as contract_uid g.company_uid k.__name as contragent k.id_klienta as wz @@ -88,17 +89,33 @@ select count(*) as cnt from elma.aggrements d where 1=1 + + + + + + + + + + #contract# + + + + #contragent# + + #deal# @@ -112,15 +129,15 @@ select count(*) as cnt from elma.aggrements d where 1=1 - - + + - - - - + + + + diff --git a/contract_ls.cfm b/contract_ls.cfm index 7edf6eb..d972770 100644 --- a/contract_ls.cfm +++ b/contract_ls.cfm @@ -81,27 +81,41 @@ select count(*) as cnt from elma.aggrements d where 1=1 + + + + + + + + + + + + #__name# + + + + #contragent# - - - + - + - + diff --git a/contragent_filter.cfm b/contragent_filter.cfm new file mode 100644 index 0000000..1caa8c3 --- /dev/null +++ b/contragent_filter.cfm @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + Контрагенты - фильтр + + + + + +
+ +
+
+
+ +
+
+ + +
+
Контрагент
+
+ + #i18("по вхождению подстроки","by substring")# +
+
+ +
+
WZ
+
+ + #i18("по вхождению подстроки","by substring")# +
+
+ +
+
Есть сделки
+
+ checked/> +
+
+ +
+
Есть договоры
+
+ checked/> +
+
+ +
+
Есть доп.соглашения
+
+ checked/> +
+
+ + +
+ + + + + + \ No newline at end of file diff --git a/contragent_ls.cfm b/contragent_ls.cfm new file mode 100644 index 0000000..fb44e6b --- /dev/null +++ b/contragent_ls.cfm @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + select + + k.__id::text as __id + k.__index + k.__name + k.id_klienta as wz + k."__createdAt" as __createdAt + k."__updatedAt" as __updatedAt + k."__deletedAt" as __deletedAt + (select count(*) from elma.deals d where d._companies=k.__id) as deal_cnt + (select count(*) from elma.aggrements d where d.company_uid=k.__id) as contract_cnt + (select count(*) from elma.additional_agreements g join elma.aggrements d on (g.contract_uid=d.__id) where d.company_uid=k.__id) as aa_cnt + + from elma.companies k + where 1=1 + --AND exists (select * from elma.deals d where d._companies=k.__id) + order by + + + + + + + + + +select count(*) as cnt from elma.companies where 1=1 + + + + + + + + + + + + Контрагенты + + + + + + + + + + + + + + + + + + + + + + + + + + + + #__name# + + + + + + + + + + + + + + + + + + + + + + #gridFooter# + + + diff --git a/deal_ls.cfm b/deal_ls.cfm index aefd18a..c895c84 100644 --- a/deal_ls.cfm +++ b/deal_ls.cfm @@ -47,12 +47,17 @@ g.__name as contract g.__id as contract_uid g.date_of_aggrement as dt_contract - + + + + + @@ -136,6 +144,10 @@ select count(*) as cnt from elma.deals d where 1=1 + + #__name# + + #additional_agreement# @@ -157,7 +169,7 @@ select count(*) as cnt from elma.deals d where 1=1 - + @@ -169,6 +181,8 @@ select count(*) as cnt from elma.deals d where 1=1 + + diff --git a/inc/menu.cfm b/inc/menu.cfm index 0caedbd..5b13946 100644 --- a/inc/menu.cfm +++ b/inc/menu.cfm @@ -26,11 +26,11 @@ ---> - - + diff --git a/payg.cfm b/payg.cfm index 927ca7f..313fb4d 100644 --- a/payg.cfm +++ b/payg.cfm @@ -34,7 +34,7 @@ select k.id_klienta as wz, k.__id::text as contragent_uid, p.code, p.price, p.discount, k.__name as contragent, a.__name as contract, a.__id::text as contract_uid, d.__name as deal, d.__id::text as deal_uid, siv.abstractive_service as abstract_service, siv.modifier, siv.user_description, siv.hash as line_key ,siv.date_nop as dt_from, siv.date_end as dt_to - /*,p.__name as line_key*/, p.ed_izm, aa.__name as additional_agreement, aa.__id::text as additional_agreement_uid + /*,p.__name as line_key*/, p.ed_izm, p.name as component, aa.__name as additional_agreement, aa.__id::text as additional_agreement_uid --, aa.is_actual from elma.deals d join elma.deals_services siv on (d.__id=ANY(siv.deal)) @@ -293,6 +293,7 @@ SELECT s.deal_uid s.abstract_service s.modifier + s.component s.user_description FROM qSpec as s, qUnifiedMetric as m WHERE s.wz=m.wz AND s.code=m.code @@ -350,19 +351,24 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M Артикул Кол-во (метрика) Ед.изм. - Цена ₽ с НДС + Цена ₽ со скид., с НДС Стоимость ₽ с НДС -     + +     + + Услуга + Компонент + Клиентс. назв. + + GPL с НДС + Скидка% + Дата НОУ Дата оконч. - GPL с НДС - Скидка% - Услуга - Клиентс. назв. + Ключ строки Сырая метрика Приведен­ная метрика - Договор Допник @@ -382,23 +388,28 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M #currentRow# - + #code# #chargeable_metric# #ed_izm# #discounted_price# #charge# - - #dateFormat(dt_from,'YYYY-MM-DD')# - #dateFormat(dt_to,'YYYY-MM-DD')# + + + + #abstract_service# #modifier# + #component# + #user_description# + #price# #discount# - #abstract_service# #modifier# - #user_description# + + #dateFormat(dt_from,'YYYY-MM-DD')# + #dateFormat(dt_to,'YYYY-MM-DD')# + #line_key# #raw_metric# #metric# - #contract# #additional_agreement# #deal#