020 some navigation

deal.cfm

@@ -257,14 +257,13 @@
 				<tr>
 					<th>__index</th>
 					<!--- <th>__name</th> --->
-					<th>user_description</th>
+					<th width="12%">user_description</th>
 					<th>Кол-во</th>
 					<th>Скидка%</th>
 					<th width="5%">Сумма</th>
-					<th>abstractive_service_code</th>
-					<th>modifier_code</th>					
-					<th>is_actual</th>
-					<th>type</th>
+					<th>Код</th>
+					<th>type</th>									
+					<th>is_actual</th>					
 					<th>hash</th>
 					<th>version</th>
 					<th>name_version</th>
@@ -274,9 +273,7 @@
 					<th width="5%">date_end</th>
 					<th>is_easy</th>
 					<th>Компонентов</th>
-					
-					<!--- <th>additional_agreement_uid</th> --->
-					<th>additional_agreement</th>
+					<th width="12%">additional_agreement</th>
 				</tr>
 			</thead>
 			
@@ -284,14 +281,19 @@
 				<tr>
 					<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#" title="__id">#__index#</a></td>
 					<!--- <td class="c">#__name#</td> --->
-					<td class="c">#user_description#</td>
+					<td class="l">#user_description#</td>
 					<td class="c">#cnt#</td>
 					<td class="c">#discount#</td>
 					<td class="r">#nFmt(line_cost)#</td>
-					<td class="c">#abstractive_service_code#</td>
-					<td class="c">#modifier_code#</td>					
-					<td class="c">#is_actual#</td>
-					<td class="c">#type#</td>
+					<td class="l">
+						#abstractive_service_code#.#modifier_code#<!--- <cfswitch expression=#type#>
+							<cfcase value=1>-i</cfcase>
+							<cfcase value=2>-f</cfcase>
+							<cfcase value=3>-m</cfcase>						
+						</cfswitch> --->
+					</td>
+					<td class="c">#type#</td>	
+					<td class="c">#is_actual#</td>					
 					<td class="c">#hash#</td>
 					<td class="c">#version#</td>
 					<td class="c">#name_version#</td>