From 80e7f24845cbd41031368cfb4e13bf7116e51323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Wed, 14 Jan 2026 20:25:51 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E8=8F=9C=E5=8D=95=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/system/service/menu/dao/SysMenu.java | 13 ++++++++ .../nl/system/service/menu/dto/MenuDto.java | 22 +++++++++++++ .../service/menu/impl/SysMenuServiceImpl.java | 17 +++++++--- .../src/main/resources/language/i18n/id.js | 5 +++ .../src/main/resources/language/i18n/zh.js | 10 +++++- .../src/components/Crud/RR.operation.vue | 4 +-- .../src/components/Crud/UD.operation.vue | 8 ++--- .../src/layout/components/Navbar.vue | 3 -- lms/nladmin-ui/src/utils/request.js | 1 + lms/nladmin-ui/src/views/login.vue | 3 -- .../src/views/system/menu/index.vue | 33 +++++++++++++++++++ .../views/wms/basedata/master/class/index.vue | 8 ++--- .../wms/basedata/master/faultdevice/index.vue | 4 +-- .../basedata/master/interfaceback/index.vue | 6 ++-- .../views/wms/basedata/master/sales/index.vue | 10 +++--- .../wms/basedata/master/transport/index.vue | 8 ++--- .../wms/basedata/product/userArea/index.vue | 2 +- .../views/wms/basedata/st/boxInfo/index.vue | 4 +-- .../views/wms/basedata/st/boxType/index.vue | 12 +++---- .../src/views/wms/basedata/st/sect/index.vue | 8 ++--- .../src/views/wms/basedata/st/stor/index.vue | 18 +++++----- .../views/wms/basedata/st/struct/index.vue | 10 +++--- .../src/views/wms/mps/device/index.vue | 4 +-- .../wms/pdm/order/rawfoilworkorder/index.vue | 4 +-- .../wms/pdm/order/slittingplan/index.vue | 8 ++--- .../src/views/wms/sch/point/index.vue | 4 +-- 26 files changed, 157 insertions(+), 72 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/SysMenu.java b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/SysMenu.java index 33d4d78..c49f7a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/SysMenu.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/SysMenu.java @@ -60,6 +60,19 @@ public class SysMenu implements Serializable { */ private String title; + /** + * 菜单标题 + */ + private String zh_title; + /** + * 菜单标题 + */ + private String en_title; + /** + * 菜单标题 + */ + private String id_title; + /** * 组件名称 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dto/MenuDto.java b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dto/MenuDto.java index fcff8d6..427bdbf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dto/MenuDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dto/MenuDto.java @@ -40,6 +40,10 @@ public class MenuDto extends BaseDTO implements Serializable { private String title; + private String zh_title; + private String en_title; + private String id_title; + private Integer menu_sort; private String path; @@ -95,4 +99,22 @@ public class MenuDto extends BaseDTO implements Serializable { public int hashCode() { return Objects.hash(menu_id); } + + public String getLocalTitle(String local){ + String in = "in"; + String en = "en"; + String zh = "zh"; + + + if (in.equals(local)){ + return id_title; + } + if (en.equals(local)){ + return en_title; + } + if (zh.equals(local)){ + return zh_title; + } + return title; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index 02bab8e..1ae5feb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -28,6 +28,7 @@ import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.dto.MenuQuery; import org.nl.wms.util.IdUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -226,6 +227,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl menu.setPid(resources.getPid()); menu.setMenu_sort(resources.getMenu_sort()); menu.setCache(resources.getCache()); + menu.setEn_title(resources.getEn_title()); + menu.setZh_title(resources.getZh_title()); + menu.setId_title(resources.getId_title()); menu.setHidden(resources.getHidden()); menu.setComponent_name(resources.getComponent_name()); menu.setPermission(resources.getPermission()); @@ -266,11 +270,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List buildMenus(List menuDtos) { List list = new LinkedList<>(); + String lang = LocaleContextHolder.getLocale().getLanguage(); menuDtos.forEach(menuDTO -> { if (menuDTO != null) { List menuDtoList = menuDTO.getChildren(); MenuVo menuVo = new MenuVo(); - menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle()); + menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() :menuDTO.getLocalTitle(lang)); // 一级目录需要加斜杠，不然会报警告 menuVo.setPath(ObjectUtil.isEmpty(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath()); menuVo.setHidden(menuDTO.getHidden()); @@ -285,7 +290,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl menuVo.setComponent(menuDTO.getComponent()); } } - menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache())); + menuVo.setMeta(new MenuMetaVo(menuDTO.getLocalTitle(lang), menuDTO.getIcon(), !menuDTO.getCache())); if (menuDtoList != null && menuDtoList.size() != 0) { menuVo.setAlwaysShow(true); menuVo.setRedirect("noredirect"); @@ -358,6 +363,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (ObjectUtil.isEmpty(entity)) { return menuDto; } + menuDto.setEn_title(entity.getEn_title()); + menuDto.setId_title(entity.getId_title()); + menuDto.setZh_title(entity.getZh_title()); menuDto.setMenu_id(entity.getMenu_id()); menuDto.setType(entity.getType()); menuDto.setPermission(entity.getPermission()); @@ -404,12 +412,13 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List buildMenus(List menuDtos, String pid) { List list = new LinkedList<>(); + String lang = LocaleContextHolder.getLocale().getLanguage(); //剔除系统级菜单 menuDtos.forEach(menuDTO -> { if (menuDTO != null) { List menuDtoList = menuDTO.getChildren(); MenuVo menuVo = new MenuVo(); - menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle()); + menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getLocalTitle(lang)); // 一级目录需要加斜杠，不然会报警告 menuVo.setPath(pid.equals(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath()); menuVo.setHidden(menuDTO.getHidden()); @@ -424,7 +433,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl menuVo.setComponent(menuDTO.getComponent()); } } - menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache())); + menuVo.setMeta(new MenuMetaVo(menuDTO.getLocalTitle(lang), menuDTO.getIcon(), !menuDTO.getCache())); if (menuDtoList != null && menuDtoList.size() != 0) { menuVo.setAlwaysShow(true); menuVo.setRedirect("noredirect"); diff --git a/lms/nladmin-system/src/main/resources/language/i18n/id.js b/lms/nladmin-system/src/main/resources/language/i18n/id.js index 63c8bb2..1aac03e 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/id.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/id.js @@ -48,6 +48,11 @@ var config = { "load_text5": "Hanya dapat mengunggah satu file excel!" }, "common": { + "enterNameOrDescriptionToSearch":"Masukkan nama atau deskripsi untuk pencarian", + "virtualStor": "Gudang Virtual", + "stor_type": "Tipe Gudang", + "storType": "Tipe Gudang", + "saveAndPrint": "Simpan dan cetak", "businessForceConfirm": "Konfirmasi Paksa Bisnis", "forceConfirm": "Konfirmasi Paksa", "jobTask": "Tugas Operasional", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js index c009cd0..cc2d68d 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js @@ -48,6 +48,13 @@ var config = { "load_text5": "只能上传一个excel文件！" }, "common": { + "enterNameOrDescriptionToSearch":"输入名称或者描述搜索", + "virtualStor": "虚拟仓", + "stor_type": "仓库类型", + "storType": "仓库类型", + "saveAndPrint": "保存并打印", + "cancel":"取消", + "confirm":"确认", "businessForceConfirm":"业务强制确认", "forceConfirm": "强制确认", "jobTask":"作业任务", @@ -313,7 +320,7 @@ var config = { "inventoryChange": "库存变更", "changePerson": "变更人", "changeDate": "变更日期", - "taskDistribution": "任务下发" + "taskDistribution": "任务下发", "code_name": "输入账号或名称", "fuzzy_search": "模糊搜索", @@ -4181,6 +4188,7 @@ var config = { "isSecondLashing": "是否二次捆扎" }, "boxInfo": { + "vehicleTypePlaceholder": "请选择载具类型", "boxInfo": "木箱信息", "boxNo": "木箱号", "boxSpec": "木箱规格", diff --git a/lms/nladmin-ui/src/components/Crud/RR.operation.vue b/lms/nladmin-ui/src/components/Crud/RR.operation.vue index 6bcfcbb..ae04ecc 100644 --- a/lms/nladmin-ui/src/components/Crud/RR.operation.vue +++ b/lms/nladmin-ui/src/components/Crud/RR.operation.vue @@ -5,9 +5,9 @@ 重置 --> - 查询 + {{ $t('common.Query') }} - 重置 + {{ $t('common.Reset') }} diff --git a/lms/nladmin-ui/src/components/Crud/UD.operation.vue b/lms/nladmin-ui/src/components/Crud/UD.operation.vue index 686247d..1de31ff 100644 --- a/lms/nladmin-ui/src/components/Crud/UD.operation.vue +++ b/lms/nladmin-ui/src/components/Crud/UD.operation.vue @@ -1,13 +1,13 @@