builder.pg avro_schema

deal_filter.cfm

@@ -10,6 +10,7 @@
 <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>
@@ -24,15 +25,15 @@
 ---><layout:page section="header" pageInfo=#pageInfo#>
 	<layout:attribute name="title"><cfoutput>Сделки - фильтр</cfoutput></layout:attribute>
 </layout:page>	
-<!---<script type="text/javascript"/>
-$(document).ready(function() {
-	
+
+<script type="text/javascript"/>
+$(document).ready(function() {	
 	try {
-		$("#customer_id").searchable({maxMultiMatch: 50});
-		$("#service_manager_id").searchable({maxMultiMatch: 50});
+		$("#contragent_id").searchable({maxMultiMatch: 50});
 	} catch (e) {alert(e)}
 });
-</script>--->
+</script>
+
 <cfoutput>
 	<input type="hidden" name="track" value="#tr.self#"/>
 
@@ -46,7 +47,7 @@ $(document).ready(function() {
 		</div>		
 
 		<div class="tr">
-			<div class="th">Название</div>
+			<div class="th">Название сделки</div>
 			<div class="td">
 				<input type="text" name="__name" value="#__name#" size="50"/> 
 				<i>#i18("по вхождению подстроки","by substring")#</i>
@@ -68,6 +69,28 @@ $(document).ready(function() {
 				<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>
@@ -93,10 +116,9 @@ $(document).ready(function() {
 					empty=""
 				/>	
 			</div>
-		</div>	
-	
-		
+		</div>			
 	</div><!--- detail --->	
+	добавить сюда множественный выбор статуса
 
 </cfoutput>