Browse Source

调整页面布局

master
qiankanghui 2 days ago
parent
commit
489d53e99a
  1. 6
      src/main/resources/templates/scanning/finalrolls.ftl
  2. 12
      src/main/resources/templates/scanning/finalrollsScan.ftl
  3. 6
      src/main/resources/templates/scanning/jobs.ftl
  4. 8
      src/main/resources/templates/scanning/reworkRollCheck.ftl
  5. 18
      src/main/resources/templates/scanning/rollCheck.ftl
  6. 18
      src/main/resources/templates/scanning/slittingCheck.ftl
  7. 4
      src/main/resources/templates/user/index.ftl

6
src/main/resources/templates/scanning/finalrolls.ftl

@ -35,9 +35,9 @@
<input id="query_dateTo" type="hidden">
<div>
Roll No: <input class="easyui-textbox" id="finalRollNo" style="width:110px">
Scanning machine: <input class="easyui-textbox" id="jobId" style="width:110px">
Scanning Machine: <input class="easyui-textbox" id="jobId" style="width:110px">
Create Date: <input class="easyui-datebox" id="createdDateFrom" style="width:100px">
: <input class="easyui-datebox" id="createdDateTo" style="width:100px">
to: <input class="easyui-datebox" id="createdDateTo" style="width:100px">
<a href="#nowhere" id="queryLink" class="easyui-linkbutton" iconCls="icon-search">Search</a>
<a href="" id="downExcel" onclick="downExcel()" class="easyui-linkbutton">Download current query list</a>
</div>
@ -151,7 +151,7 @@
//设置href
$("#downExcel").attr("href", url);
}
function downSerial(rollNo){
var url = "/scanning/down/currentSerialNumber?query_rollNo="+rollNo;
//设置href

12
src/main/resources/templates/scanning/finalrollsScan.ftl

@ -35,9 +35,9 @@
<input id="query_dateTo" type="hidden">
<div>
Roll No: <input class="easyui-textbox" id="finalRollNo" style="width:110px">
Scanning machine: <input class="easyui-textbox" id="jobId" style="width:110px">
Scanning Machine: <input class="easyui-textbox" id="jobId" style="width:110px">
Create Date: <input class="easyui-datebox" id="createdDateFrom" style="width:100px">
: <input class="easyui-datebox" id="createdDateTo" style="width:100px">
to: <input class="easyui-datebox" id="createdDateTo" style="width:100px">
<a href="#nowhere" id="queryLink" class="easyui-linkbutton" iconCls="icon-search">Search</a>
<a href="" id="downExcel" onclick="downExcel()" class="easyui-linkbutton">Download current query list</a>
</div>
@ -131,17 +131,17 @@
}
});
}
function formatLodopPrint(value, row){
var action = "<a target='forprint' href='/print/finalrollScan/"+row.finalRollNo+"/'>"+value+"</a>";
return action;
}
function lodopPrint(rollNo){
var url = "/print/finalrollScan/"+rollNo+"/";
//设置href
$("#lodopPrint"+rollNo).attr("href", url);
}
}
function formatDtlAction(value, row){
return "<a href='/shipment/boxes/scan/" + value + "'>Scan and delivery</a>";
@ -179,7 +179,7 @@
//设置href
$("#downExcel").attr("href", url);
}
function downSerial(rollNo){
var url = "/scanning/down/currentSerialNumber?query_rollNo="+rollNo;
//设置href

6
src/main/resources/templates/scanning/jobs.ftl

@ -15,11 +15,11 @@
data-options="pagination: true, showFooter: true, singleSelect:true, fitColumns:true , url:'/scanning/jobs/all',method:'get',pageSize:20,toolbar:'#tb'">
<thead>
<tr>
<th data-options="field:'jobId',width:100">Scanning machine number</th>
<th data-options="field:'jobId',width:100">Scanning Machine Number</th>
<#--<th data-options="field:'createdBy',width:80,align:'left'">Created By</th>-->
<#--<th data-options="field:'createdDate',width:150,align:'center',formatter:formatDateTime">Created Time</th>-->
<th data-options="field:'jdbcUrl',width:400">Database url</th>
<th data-options="field:'scanType',width:400,formatter:passageway">Scanning channel</th>
<th data-options="field:'jdbcUrl',width:400">Database Url</th>
<th data-options="field:'scanType',width:400,formatter:passageway">Scanning Channel</th>
<th data-options="field:'id',width:100,editor:'textbox',formatter:formatAction">Actions</th>
</tr>
</thead>

8
src/main/resources/templates/scanning/reworkRollCheck.ftl

@ -8,7 +8,7 @@
</style>
<div class="page-header">
<h2>Rework verification</h2>
<h2>Rework Verification</h2>
</div>
<table id="dg" class="easyui-datagrid" style="width:100%;height:460px;display: none;"
@ -17,7 +17,7 @@
<tr>
<th data-options="field:'orderNo',width:120">Order No</th>
<th data-options="field:'status',width:80,align:'left'">Status</th>
<th data-options="field:'statement',width:140,align:'left', formatter:getStatement">Close status</th>
<th data-options="field:'statement',width:140,align:'left', formatter:getStatement">Close Status</th>
<th data-options="field:'statementBy',width:100">Close By</th>
<th data-options="field:'statementDate',width:120,formatter:formatDateTime">Close Date</th>
<th data-options="field:'id',width:100,editor:'textbox', formatter:formatAction">Actions</th>
@ -43,10 +43,10 @@
</select>
<a href="#nowhere" id="queryLink" class="easyui-linkbutton" iconCls="icon-search">Search</a>
<#if currentUser.isAdmin>
<a href="javascript:void(0)" id="closedAllRoll" class="easyui-linkbutton" iconCls="icon-edit" onclick="closedAllRoll()">Batch close</a>
<a href="javascript:void(0)" id="closedAllRoll" class="easyui-linkbutton" iconCls="icon-edit" onclick="closedAllRoll()">Batch Close</a>
</#if>
<#if currentUser.isAdmin || currentUser.authorities?contains("closeorder")>
<a href="javascript:void(0)" id="forceClosed" class="easyui-linkbutton" iconCls="icon-remove" onclick="forceClosed()">Force close</a>
<a href="javascript:void(0)" id="forceClosed" class="easyui-linkbutton" iconCls="icon-remove" onclick="forceClosed()">Force Close</a>
</#if>
</div>
</div>

18
src/main/resources/templates/scanning/rollCheck.ftl

@ -19,7 +19,7 @@
<th data-options="field:'rollNo',width:100">Roll No</th>
<th data-options="field:'status',width:80,align:'left'">Status</th>
<!-- <th data-options="field:'serialRowEnd',width:80,align:'left', formatter:getRollQty">单排卷标签数量</th> -->
<th data-options="field:'statement',width:80,align:'left', formatter:getStatement">Close status</th>
<th data-options="field:'statement',width:80,align:'left', formatter:getStatement">Close Status</th>
<!-- <th data-options="field:'noScanQty',width:50,align:'left'">Scanned Qty</th>
<th data-options="field:'scanQty',width:80,align:'left'">未扫描数量</th> -->
<th data-options="field:'statementBy',width:100">Close By</th>
@ -138,12 +138,12 @@
var action = "<a target='forprint' href='/print/finalrollScan/"+row.finalRollNo+"/'>"+value+"</a>";
return action;
} */
function lodopPrint(rollNo){
var url = "/print/finalrollScan/"+rollNo+"/";
//设置href
$("#lodopPrint"+rollNo).attr("href", url);
}
}
function formatDtlAction(value, row){
return "<a href='/shipment/boxes/scan/" + value + "'>Scan and delivery</a>";
@ -181,7 +181,7 @@
$('#scan_Qty').textbox('textbox').attr('readonly',true);
$("#noScan_Qty").textbox('setValue',ret.ret.noScanQty);
$('#noScan_Qty').textbox('textbox').attr('readonly',true);
$('#dlgDtls').dialog('open').dialog('center').dialog('setTitle',orderNo+':Detail');
$('#dlgDtls').dialog('open').dialog('center').dialog('setTitle',orderNo+':Detail');
}else{
$.messager.alert('Error',ret.errorMsg, 'error');
}
@ -222,7 +222,7 @@
}else{
$.messager.alert('Error',ret.errorMsg, 'error');
}
});
});
}
//未扫描报告
function unscannedReport(rollNo){
@ -233,7 +233,7 @@
}else{
$.messager.alert('Error',ret.errorMsg, 'error');
}
});
});
}
//结单
function closedRoll(orderNo,serialRowStart,serialRowEnd,rollNo){
@ -254,9 +254,9 @@
function closedAllRoll(){
$.messager.confirm('Confirm','Are you sure to close the SO existing empty roll ?',function(r){
if (r){
$.messager.progress({
title: 'Point',
msg: 'Please Wait……',
$.messager.progress({
title: 'Point',
msg: 'Please Wait……',
text: '',
interval: 300
});

18
src/main/resources/templates/scanning/slittingCheck.ftl

@ -18,7 +18,7 @@
<th data-options="field:'orderNo',width:100">Order No</th>
<th data-options="field:'slittingNo',width:100">FG roll number</th>
<th data-options="field:'status',width:80,align:'left'">Status</th>
<th data-options="field:'statement',width:80,align:'left', formatter:getStatement">Close status</th>
<th data-options="field:'statement',width:80,align:'left', formatter:getStatement">Close Status</th>
<th data-options="field:'statementBy',width:100">Close By</th>
<th data-options="field:'statementDate',width:100,formatter:formatDateTime">Close Date</th>
<th data-options="field:'id',width:100,editor:'textbox', formatter:formatAction">Actions</th>
@ -130,12 +130,12 @@
return "To be closed";
}
}
function lodopPrint(rollNo){
var url = "/print/finalrollScan/"+rollNo+"/";
//设置href
$("#lodopPrint"+rollNo).attr("href", url);
}
}
function formatDtlAction(value, row){
return "<a href='/shipment/boxes/scan/" + value + "'>Scan and delivery</a>";
@ -169,7 +169,7 @@
$('#scan_Qty').textbox('textbox').attr('readonly',true);
$("#noScan_Qty").textbox('setValue',ret.ret.noScanQty);
$('#noScan_Qty').textbox('textbox').attr('readonly',true);
$('#dlgDtls').dialog('open').dialog('center').dialog('setTitle',orderNo+':Detail');
$('#dlgDtls').dialog('open').dialog('center').dialog('setTitle',orderNo+':Detail');
}else{
$.messager.alert('Error',ret.errorMsg, 'error');
}
@ -210,7 +210,7 @@
}else{
$.messager.alert('Error',ret.errorMsg, 'error');
}
});
});
}
//未扫描报告
function unscannedReport(rollNo){
@ -221,7 +221,7 @@
}else{
$.messager.alert('Error',ret.errorMsg, 'error');
}
});
});
}
//结单
function closedRoll(orderNo,rowFrom,rowTo,slittingNo){
@ -242,9 +242,9 @@
function closedAllRoll(){
$.messager.confirm('Confirm','Are you sure to close the SO existing empty roll ?',function(r){
if (r){
$.messager.progress({
title: 'Point',
msg: 'Please Wait……',
$.messager.progress({
title: 'Point',
msg: 'Please Wait……',
text: '',
interval: 300
});

4
src/main/resources/templates/user/index.ftl

@ -86,7 +86,7 @@
</div>
<div style="margin-bottom:10px">
<input id="scanMachine" class="easyui-combobox" name="scanMachine" label="Scanning machine:" style="width:100%" data-options="
<input id="scanMachine" class="easyui-combobox" name="scanMachine" label="Scanning Machine:" style="width:100%" data-options="
valueField: 'jobId',
textField: 'jobId',
url: '/user/scanMachine'
@ -119,7 +119,7 @@
function formatStatus(value, row){
return value == 1 ? "Activate" : "Disabled";
}
$("#queryLink").click(function(){
var dg = $('#dg').datagrid({
queryParams: {

Loading…
Cancel
Save