007 interface improvements

This commit is contained in:
msyu
2025-06-20 20:57:01 +03:00
parent def6e53cf2
commit c38c014fc6
5 changed files with 82 additions and 49 deletions
+40 -22
View File
@@ -144,7 +144,8 @@
<div class="td">
<a href="argeement.cfm?contract_id=#d.contract_id#&agreement_version=#agreement_version#&#tr.fwx#">
#qAgreement.agreement# [#qAgreement.agreement_version#] #dateFormat(qAgreement.dt_agreement,'DD.MM.YYYY')#
</a>
</a>
</div>
</div>
@@ -178,6 +179,9 @@
</cfif>
&nbsp;
</cfoutput>
<a href="agreement.cfm?contract_id=#qContract.contract_id#&#tr.fwx#">
<img src="img/add.gif"/>
</a>
</div>
</div>
@@ -208,6 +212,7 @@
,ver.specification_item_version as specification_item
,ver.quantity
,ver.price
,ver.quantity*ver.price as cost
,ver.dt_from
,ver.dt_to
from specification_item i
@@ -255,7 +260,7 @@
Строки спецификации (#qItem.recordCount#)
<cfif pageInfo.writePermitted()>
<cfoutput>
<cfset addUrl="specification_item.cfm?specification_item_uid=&specification_id=#d.specification_id#&#tr.fwx#"/>
<cfset addUrl="specification_item.cfm?specification_item_uid=&specification_id=#d.specification_id#&agreement_version=#agreement_version#&#tr.fwx#"/>
<button type="button" class="maincontrol" onclick="document.location.href='#addUrl#'">
<a href="#addUrl#">Создать</a>
</button>
@@ -269,18 +274,25 @@
<tr>
<th></th>
<th>Ключ строки</th>
<th>Услуга</th>
<th>Модель</th>
<th>Код услуги</th>
<th>Версий</th>
<th>&nbsp;</th>
<th>Тек. соглашение</th>
<th>Тек. версия</th>
<th>Услуга</th>
<th>Имя для печати</th>
<th>Модель</th>
<th>Кол-во</th>
<th>Цена</th>
<th>Стоимость</th>
<th>Дата с</th>
<th>Дата по</th>
<th>Количество</th>
<th>Цена</th>
<th>Имя для печати</th>
<th>&nbsp;</th>
<th>Версий</th>
<th>Тек. соглашение</th>
<th>Тек. версия</th>
<!--- <th>Компонентов</th> --->
<th></th>
</tr>
@@ -290,19 +302,25 @@
<td>
<c:link_view_edit canWrite=#pageInfo.writePermitted()# entity="specification_item" key="specification_item_uid" id=#specification_item_uid# fwx=#tr.fwx#/>
</td>
<td>#specification_item_uid#</td>
<td>#svc#</td>
<td class="c">#pricing_model_short#</td>
<td>#code#</td>
<td class="c">#item_version_count#</td>
<td class="c"></td>
<td>#specification_item_uid#</td>
<td>#code#</td>
<td>#svc#</td>
<td>#specification_item#</td>
<td class="c">#pricing_model_short#</td>
<td class="r">#quantity#</td>
<td class="r">#price#</td>
<td class="r">#cost#</td>
<td class="c">#dateFormat(dt_from,'DD.MM.YYYY')#</td>
<td class="c">#dateFormat(dt_to,'DD.MM.YYYY')#</td>
<td class="c"></td>
<td class="c">#item_version_count#</td>
<td><a href="agreement.cfm?contract_id=#contract_id#&agreement_version=#agreement_version#&#tr.fwx#">#agreement# #dateFormat(dt_agreement,'DD.MM.YYYY')#</td>
<td class="c"><a href="specification_item_version.cfm?specification_item_uid=#specification_item_uid#&agreement_version=#qItem.agreement_version#&#tr.fwx#">#qItem.agreement_version#</a> <cfif is_actual><img src="img/ok.png"/></cfif></td>
<td class="c">#dateFormat(dt_from,'DD.MM.YYYY')#</td>
<td class="c">#dateFormat(dt_to,'DD.MM.YYYY')#</td>
<td class="r">#quantity#</td>
<td class="r">#price#</td>
<td>#specification_item#</td>
<td class="c">
<c:link_del canWrite=#pageInfo.writePermitted()# entity="specification_item" key="specification_item_uid" id=#specification_item_uid# fwx=#tr.fwx#/>
</td>