intermediate draft 5
This commit is contained in:
@@ -15,8 +15,21 @@
|
||||
<cfreturn htmlEditFormat(s)/>
|
||||
</cffunction>
|
||||
|
||||
<m:prepare_detail entity="specification_item_version" key="specification_item_uid" pageInfoOut="pageInfo"/>
|
||||
<!--- так... а у нас ключ составной --->
|
||||
|
||||
<!--- так... а у нас ключ составной, prepare_detail несколько сложнее --->
|
||||
<cfparam name="specification_item_uid" type="guid"/>
|
||||
<cfparam name="agreement_version" type="integer" default="-1"/>
|
||||
<m:prepare_detail
|
||||
entity="specification_item_version"
|
||||
key="undefined"
|
||||
pageInfoOut="pageInfo"
|
||||
thisUrl="#request.thisPage#?specification_item_uid=#specification_item_uid#&agreement_version=#agreement_version#"
|
||||
defaultBackUrl="specification_item.cfm?specification_item_uid=#specification_item_uid#"
|
||||
/>
|
||||
|
||||
<!--- <cfdump var=#pageInfo#/>
|
||||
<cfdump var=#specification_item_version#/>
|
||||
<cfabort/> --->
|
||||
|
||||
<d:bean readonly=#!pageInfo.writePermitted()# table="#pageInfo.entity#" datasource="#request.DS#" output="d" status="status">
|
||||
<d:param field="specification_item_uid" type="guid" key/>
|
||||
@@ -142,8 +155,12 @@
|
||||
<a href="contragent.cfm?contragent_id=#qSpecificationItem.contragent_id#&#tr.fwx#">#qSpecificationItem.contragent# </a>
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Строка">
|
||||
#d.specification_item_uid#
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Услуга">
|
||||
<a href="svc.cfm?svc_id=#qSpecificationItem.svc_id#&#tr.fwx#">[#d.specification_item_uid#] #qSpecificationItem.svc#</a>
|
||||
<a href="svc.cfm?svc_id=#qSpecificationItem.svc_id#&#tr.fwx#">#qSpecificationItem.svc# [#qSpecificationItem.svc_id#]</a>
|
||||
</layout:detail_line>
|
||||
|
||||
<!--- <layout:detail_line title="Версия">#d.agreement_version# (версия-номер соглашения)</layout:detail_line> --->
|
||||
@@ -164,6 +181,28 @@
|
||||
class=""
|
||||
/>
|
||||
(версия-номер соглашения)
|
||||
<!--- *** можно придумать коструктор ссылок с декоратором tr.fwx --->
|
||||
<cfif d.agreement_version GT 0>
|
||||
<a href="agreement.cfm?agreement_version=#d.agreement_version#&contract_id=#qSpecificationItem.contract_id#&#tr.fwx#">
|
||||
#d.agreement_version#
|
||||
</a>
|
||||
</cfif>
|
||||
<a href="agreement.cfm?contract_id=#qSpecificationItem.contract_id#&#tr.fwx#">
|
||||
<img src="img/add.gif"/>
|
||||
</a>
|
||||
|
||||
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Дата с">
|
||||
<input type="date" name="dt_from" id="dt_from" value="#dateFormat(d.dt_from,"YYYY-MM-DD")#"/>
|
||||
<button type="button" onclick="document.getElementById('dt_from').value='#DateFormat(Now(), 'YYYY-MM-DD')#';">Сегодня</button>
|
||||
на макете мы пока собираем цепочки дат руками
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Дата по">
|
||||
<input type="date" name="dt_to" id="dt_to" value="#dateFormat(d.dt_to,"YYYY-MM-DD")#"/>
|
||||
<button type="button" onclick="document.getElementById('dt_to').value='#DateFormat(Now(), 'YYYY-MM-DD')#';">Сегодня</button>
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Имя для печати">
|
||||
@@ -171,18 +210,8 @@
|
||||
<!--- <button type="button" onclick="document.getElementById('specification_item_version').value='';submit();">Сформировать</button> --->
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Дата с">
|
||||
<input type="date" name="dt_from" id="dt_from" value="#dateFormat(d.dt_from,"YYYY-MM-DD")#"/>
|
||||
<button type="button" onclick="document.getElementById('dt_from').value='#DateFormat(Now(), 'YYYY-MM-DD')#';">Сегодня</button>
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Дата по">
|
||||
<input type="date" name="dt_to" id="dt_to" value="#dateFormat(d.dt_to,"YYYY-MM-DD")#"/>
|
||||
<button type="button" onclick="document.getElementById('dt_to').value='#DateFormat(Now(), 'YYYY-MM-DD')#';">Сегодня</button>
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Количество">
|
||||
<input type="text" name="quantity" value="#d.quantity#" size="5" class="r"/><!---*** Халява с точностью ---><!--- <cftry>#round(d.quantity,qService.precision)#<cfcatch type="ANY"></cfcatch></cftry> --->
|
||||
<input type="text" name="quantity" value="#d.quantity#" size="10" class="r"/><!---*** Халява с точностью ---><!--- <cftry>#round(d.quantity,qService.precision)#<cfcatch type="ANY"></cfcatch></cftry> --->
|
||||
</layout:detail_line>
|
||||
|
||||
<layout:detail_line title="Цена">
|
||||
|
||||
Reference in New Issue
Block a user