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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 1e74830..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:'鍗曠墖鐜荤拑灞炴��:',
@@ -293,7 +293,11 @@
updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
- }
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -393,6 +397,8 @@
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
},
+ printCompound:'闇�瑕佸悓鏋剁殑灞�',
+ flashback:'鍊掑簭',
processId:'娴佺▼鍗″彿',
founder:'鍒嗘灦鍛�',
layoutStatus:'鎺掔増鐘舵��',
@@ -483,7 +489,7 @@
printStatus:'鎵撳嵃娆℃暟',
labelPrinting2:'鏍囩鎵撳嵃2',
finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
- editablePrinting:'鍙紪杈戞墦鍗�',
+ editablePrinting:'鏍囩鑷畾涔夋墦鍗�',
invertSelection:'鍙嶉��',
sortSummary:'鎺掑簭姹囨��',
addAutomatically:'鑷姩濉厖',
@@ -493,7 +499,32 @@
mergeState:'鍚堝苟鐘舵��',
merge:'鍚堝苟',
printQuantity:'鎵撳嵃鏁�',
- printWarn1:'鎵撳嵃鏁伴噺涓嶈兘澶т簬璁㈠崟鏁伴噺'
+ printWarn1:'鎵撳嵃鏁伴噺涓嶈兘澶т簬璁㈠崟鏁伴噺',
+ depthShelf:"鏋跺瓙绾垫繁(mm)",
+ shelfCapacity:"鏋跺瓙鎵块噸(KG)",
+ IntervalThickness:"闂撮殧鍘氬害(mm)",
+ LongestLargestMax:"闀胯竟鏈�澶�(mm)",
+ LongestShortestMax:"闀胯竟鏈�鐭�(mm)",
+ quantityMax:"鏈�澶ф暟閲�",
+ shortestLongest:"鐭竟鏈�澶�(mm)",
+ shortestSide:"鐭竟鏈�鐭�(mm)",
+ intelligentBranching:"鏅鸿兘鍒嗘灦",
+ reset:"閲嶇疆",
+ combinedFrame:"鍚堟灦",
+ shelfNumber:'鏋跺彿',
+ totalSequenceNumber:'鎬诲簭鍙�',
+ cancelMerger:'鍙栨秷鍚堝苟',
+ projectMsg1:'璇烽�夋嫨宸ョ▼瀵瑰簲鐨勭増鍥惧彿',
+ orderPrint:'璁㈠崟鎵撳嵃',
+ numberLabelPrintingOperations:'鏍囩鎵撳嵃娆℃暟',
+ numberTimesProcessCardPrinted:'娴佺▼鍗℃墦鍗版鏁�',
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
+ layoutNumber:'鐗堝浘鍙�',
+ addFlowCardMsg1:'璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�',
+ addFlowCardMsg2:'璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�',
+ okFlowCard:'宸插垎鏋�',
+ noFlowCard:'鏈垎鏋�',
+
},
reportingWorks:{
@@ -502,6 +533,9 @@
addReportingWork:"鎶ュ伐鏂板",
qualityInspectionReview:"璐ㄦ瀹℃牳",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'缂栧彿',
glassAddress:'鐗囨爣璁�',
WorkReportingManagement:'鎶ュ伐绠＄悊',
@@ -709,7 +743,8 @@
boxNumber:'绠卞彿',
msg1:'鍙戣揣鍗曞凡鍑哄簱璇峰埛鏂扮晫闈�',
msg2:'鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�',
- msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟'
+ msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟',
+ boxingPrinting:'瑁呯鎵撳嵃',
},
customer:{
page:{
@@ -802,7 +837,9 @@
patchNumber:'琛ョ墖鍗曞彿',
mark:'鏍囪',
sliceMarking:'鐗囨爣璁�',
-
+ printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
+ labelTemplate:'鏍囩妯℃澘锛�',
+ listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
},
rework:{
page:{
@@ -973,7 +1010,9 @@
productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
yield:'鎴愬搧鐜囨姤琛�',
finishedProductReport :'鎴愬搧鎶ヨ〃',
+ orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ teamsGroupsName:'涓婂伐搴忔姤宸�',
productionReport:'鐢熶骇鎶ヨ〃',
workInProgressReport:'鍦ㄥ埗鍝佹姤琛�',
processToBeCompleted:'宸ュ簭寰呭畬鎴愭姤琛�',
@@ -1181,7 +1220,8 @@
user :'鐢ㄦ埛鍒楄〃',
role :'瑙掕壊鏉冮檺',
userPassWord :'淇敼瀵嗙爜',
- glassPrice:'鐜荤拑浠锋牸'
+ glassPrice:'鐜荤拑浠锋牸',
+ glassOptimize:'鐜荤拑浼樺寲'
},
glassPrice:{
--
Gitblit v1.8.0