smishchuk/payg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

030 change version select fix dt_to add sort

Browse Source
This commit is contained in:
smishchuk
2026-03-30 10:27:28 +03:00
parent e303bbdd03
commit e1ca12fb2e
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application.cfc
+1 -1
View File
@@ -97,7 +97,7 @@
<!--- <cfdump var=#this.datasources#/> --->
<cfset request.RECORDS_PER_PAGE=500/>
<cfset request.APP_VERSION="0.00.029"/>
<cfset request.APP_VERSION="0.00.030"/>
<cfset request.STAND=getStand()/>
<cflock scope="application" type="readonly" timeout=3>
crm2cloud.cfm
+30 -31
View File
@@ -117,13 +117,13 @@ select
<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
<d:field title="WZ Elma">r.wz as wz_sold</d:field>
<d:field title="Клиент">r.client as client_sold</d:field>
<d:field title="WZ Cloud">r.company_uid</d:field>
<d:field title="Статусы">a.wz as wz_alloc</d:field>
<d:field title="Коды RAM">ds.status_ids</d:field>
<d:field title="RAM GB Elma">r.codes as ram_codes</d:field>
<d:field title="RAM Cloud">r.quantity as ram_sold</d:field>
<d:field title="RAM Cloud ON">a.ram as ram_alloc</d:field>
<d:field title="">a.ram_on as ram_alloc_on</d:field>
<d:field>r.company_uid</d:field>
<d:field title="WZ Cloud">a.wz as wz_alloc</d:field>
<d:field title="Статусы">ds.status_ids</d:field>
<d:field title="Коды RAM">r.codes as ram_codes</d:field>
<d:field title="RAM GB Elma">r.quantity as ram_sold</d:field>
<d:field title="RAM Cloud">a.ram as ram_alloc</d:field>
<d:field title="RAM Cloud ON">a.ram_on as ram_alloc_on</d:field>
<d:field title="Коды CPU">c.codes as cpu_codes</d:field>
<d:field title="CPU Elma">c.quantity as cpu_sold</d:field>
<d:field title="CPU Cloud">a.cpu as cpu_alloc</d:field>
@@ -181,41 +181,40 @@ S3 операции и трафик: <b>#dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M
--->
<br/>
<a href="#request.thisPage#?output_xls" title="экспорт в Excel" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/xls.gif" style="vertical-align:text-bottom;"/></a>
<a href="#request.thisPage#?output_json" title="экспорт в json" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/json.svg" style="vertical-align:text-bottom;" width="13" height="13"/></a>
</cfoutput>
<table class="worktable">
<thead>
<tr>
<td width="1%"></td>
<layout:grid_head titleMap=#titleMap# sortArray=#pageInfo.settings.sort.sortArray#>
<th width="7%"><layout:column_head name="wz_sold"/></th>
<th width="10%"><layout:column_head name="client_sold"/></th>
<th width="7%"><layout:column_head name="wz_alloc"/></th>
<th width="3%"><layout:column_head name="status_ids"/></th>
<th width="15%"><layout:column_head name="ram_codes"/></th>
<th width="3%"><layout:column_head name="ram_sold"/></th>
<th width="3%"><layout:column_head name="ram_alloc"/></th>
<th width="3%"><layout:column_head name="ram_alloc_on"/></th>
<th width="15%"><layout:column_head name="cpu_codes"/></th>
<th width="3%"><layout:column_head name="cpu_sold"/></th>
<th width="3%"><layout:column_head name="cpu_alloc"/></th>
<th width="3%"><layout:column_head name="cpu_alloc_on"/></th>
<th width="15%"><layout:column_head name="disk_codes"/></th>
<th width="3%"><layout:column_head name="disk_sold"/></th>
<th width="3%"><layout:column_head name="disk_alloc"/></th>
<th width="7%">WZ Elma</th>
<th width="10%">Клиент</th>
<th width="7%">WZ Cloud</th>
<th width="3%">Статусы</th>
<th width="15%">Коды RAM</th>
<th width="3%">RAM GB Elma</th>
<th width="3%">RAM Cloud</th>
<th width="3%">RAM Cloud ON</th>
<th width="15%">Коды CPU</th>
<th width="3%">CPU Elma</th>
<th width="3%">CPU Cloud</th>
<th width="3%">CPU Cloud ON</th>
<th width="15%">Коды Дисков</th>
<th width="3%">Диски GB Elma</th>
<th width="3%">Диски Cloud</th>
</tr>
</layout:grid_head>
</thead>
<cfflush/>
<cfoutput query="qReconciliation">
<tr>
<td></td>
<td>#wz_sold#</td>
<td><a href="contragent.cfm?__id=#company_uid#&#tr.fwx#">#client_sold#</a></td>
<td>#wz_alloc#</td>