From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 65 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 102174b..9130aed 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -64,6 +64,10 @@
false:'鍚�',
computedSize:'绉戝璁℃暟',
paste:'绮樿创',
+
+ selected:'閫変腑',
+ partiallySelected:'閮ㄥ垎閫変腑',
+ unchecked :'鏈�変腑',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
range99999Dec2:
@@ -83,6 +87,7 @@
deleteSuccess:'鍒犻櫎鎴愬姛',
deleteFail:'鍒犻櫎澶辫触',
cancelReviewFail:'鍙嶅澶辫触',
+ cancelReviewFailWork:'鍙嶅澶辫触,璇锋鏌ユ槸鍚︽姤宸�',
reviewFail:'瀹℃牳澶辫触',
noProductDataInTheTable:'琛ㄦ牸涓棤浜у搧鏁版嵁',
tableDataExceedsMaximumLimit:'琛ㄦ牸鏁版嵁瓒呰繃鏈�澶ч檺鍒�',
@@ -230,6 +235,9 @@
sheet3:'娴忚鍙戣揣淇℃伅',
sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
oneClickStorage:'涓�閿畬宸�',
+
+ quantityMount:'鏁伴噺閲戦',
+ orderSummaryReport:'璁㈠崟鎬绘姤琛�',
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -254,6 +262,7 @@
calculationAreaPrompt5:'璁㈠崟閲嶅鏄惁缁х画鍒涘缓',
pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
+ grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
}
},
@@ -289,6 +298,7 @@
totalArea:'鎬诲昂瀵�',
childWidth:'鍗曠墖瀹�',
childHeight:'鍗曠墖楂�',
+ arc:'寮ч暱',
area:'鍗曠墖灏哄',
process:'宸ヨ壓娴佺▼',
orderDetail:'璁㈠崟璇︽儏',
@@ -325,7 +335,8 @@
deleteOk:'鍒犻櫎鎴愬姛',
transferOrder:'杞伐鍗�',
perimeter:'鍛ㄩ暱',
- deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦'
+ deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦',
+ msg:'璇烽�夋嫨鎵�鏈夋暟鎹�'
},
processCard:{
@@ -414,7 +425,10 @@
printStatus:'鎵撳嵃娆℃暟',
labelPrinting2:'鏍囩鎵撳嵃2',
addAutomatically:'鑷姩濉厖',
- selectFill:'閫変腑濉厖'
+ selectFill:'閫変腑濉厖',
+ engineeringPrinting:'宸ョ▼鎵撳嵃',
+
+ mergeState:'鍚堝苟鐘舵��',
},
reportingWorks:{
glassNumber:'缂栧彿',
@@ -610,6 +624,9 @@
endOperationOrderNumber:'璋冩嫧搴忓彿',
typeClaim:'棰嗗嚭绫诲瀷',
+ pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
+ boxNumber:'绠卞彿',
+
},
customer:{
@@ -673,6 +690,11 @@
money:'閲戦',
pleaseSelectTheSameCustomerProject:'璇烽�夋嫨鐩稿悓瀹㈡埛鐨勯」鐩�',
+ noMoney:'鏃犻噾棰�',
+ freightPrice:'杩愯垂鍗曚环',
+ freightQuantity:'杩愯垂鏁伴噺',
+ freight:'杩愯垂閲戦',
+ pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
},
replenish:{
@@ -914,6 +936,10 @@
returnQuantity :'杩斿簱鏁伴噺',
materialReturnType :'鏉愭枡杩斿簱绫诲瀷',
createTime :'杩斿簱鏃ユ湡',
+
+ surplusMaterialManagement :'浣欐枡绠＄悊',
+ additionOfSurplusMaterials :'浣欐枡鏂板',
+ excessMaterialOutflow :'浣欐枡鍑哄簱',
},
mainBasicData:{
BasicData :'鍩虹鏁版嵁',
@@ -935,6 +961,41 @@
inconsistentParameters :'蹇呭～,鍙傛暟涓嶄竴鑷�',
strip :'鏉�',
exportSelected :'瀵煎嚭閫変腑',
+ },
+
+ menu:{
+ "1" :'閿�鍞笌鍒嗛攢',
+ "2" :'鐢熶骇涓庤鍒�',
+ "3" :'閲囪喘涓庣墿璧�',
+ "4" :'鐢ㄦ埛涓庢潈闄�',
+
+ product :'鍟嗗搧绠＄悊',
+ order :'璁㈠崟绠＄悊',
+ delivery :'閫佽揣绠＄悊',
+ returns :'閫�璐х鐞�',
+ Customer :'瀹㈡埛淇℃伅',
+ workOrder :'宸ュ崟绠＄悊',
+ processCard :'娴佺▼鍗＄鐞�',
+ reportingWorks :'鎶ュ伐绠＄悊',
+ rework :'杩斿伐绠＄悊',
+ Replenish :'琛ョ墖绠＄悊',
+ machine :'璁惧绠＄悊',
+ bOM :'BOM绠＄悊',
+ report :'鎶ヨ〃绠＄悊',
+ ProductStock :'鎴愬搧搴撳瓨',
+ ingredientsStock :'鐗╂枡搴撳瓨',
+ ingredients :'鐗╂枡璧勬枡',
+ trader :'渚涘簲鍟嗙鐞�',
+ stockReport :'浠撳偍鎶ヨ〃',
+ purchaseOrder :'閲囪喘璁㈠崟',
+ purchaseStorage :'閲囪喘鍏ュ簱',
+ purchaseReturn :'閲囪喘閫�璐�',
+ orderBasicData :'璁㈠崟鍩虹',
+ productionBasicData :'鐢熶骇鍩虹',
+ warehouseBasicData :'搴撳瓨鍩虹',
+ user :'鐢ㄦ埛鍒楄〃',
+ role :'瑙掕壊鏉冮檺',
+ userPassWord :'淇敼瀵嗙爜',
}
--
Gitblit v1.8.0