025 interface imptovements

2025-10-14 15:14:14 +03:00
parent ab658a5a48
commit ce44051801
20 changed files with 2459 additions and 99 deletions
@@ -0,0 +1,126 @@
+<cfsilent>
+<cfimport prefix="m" taglib="lib"/>
+<cfimport prefix="c" taglib="lib/controls"/>
+<cfimport prefix="d" taglib="lib/data"/>
+<cfimport prefix="layout" taglib="layout"/>
+</cfsilent><m:silent silent="No">
+
+<m:prepare_filter entity="deal" accessObject="" lsPage="deal_ls" pageInfoOut="pageInfo" trackOut="tr"/>
+
+<m:filter_settings target="deal_ls"><!---*** вводит в заблуждение--->
+	<m:filterparam filter=#filter# param="__name" ftype="string" compare="LIKE%" field="d.__name" default=""/>
+	<m:filterparam filter=#filter# param="contragent" ftype="string" compare="LIKE%" field="k.__name" default=""/>
+	<m:filterparam filter=#filter# param="contragent_id" ftype="guid" compare="EQ" field="k.__id" default=""/>
+	<m:filterparam filter=#filter# param="wz" ftype="string" compare="LIKE%" field="k.id_klienta" default=""/>
+	<m:filterparam filter=#filter# param="status_id" ftype="numeric" compare="EQ" field="d.__status_status" default=""/>	
+</m:filter_settings>
+
+<cfif isDefined("resetAndClose") or isDefined("saveAndClose")>
+	<cflocation url="#tr.backUrl#" addtoken="No"/>
+</cfif>
+
+</m:silent><!--- ----------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------- 
+---------------------------------------------------------------------------------------------
+---><layout:page section="header" pageInfo=#pageInfo#>
+	<layout:attribute name="title"><cfoutput>Сделки - фильтр</cfoutput></layout:attribute>
+</layout:page>	
+
+<script type="text/javascript"/>
+$(document).ready(function() {	
+	try {
+		$("#contragent_id").searchable({maxMultiMatch: 50});
+	} catch (e) {alert(e)}
+});
+</script>
+
+<cfoutput>
+	<input type="hidden" name="track" value="#tr.self#"/>
+
+	<div class="detail">
+	
+		<div class="tr">
+			<div class="th"></div>
+			<div class="td">
+				<button type="button" name="reset" onClick="document.location.href='#request.thisPage#?reset=yes&track=#tr.self#'">#i18("Очистить","Clear")#</button>
+			</div>
+		</div>		
+
+		<div class="tr">
+			<div class="th">Название сделки</div>
+			<div class="td">
+				<input type="text" name="__name" value="#__name#" size="50"/> 
+				<i>#i18("по вхождению подстроки","by substring")#</i>
+			</div>
+		</div>		
+		
+		<div class="tr">
+			<div class="th">Контрагент</div>
+			<div class="td">
+				<input type="text" name="contragent" value="#contragent#" size="50"/> 
+				<i>#i18("по вхождению подстроки","by substring")#</i>
+			</div>
+		</div>			
+		
+		<div class="tr">
+			<div class="th">WZ</div>
+			<div class="td">
+				<input type="text" name="wz" value="#wz#" size="50"/> 
+				<i>#i18("по вхождению подстроки","by substring")#</i>
+			</div>
+		</div>	
+		
+		<div class="tr">
+			<div class="th">Контрагент</div>
+			<div class="td" style="vertical-align:top;">
+				<cfquery name="qList">
+					select __id::text as __id, __name, id_klienta
+					from elma.companies
+					order by __name
+				</cfquery>
+				<!--- <cfdump var=#qList#/> --->
+				
+				<c:combo 
+					query=#qList# 
+					combo="contragent_id" 
+					id="contragent_id" 
+					key="__id" 
+					displayf="##__name## ##id_klienta##" 
+					selected=#contragent_id# 
+					empty=""
+				/>	
+			</div>
+		</div>
+
+		<div class="tr">
+			<div class="th">Статус</div>
+			<div class="td" style="vertical-align:top;">
+				<cfquery name="qStatus" datasource="#request.DS#">
+					with 
+					status (status, status_id, probability_pc) as (VALUES
+						('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
+						('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
+					)
+					select status_id, status, probability_pc
+					from status 
+					order by status_id
+				</cfquery>
+				
+				<c:combo 
+					query=#qStatus# 
+					combo="status_id" 
+					id="status_id" 
+					key="status_id" 
+					displayf="##status_id## ##status## (##probability_pc##%)" 
+					selected=#status_id# 
+					empty=""
+				/>	
+			</div>
+		</div>			
+	</div><!--- detail --->	
+	добавить сюда множественный выбор статуса
+
+</cfoutput>
+
+<layout:page section="footer" closeForm="Yes"/>
+<!--- <cfdump var=#filter#> --->