From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 8a53693..2d8db87 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -125,7 +125,7 @@
glassRepeat:'璇峰厛閫夋嫨闂撮殧鐗�',
HollowReview:'璇烽�夋嫨鍏ㄩ儴涓┖闂撮殧鐗╀笅鎷夋',
firstGlass:"璇峰厛閫夋嫨浜у搧",
- InterlayerReview:'璇烽�夋嫨鍏ㄩ儴涓┖闂撮殧鐗╀笅鎷夋',
+ InterlayerReview:'璇烽�夋嫨鍏ㄩ儴闂撮殧鐗╁甫鏄熷彿涓嬫媺妗�',
glassTypeTitle:'鏉愭枡灞炴��',
thickness:'*鍘氬害',
color:'*棰滆壊',
@@ -141,7 +141,7 @@
hollowUpdate:'涓┖闂撮殧鐗╀慨鏀�',
interlayerThickness:'*澶瑰眰鍘氬害',
interlayerType:'*绫诲瀷',
- interlayerColor:'*棰滆壊',
+ interlayerColor:'棰滆壊',
interlayer:'澶瑰眰闂撮殧鐗�',
interlayerUpdate:'澶瑰眰闂撮殧鐗╀慨鏀�',
glassAttribute:'鍗曠墖鐜荤拑灞炴��:',
@@ -397,6 +397,8 @@
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
},
+ printCompound:'闇�瑕佸悓鏋剁殑灞�',
+ flashback:'鍊掑簭',
processId:'娴佺▼鍗″彿',
founder:'鍒嗘灦鍛�',
layoutStatus:'鎺掔増鐘舵��',
@@ -487,7 +489,7 @@
printStatus:'鎵撳嵃娆℃暟',
labelPrinting2:'鏍囩鎵撳嵃2',
finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
- editablePrinting:'鍙紪杈戞墦鍗�',
+ editablePrinting:'鏍囩鑷畾涔夋墦鍗�',
invertSelection:'鍙嶉��',
sortSummary:'鎺掑簭姹囨��',
addAutomatically:'鑷姩濉厖',
@@ -531,6 +533,9 @@
addReportingWork:"鎶ュ伐鏂板",
qualityInspectionReview:"璐ㄦ瀹℃牳",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'缂栧彿',
glassAddress:'鐗囨爣璁�',
WorkReportingManagement:'鎶ュ伐绠＄悊',
@@ -1007,6 +1012,7 @@
finishedProductReport :'鎴愬搧鎶ヨ〃',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ teamsGroupsName:'涓婂伐搴忔姤宸�',
productionReport:'鐢熶骇鎶ヨ〃',
workInProgressReport:'鍦ㄥ埗鍝佹姤琛�',
processToBeCompleted:'宸ュ簭寰呭畬鎴愭姤琛�',
--
Gitblit v1.8.0