agreement list added
This commit is contained in:
+16
-2
@@ -17,10 +17,18 @@
|
||||
select
|
||||
<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
|
||||
<d:field title="ID" cfSqlType="CF_SQL_INTEGER">s.specification_id</d:field>
|
||||
<d:field title="Контрагент">k.contragent</d:field>
|
||||
<d:field>d.contragent_id</d:field>
|
||||
<d:field title="Договор">d.contract</d:field>
|
||||
<d:field title="Дата договора">d.dt_contract</d:field>
|
||||
<d:field>s.contract_id</d:field>
|
||||
<d:field title="Спецификация">s.specification</d:field>
|
||||
<d:field title="Строк">(select count(*) from specification_item i where i.specification_id=s.specification_id) as item_count</d:field>
|
||||
<d:field title="Соглашений">(select count(*) from agreement a where a.contract_id=s.contract_id) as agreement_count</d:field>
|
||||
</d:field_set>
|
||||
from specification s
|
||||
left outer join contract d on (s.contract_id=d.contract_id)
|
||||
left outer join contragent k on (d.contragent_id=k.contragent_id)
|
||||
where 1=1 <m:filter_build filter=#pageInfo.settings.filter#/>
|
||||
order by <m:order_build sortArray=#pageInfo.settings.sort.sortArray# fieldCount=#fieldCount#/>
|
||||
</cfquery>
|
||||
@@ -69,8 +77,11 @@ select count(*) as cnt from specification where 1=1
|
||||
<th width="1%">
|
||||
<c:link_add canWrite=#pageInfo.writePermitted()# entity=#pageInfo.entity# fwx=#tr.fwx#/>
|
||||
</th>
|
||||
<th width="50%"><layout:column_head name="specification"/></th>
|
||||
<th width="15%"><layout:column_head name="item_count"/></th>
|
||||
<th width="15%"><layout:column_head name="specification"/></th>
|
||||
<th width="5%"><layout:column_head name="item_count"/></th>
|
||||
<th width="15%"><layout:column_head name="contract"/></th>
|
||||
<th width="5%"><layout:column_head name="agreement_count"/></th>
|
||||
<th width="15%"><layout:column_head name="contragent"/></th>
|
||||
<th width="1%"></th>
|
||||
</layout:grid_head>
|
||||
</thead>
|
||||
@@ -82,6 +93,9 @@ select count(*) as cnt from specification where 1=1
|
||||
</td>
|
||||
<td>#specification#</td>
|
||||
<td class="c">#item_count#</td>
|
||||
<td>#contract# #dateFormat(dt_contract,'DD.MM.YYYY')#</td>
|
||||
<td class="c">#agreement_count#</td>
|
||||
<td>#contragent#</td>
|
||||
<td class="c">
|
||||
<c:link_del canWrite=#pageInfo.writePermitted()# entity=#pageInfo.entity# id=#qRead[pageInfo.entity&'_id'][currentRow]# fwx=#tr.fwx#/>
|
||||
</td>
|
||||
|
||||
Reference in New Issue
Block a user