From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 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 6339fc8..eaa5641 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -57,10 +57,25 @@
print:'鎵撳嵃',
export:'瀵煎嚭',
empty:'娓呯┖',
+
+ incrementalAll:'涔嬪悗閫掑',
+ incrementalChecked:'閫変腑閫掑',
+ true:'鏄�',
+ false:'鍚�',
+ computedSize:'绉戝璁℃暟',
+ paste:'绮樿创',
+
+ selected:'閫変腑',
+ partiallySelected:'閮ㄥ垎閫変腑',
+ unchecked :'鏈�変腑',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
range99999Dec2:
"璇疯緭鍏�0-99999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
+ range99999Dec3:
+ "璇疯緭鍏�0-99999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎笁浣嶅皬鏁�",
+ range999999Dec2:
+ "璇疯緭鍏�0-999999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
greater0:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁�",
checkoutLose:'鏍￠獙涓嶉�氳繃',
saveSuccess:'淇濆瓨鎴愬姛',
@@ -143,6 +158,7 @@
theProductHasBeenReviewedAndCannotBeDeleted:'浜у搧宸插鏍�,鏃犳硶鍒犻櫎',
productAbbreviation:'浜у搧绠�绉�',
+ productDuplication:'浜у搧閲嶅',
}
},
order:{
@@ -183,7 +199,7 @@
computeArea:'缁撶畻鍗曠墖闈㈢Н',
computeGrossArea:'缁撶畻鎬婚潰绉�',
shape:'褰㈢姸',
- bendRadius:'寮挗寮у害',
+ bendRadius:'寮挗鍗婂緞',
edgingType:'纾ㄨ竟绫诲瀷',
import:'瀵煎叆',
template:'妯℃澘',
@@ -208,6 +224,19 @@
orderDetailsSummaryReport:'璁㈠崟鏄庣粏姹囨�绘姤琛�',
buildingNumber:'妤煎眰缂栧彿',
saveHeader:'淇濆瓨琛ㄥご',
+
+ orderNotApproved:'璁㈠崟鏈鏍�',
+ orderHasBeenReceived:'璁㈠崟宸插叆搴�',
+ printingNumber:'鎵撳嵃娆℃暟',
+ processingOrder:'鍔犲伐鍗�',
+ sheet2:'妯増-澶氬眰鏄庣粏',
+ sheet4:'鐢熶骇鍔犲伐鍗曠旱鐗�',
+ sheet3:'娴忚鍙戣揣淇℃伅',
+ sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
+ oneClickStorage:'涓�閿畬宸�',
+
+ quantityMount:'鏁伴噺閲戦',
+ orderSummaryReport:'璁㈠崟鎬绘姤琛�',
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -230,6 +259,9 @@
calculationAreaPrompt4:'璁＄畻',
warning:'鎻愮ず',
calculationAreaPrompt5:'璁㈠崟閲嶅鏄惁缁х画鍒涘缓',
+
+ pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
+ grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
}
},
@@ -265,6 +297,7 @@
totalArea:'鎬诲昂瀵�',
childWidth:'鍗曠墖瀹�',
childHeight:'鍗曠墖楂�',
+ arc:'寮ч暱',
area:'鍗曠墖灏哄',
process:'宸ヨ壓娴佺▼',
orderDetail:'璁㈠崟璇︽儏',
@@ -370,8 +403,9 @@
productType:'浜у搧绫诲瀷',
whetherToScheduleProduction:'鏄惁鎺掍骇',
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�',
- deleteNoProcedure:'鍒犻櫎澶辫触锛屾鏌ヤ笅宸ュ簭鏄惁宸叉姤宸�',
+ deleteNoProcedure:'鍒犻櫎澶辫触锛岃妫�鏌ヤ笅宸ュ簭鏄惁宸叉姤宸ユ垨鑰呭凡琛ョ墖杩斿伐',
pleaseCheckTheRequiredData:'璇峰嬀閫夐渶瑕佺殑鏁版嵁',
+ landingSequence:'钀芥灦椤哄簭',
labelStyle:'鏍囩鏍峰紡',
customLabelPrinting:'鑷畾涔夋爣绛炬墦鍗�',
@@ -386,6 +420,11 @@
halfProductLabel:'鍗婂搧鏍囩',
pleaseSelectCustomPrintLabelStyle:'璇烽�夋嫨鑷畾涔夋墦鍗版爣绛炬牱寮�',
mergePrinting:'鍚堝苟鎵撳嵃',
+ printStatus:'鎵撳嵃娆℃暟',
+ labelPrinting2:'鏍囩鎵撳嵃2',
+ addAutomatically:'鑷姩濉厖',
+ selectFill:'閫変腑濉厖',
+ engineeringPrinting:'宸ョ▼鎵撳嵃'
},
reportingWorks:{
glassNumber:'缂栧彿',
@@ -581,6 +620,9 @@
endOperationOrderNumber:'璋冩嫧搴忓彿',
typeClaim:'棰嗗嚭绫诲瀷',
+ pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
+ boxNumber:'绠卞彿',
+
},
customer:{
@@ -643,6 +685,13 @@
salesman:'閿�鍞憳',
money:'閲戦',
+ pleaseSelectTheSameCustomerProject:'璇烽�夋嫨鐩稿悓瀹㈡埛鐨勯」鐩�',
+ noMoney:'鏃犻噾棰�',
+ freightPrice:'杩愯垂鍗曚环',
+ freightQuantity:'杩愯垂鏁伴噺',
+ freight:'杩愯垂閲戦',
+ pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
+
},
replenish:{
patchManagement:'琛ョ墖绠＄悊',
@@ -699,6 +748,10 @@
ConfirmPasswordCannotBeEmpty:'纭瀵嗙爜涓嶈兘涓虹┖',
TheTwoPasswordsAreNotTheSame:'涓ゆ瀵嗙爜涓嶇浉鍚�',
OldPasswordError:'鏃у瘑鐮侀敊璇�',
+
+ userName:'鐢ㄦ埛鍚嶇О',
+ changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
+ userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
orderBasicData:{
order:'璁㈠崟',
@@ -732,6 +785,10 @@
firstLevel:'涓�绾х被鍒�',
towLevel:'浜岀骇绫诲埆',
alias:'鍒悕',
+ msg1:'涓婁紶鍥剧墖澶у皬涓嶈兘瓒呰繃 5MB!',
+ msg2:'涓婁紶鍥剧墖鍙兘鏄� JPG鎴栬�匬NG 鏍煎紡!',
+ selectFile:'閫夊彇鏂囦欢',
+ msg3:'鍙兘涓婁紶jpg/png鏂囦欢,涓斾笉瓒呰繃5m',
},
machine:{
basicId:'璁惧缂栧彿',
@@ -783,6 +840,7 @@
TaskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
rawMaterialRequisition:'鍘熺墖棰嗘枡鎶ヨ〃',
qualityReport:'鍝佽川鎶ヨ〃',
+ productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
yieldReport:'鎴愬搧鐜囨姤琛�',
workingProcedure:'宸ュ簭',
inventoryArea:'搴撳瓨闈㈢Н',
@@ -874,6 +932,10 @@
returnQuantity :'杩斿簱鏁伴噺',
materialReturnType :'鏉愭枡杩斿簱绫诲瀷',
createTime :'杩斿簱鏃ユ湡',
+
+ surplusMaterialManagement :'浣欐枡绠＄悊',
+ additionOfSurplusMaterials :'浣欐枡鏂板',
+ excessMaterialOutflow :'浣欐枡鍑哄簱',
},
mainBasicData:{
BasicData :'鍩虹鏁版嵁',
@@ -895,6 +957,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