From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index f2f695d..06112dd 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -69,6 +69,13 @@
partiallySelected:'閮ㄥ垎閫変腑',
unchecked :'鏈�変腑',
copy:'澶嶅埗',
+
+ orderRemarks:'璁㈠崟澶囨敞',
+ filmNumber:'浜у搧澶囨敞',
+ remarks1:'澶囨敞1',
+ remarks2:'澶囨敞2',
+ remarks3:'澶囨敞3',
+ remarks4:'澶囨敞4',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
max10:"鏈�澶氳緭鍏�10涓瓧绗�",
@@ -96,7 +103,10 @@
range9999Dec: "璇疯緭鍏ュ洓浣嶆暣鏁�",
quantityError: "鏁伴噺閿欒锛岃鍒锋柊鍐嶄繚瀛�",
dataDoesNotExist: "鏁版嵁涓嶅瓨鍦�",
- greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�"
+ greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+ greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+ notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+ notUpdate:"鍙傛暟鏈慨鏀�",
}
},
product:{
@@ -167,6 +177,8 @@
productAbbreviation:'浜у搧绠�绉�',
productDuplication:'浜у搧閲嶅',
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
@@ -243,10 +255,10 @@
orderHasBeenReceived:'璁㈠崟宸插叆搴�',
printingNumber:'鎵撳嵃娆℃暟',
processingOrder:'鍔犲伐鍗�',
- sheet2:'妯増-澶氬眰鏄庣粏',
- sheet4:'鐢熶骇鍔犲伐鍗曠旱鐗�',
+ sheet2:'妯増-澶氬眰鏄庣粏(鎺ㄨ崘)',
+ sheet4:'绾电増-鎴愬搧淇℃伅',
sheet3:'娴忚鍙戣揣淇℃伅',
- sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
+ sheet5:'绾电増-鍗曠墖寮挗',
oneClickStorage:'涓�閿畬宸�',
oneClickReturn:'涓�閿��鍥�',
@@ -272,6 +284,7 @@
surtax:'闄勫姞绋�',
valueAddedTax:'澧炲�肩◣',
cuttingTransport:'杩愯緭娑堝噺',
+ colourCeramicGlaze:'褰╅噳鍥惧彿',
transferPage:{
oldOrderId:'鍘熻鍗曞彿',
newOrderId:'鏂拌鍗曞彿',
@@ -351,7 +364,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
@@ -563,9 +577,23 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
+
+ quantity:'宸ョ▼鐢ㄦ暟閲�',
+ print1:'11鍒�4琛�',
+ print2:'6琛�3鍒�',
+ msg:{
+ msg1:'娴佺▼鍗″垱寤哄け璐�',
+ msg2:'璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧',
+ msg3:'鎵�閫夋暟鎹殑鏁伴噺鎬诲拰',
+ msg4:'涓庤鍗曟暟閲�',
+ msg5:'涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛�',
+ msg6:'鏄惁鍚堝苟?',
+ msg7:'鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�',
+ }
},
reportingWorks:{
page:{
@@ -653,7 +681,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'璇烽�夋嫨璐ｄ换鐝粍',
selectWorkReportingTeam:'璇烽�夋嫨璐ｄ换鐝粍',
successfulModificationOfWorkApplication:'鎶ュ伐淇敼鎴愬姛',
@@ -685,6 +713,17 @@
pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
+
+ pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+ woodenBox:'鏈ㄧ:',
+ brandreth:'閾佹灦',
+ tilting:'鍊掓灦',
+ secondaryBreakage:'搴忓彿娆＄牬鐩稿悓',
+ checkedBreakage:'閫変腑娆＄牬鐩稿悓',
+ unreviewed:'鏈鏍�',
+ notunreviewed:'瀹℃牳鏈�氳繃',
+ notQualified:'鏃犻渶璐ㄦ',
},
productStock:{
page:{
@@ -795,6 +834,8 @@
packing:'瑁呯璋冩灦',
msgPacking:'瑁呯璋冩灦鎴愬姛',
boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+ msg4:'鍙戣揣鍗曞凡鍒涘缓',
+ msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
},
customer:{
page:{
@@ -872,6 +913,8 @@
freightQuantity:'杩愯垂鏁伴噺',
freight:'杩愯垂閲戦',
pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
+ print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+ print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
},
replenish:{
@@ -889,7 +932,8 @@
sliceMarking:'鐗囨爣璁�',
printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
labelTemplate:'鏍囩妯℃澘锛�',
- listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
+ listLabelTemplates:'鏍囩妯℃澘鍒楄〃',
+ label:'灏忕墖鏍囩',
},
rework:{
page:{
@@ -910,6 +954,7 @@
PleaseSelectAReworkTeam:'璇烽�夋嫨杩斿伐鐝粍',
TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'杩斿伐鏁伴噺涓嶈兘澶т簬娆＄牬鏁伴噺',
reworkQuantityCannotBeEmptyOr0:'杩斿伐鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0',
+ msg1:'璇峰～鍏ラ渶瑕佸悎骞剁殑灞�',
},
@@ -1062,16 +1107,20 @@
finishedProductReport :'鎴愬搧鎶ヨ〃',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
productionReport:'鐢熶骇鎶ヨ〃',
workInProgressReport:'鍦ㄥ埗鍝佹槑缁嗘姤琛�',
WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+ processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
processToBeCompleted:'宸ュ簭寰呭畬鎴愭姤琛�',
productionAndShippingProgress:'鐢熶骇鍙戣揣杩涘害鎶ヨ〃',
processCardProgress:'娴佺▼鍗¤繘搴︽姤琛�',
orderPlanDecomposition:'璁㈠崟璁″垝鍒嗚В鎶ヨ〃',
secondaryBrokenReport:'娆＄牬鎶ヨ〃',
crossProcessBreakdown:'璺ㄥ伐搴忔鐮存姤琛�',
+ notCrossProcessBreakdown:'闈炶法宸ュ簭娆＄牬鎶ヨ〃',
+ secondaryBrokenTotal:'娆＄牬鎬绘姤琛�',
teamOutput:'鐝粍浜ч噺鎶ヨ〃',
splittingDetails:'鍒嗘灦鏄庣粏鎶ヨ〃',
TaskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
@@ -1085,6 +1134,7 @@
pleaseSelectADateFirst:'璇峰厛閫夋嫨鏃ユ湡',
pleaseSelectAProcessFirst:'璇峰厛閫夋嫨宸ュ簭',
theFilteringTimeForExportCannotExceed180Days:'瀵煎嚭鐨勭瓫閫夋椂闂翠笉鑳借秴杩�180澶�',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'涓嬪崟鏃堕棿',
deliveryDate:'浜よ揣鏃ユ湡',
completedQuantity:'宸插畬鎴愭暟閲�',
@@ -1109,7 +1159,8 @@
finishedProductReport :'鎴愬搧鎶ヨ〃',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
},
productionBasicData:{
@@ -1145,6 +1196,7 @@
pleaseEnter :'璇疯緭鍏�',
msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
unit :'鍗曚綅',
+ msg2 :'璇ョ墿鏂欏凡瀛樺湪',
},
ingredientsStock:{
page:{
@@ -1199,7 +1251,10 @@
additionOfSurplusMaterials :'浣欐枡鏂板',
excessMaterialOutflow :'浣欐枡鍑哄簱',
pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷',
- pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�'
+ pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+ msg1:'搴撳瓨瀛樺湪澶氭潯',
+ msg2:'鏁伴噺涓嶅璇锋鏌�',
+ msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
},
warehouseBasicData:{
page:{
@@ -1280,7 +1335,8 @@
userPassWord :'淇敼瀵嗙爜',
glassPrice:'鐜荤拑浠锋牸',
glassOptimize:'鐜荤拑浼樺寲',
- finishedGlassShelf:'鎴愬搧鏂欐灦'
+ finishedGlassShelf:'鎴愬搧鏂欐灦',
+ userLog:'鐧诲綍鏃ュ織'
},
glassPrice:{
@@ -1337,6 +1393,24 @@
withdrawId:'鍏ュ簱缂栧彿',
returnDelivery:'杩斿洖鍙戣揣',
withdrawQuantity1:'寰呭綊杩樻暟閲�',
+ summary:'姹囨��',
+ detail:'鏄庣粏',
+ },
+ bom:{
+ orderBOM:'璁㈠崟BOM',
+ productBOM:'浜у搧BOM',
+ materialBOM:'鐗╂枡BOM',
+ msg:{
+ msg1:'璇峰厛閫夋嫨涓�涓骇鍝佹爣绛�',
+ },
+ bomType:'绫诲瀷',
+ consume:'娑堣�楅噺',
+ price:'浣跨敤浠锋牸',
+ price1:'浠锋牸',
+ usageType:'浣跨敤绫诲瀷',
+ bomPrice:'BOM鎴愭湰',
+ other:'鍏跺畠',
+
}
--
Gitblit v1.8.0