From 4fe8781a77e1e36fddff96929cffc1e4d1de07bc Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Mon, 13 Jul 2026 14:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/main/templates/menu21/freeze_and_thaw.ftl | 26 +++++------ bin/main/templates/rework/rework_register.ftl | 42 ++++++++--------- bin/main/templates/system/system_info.ftl | 46 +++++++++---------- src/main/resources/templates/basic/part.ftl | 4 +- .../templates/material/roll_batch_query.ftl | 8 ++-- .../templates/menu21/freeze_and_thaw.ftl | 26 +++++------ .../templates/query/final_roll_batch_hist.ftl | 4 +- .../templates/query/order_batch_hist.ftl | 14 +++--- .../templates/rework/rework_register.ftl | 30 ++++++------ .../templates/system/system_info.ftl | 10 ++-- 10 files changed, 105 insertions(+), 105 deletions(-) diff --git a/bin/main/templates/menu21/freeze_and_thaw.ftl b/bin/main/templates/menu21/freeze_and_thaw.ftl index 9697eac..7b12511 100644 --- a/bin/main/templates/menu21/freeze_and_thaw.ftl +++ b/bin/main/templates/menu21/freeze_and_thaw.ftl @@ -10,11 +10,11 @@
-

Blocked & unblocked

+

Blocked & Unblocked

@@ -53,7 +53,7 @@ 冻结卷 - + Search     - 登记返工箱 - 登记返工卷 + Register Rework Box + Register Rework Roll @@ -51,7 +51,7 @@ - - + + @@ -83,8 +83,8 @@ Box No Roll No Quantity - 登记人 - 登记日期 + Registered By + Registration Date Status @@ -138,7 +138,7 @@ var currentRow; var p = n.split(','); if (p && p.length >= 3){ $("#revNo").textbox("setValue", p[2]); - } + } } $.extend($.fn.validatebox.defaults.rules, { @@ -164,8 +164,8 @@ var currentRow; function myparser(s){ if(s) return new Date(s); } - - + + /* 选中行 */ function onTableRowSelect(index, row) { var noRowSelect = !!!row; @@ -188,7 +188,7 @@ $("#queryLink").click(function(){ /* 查询返工单登记的箱 */ function scanBoxModal(){ - $('#dlgBoxDtls').dialog('open').dialog('center').dialog('setTitle',currentRow.orderNo+'中的登记箱'); + $('#dlgBoxDtls').dialog('open').dialog('center').dialog('setTitle','Registered Boxes in '+currentRow.orderNo); var opts = $('#rework_boxs').datagrid('options'); opts.queryParams = {'orderNo': currentRow.orderNo}; $("#rework_boxs").datagrid({url: "/rework/getReworkRegisterBoxs"}); @@ -197,12 +197,12 @@ function scanBoxModal(){ //获取焦点 $("#scan_box_no").focus(); } - + /* 返工箱的操作 */ $("#scan_box_no").on("keyup", function(event){ var boxNo = $(this).val(); if(!boxNo || '' === boxNo){ - $.messager.show({title: 'Point', msg: '请扫描登记的箱号!', timeout: 1500, showType: 'slide'}); + $.messager.show({title: 'Point', msg: 'Please scan the registered box number!', timeout: 1500, showType: 'slide'}); return false; } if(event.keyCode == 13){ @@ -237,7 +237,7 @@ $("#scan_box_no").on("keyup", function(event){ /* 查询返工单登记的卷 */ function scanRollModal(){ - $('#dlgRollDtls').dialog('open').dialog('center').dialog('setTitle',currentRow.orderNo+'中的登记卷记录'); + $('#dlgRollDtls').dialog('open').dialog('center').dialog('setTitle','Registered Rolls in '+currentRow.orderNo); var opts = $('#rework_rolls').datagrid('options'); opts.queryParams = {'orderNo': currentRow.orderNo}; $("#rework_rolls").datagrid({url: "/rework/getReworkRegisterRolls"}); @@ -246,12 +246,12 @@ function scanRollModal(){ //获取焦点 $("#scan_roll_no").focus(); } - + /* 返工箱的操作 */ $("#scan_roll_no").on("keyup", function(event){ var finalRollNo = $(this).val(); if(!finalRollNo || '' === finalRollNo){ - $.messager.show({title: 'Point', msg: '请扫描登记的卷号!', timeout: 1500, showType: 'slide'}); + $.messager.show({title: 'Point', msg: 'Please scan the registered roll number!', timeout: 1500, showType: 'slide'}); return false; } if(event.keyCode == 13){ @@ -286,8 +286,8 @@ $("#scan_roll_no").on("keyup", function(event){ /* 查询已经登记的卷信息 */ function seachRegisterRolls(){ - - $('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle',currentRow.orderNo+'中的登记卷记录'); + + $('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle','Registered Rolls in '+currentRow.orderNo); var opts = $('#show_rework_rolls').datagrid('options'); var searchStatus = $('#search_status').combobox('getValue'); opts.queryParams = {'orderNo': currentRow.orderNo, 'status': searchStatus}; @@ -296,7 +296,7 @@ function seachRegisterRolls(){ /* 展示当前卷的信息 */ function viewRollsModal(orderNo){ - $('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle',orderNo+'中的登记卷记录'); + $('#dlgRollsShow').dialog('open').dialog('center').dialog('setTitle','Registered Rolls in '+orderNo); var opts = $('#show_rework_rolls').datagrid('options'); opts.queryParams = {'orderNo': orderNo, 'status': 'ALL'}; $('#search_status').combobox('setValue', 'ALL'); @@ -306,7 +306,7 @@ function viewRollsModal(orderNo){ //检查卷信息 function formatAction(value, row){ return "Roll detail"; -} +} var delay = (function(){ var timer = 0; diff --git a/bin/main/templates/system/system_info.ftl b/bin/main/templates/system/system_info.ftl index d8e14a5..76ea673 100644 --- a/bin/main/templates/system/system_info.ftl +++ b/bin/main/templates/system/system_info.ftl @@ -13,7 +13,7 @@
-

系统参数维护

+

System Parameter Maintenance

@@ -24,14 +24,14 @@ Site - 配置类型 (Type) - 二级类型 (Second Type) - 配置参数 (Base Data) - 配置描述 (Base Desc) - 状态 (Status) - 排序号 - 备注 (Remark) - 数据类型 + Configuration Type (Type) + Secondary Type (Second Type) + Configuration Parameter (Base Data) + Configuration Description (Base Desc) + Status + Sort No. + Remark + Data Type @@ -39,8 +39,8 @@