From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/kr.js | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 168 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/kr.js b/north-glass-erp/northglass-erp/src/lang/kr.js
index 4ea4126..7a9a01b 100644
--- a/north-glass-erp/northglass-erp/src/lang/kr.js
+++ b/north-glass-erp/northglass-erp/src/lang/kr.js
@@ -69,6 +69,14 @@
partiallySelected:'攵�攵� 靹犿儩',
unchecked :'氙胳劆韮� 雿办澊韯�',
copy:'欤茧 氤奠牅',
+
+ orderRemarks:'璁㈠崟澶囨敞',
+ filmNumber:'浜у搧澶囨敞',
+ remarks1:'澶囨敞1',
+ remarks2:'澶囨敞2',
+ remarks3:'澶囨敞3',
+ remarks4:'澶囨敞4',
+ otherColumns:'鍏朵粬鍒�',
msg:{
max255:"斓滊寑 255鞛� 鞛呺牓 臧�電�",
max10:"鏈�澶氳緭鍏�10涓瓧绗�",
@@ -96,7 +104,10 @@
range9999Dec: "4鞛愲Μ 鞝曥垬 鞛呺牓頃橃劯鞖�",
quantityError: '靾橂焿 鞓る, 靸堧瓿犾龚 頉� 鞝�鞛ロ晿靹胳殧',
dataDoesNotExist: "雿办澊韯� 鞐嗢潓",
- greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�"
+ greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+ greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+ notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+ notUpdate:"鍙傛暟鏈慨鏀�",
}
},
product:{
@@ -167,6 +178,8 @@
productAbbreviation:'鞝滍拡氇� 於曥暯',
productDuplication:'鞝滍拡 欷戨车',
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
@@ -272,6 +285,7 @@
surtax:'攵�臧�靹�',
valueAddedTax:'攵�臧�靹�',
cuttingTransport:'鞛嫧鞝勳啞',
+ colourCeramicGlaze:'褰╅噳鍥惧彿',
transferPage:{
oldOrderId:'旮办〈 欤茧 氩堩樃',
newOrderId:'鞁犼窚 欤茧 氩堩樃',
@@ -314,7 +328,24 @@
updateOrderIdErrorDiscrepancyInLength:'欤茧氩堩樃 鞛愲靾� 攵堨澕旃�',
updateOrderIdErrorInputNumber:'靾瀽 鞛呺牓 頃勳殧',
updateOrderIdErrorNotNo1:'觳� 氩堨Ц 頃 靾橃爼 攵堦皜',
- updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒',
+ pleaseProcessType:'璇烽�夋嫨纾ㄨ竟绫诲瀷',
+ pleaseUploadPicture1:"璇峰厛閫夋嫨瑕佷笂浼犵殑DWG鏂囦欢鎴栧浘鐗囨枃浠�",
+ pleaseUploadPicture2:"鍑嗗涓婁紶...",
+ pleaseUploadPicture3:"涓婁紶涓�...",
+ pleaseUploadPicture4:"涓婁紶瀹屾垚!",
+ pleaseUploadPicture5:"涓婁紶澶辫触!",
+ pleaseUploadPicture6:"璇烽�夋嫨DWG鏂囦欢鎴朖PG銆丳NG鏍煎紡鐨勫浘鐗囨枃浠�",
+ pleaseUploadPicture7:"鏂囦欢澶у皬涓嶈兘瓒呰繃50MB",
+ pleaseUploadPicture8:"宸查�夋嫨鏂囦欢:",
+ pleaseUploadPicture9:"鏂囦欢涓婁紶",
+ pleaseUploadPicture10:"鎷栨嫿鏂囦欢鍒版澶勬垨",
+ pleaseUploadPicture11:"鐐瑰嚮閫夋嫨鏂囦欢",
+ pleaseUploadPicture12:"浠呮敮鎸� .dwg銆�.jpg銆�.png 鏍煎紡鏂囦欢锛屼笖鏂囦欢澶у皬涓嶈秴杩�50MB",
+ pleaseUploadPicture13:"涓婁紶杩涘害",
+ pleaseUploadPicture14:"涓婁紶缁撴灉",
+ pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
+ pleaseUploadPicture16:"涓嬭浇",
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
@@ -324,6 +355,7 @@
layer:'鍗曠墖妯″紡',
notFinish:'寰呭畬鎴�',
processCardCollect:'娴佺▼鍗℃眹鎬�',
+ fileUpload:'鏂囦欢涓婁紶'
},
searchOrder:{
@@ -351,7 +383,8 @@
isOptimize:'瓴疥碃! 頃措嫻 欤茧鞚� 斓滌爜頇旊悩鞐堨姷雼堧嫟.霅橂弻毽� 靾� 鞐嗢姷雼堧嫟!',
isReportingWork:'鞛戩梾 鞁れ爜 霌彪 鞕勲霅� 欤茧鞚� 霅橂弻毽赴臧� 鞝滍暅 霅╇媹雼�.',
isStorage:'鞛呹碃 鞕勲霅� 欤茧鞚� 鞁滌姢韰� 霅橂弻毽赴臧� 攵堦皜電� 頃╇媹雼�.',
- BackSure:'頃措嫻 頂勲靹胳姢毳� 鞗愴伌毽溂搿� 霅橂弻毽嫓瓴犾姷雼堦箤?'
+ BackSure:'頃措嫻 頂勲靹胳姢毳� 鞗愴伌毽溂搿� 霅橂弻毽嫓瓴犾姷雼堦箤?',
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:'欤茧 氩堩樃 靾橃爼',
reportingTransfer:'鞛戩梾 鞁れ爜 鞚搓磤'
@@ -390,7 +423,11 @@
xMargin:'X於� 鞐氨',
yMargin:'Y於� 鞐氨',
location:'靸來憸 鞙勳箻',
- sort:'鞙犽Μ 甑巾灅 氚╈'
+ sort:'鞙犽Μ 甑巾灅 氚╈',
+ archRise:'鎷遍珮',
+ qr1Local:'浜岀淮鐮�1浣嶇疆',
+ qr2Local:'浜岀淮鐮�2浣嶇疆',
+ default:'榛樿'
},
@@ -423,6 +460,8 @@
selectDetailProcessCard:'頂勲靹胳姢 旃措摐 靸侅劯 臁绊殞'
},
+ yesTitle:'鏈夋爣棰樻墦鍗�',
+ noTitle:'鏃犳爣棰樻墦鍗�',
buildingNumber:'妤煎彿',
longSide:'闀胯竟',
shortSide:'鐭竟',
@@ -557,7 +596,25 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
+ updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
+ termination:'缁堟',
+
+ quantity:'宸ョ▼鐢ㄦ暟閲�',
+ print1:'11鍒�4琛�',
+ print2:'6琛�3鍒�',
+ glassId:'鐜荤拑缂栧彿',
+ polysId:'灏忕墖搴忓彿',
+ msg:{
+ msg1:'娴佺▼鍗″垱寤哄け璐�',
+ msg2:'璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧',
+ msg3:'鎵�閫夋暟鎹殑鏁伴噺鎬诲拰',
+ msg4:'涓庤鍗曟暟閲�',
+ msg5:'涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛�',
+ msg6:'鏄惁鍚堝苟?',
+ msg7:'鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�',
+ }
},
reportingWorks:{
page:{
@@ -565,6 +622,9 @@
addReportingWork:"瓿奠垬 氤搓碃 於旉皜",
qualityInspectionReview:"瓴�頀� 鞀轨澑",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'鞚茧牗氩堩樃',
glassAddress:'毵堩偣',
WorkReportingManagement:'鞐呺 氤搓碃 甏�毽�',
@@ -642,7 +702,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'雼措嫻 韺�鞚� 靹犿儩頃� 欤检劯鞖�.',
selectWorkReportingTeam:'雼措嫻 韺�鞚� 靹犿儩頃� 欤检劯鞖�.',
successfulModificationOfWorkApplication:'鞛戩梾 氤搓碃 靾橃爼 靹标车',
@@ -674,6 +734,17 @@
pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
+
+ pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+ woodenBox:'鏈ㄧ:',
+ brandreth:'閾佹灦',
+ tilting:'鍊掓灦',
+ secondaryBreakage:'搴忓彿娆＄牬鐩稿悓',
+ checkedBreakage:'閫変腑娆＄牬鐩稿悓',
+ unreviewed:'鏈鏍�',
+ notunreviewed:'瀹℃牳鏈�氳繃',
+ notQualified:'鏃犻渶璐ㄦ',
},
productStock:{
page:{
@@ -784,6 +855,8 @@
packing:'瑁呯璋冩灦',
msgPacking:'瑁呯璋冩灦鎴愬姛',
boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+ msg4:'鍙戣揣鍗曞凡鍒涘缓',
+ msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
},
customer:{
page:{
@@ -861,6 +934,9 @@
freightQuantity:'鞖挫啞 靾橂焿',
freight:'鞖挫啞 牍勳毄',
pleaseMsg1:'欤茧靹� 旮绊儉旮堨暋 雼皜臧� 旮办瀰霅橃 鞎婌晿鞀惦媹雼�',
+ print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+ print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+ orderAdd:'璁㈠崟娣诲姞',
},
replenish:{
@@ -900,6 +976,7 @@
PleaseSelectAReworkTeam:'鞛瀾鞐� 韺�鞚� 靹犿儩頃� 欤检劯鞖�',
TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'鞛瀾鞐� 靾橂焿鞚� 觳矆歆� 韺岇啇 靾橂焿鞚� 齑堦臣頃� 靾� 鞐嗢潓',
reworkQuantityCannotBeEmptyOr0:'鞛瀾鞐� 靾橂焿鞚� 瓿惦氨鞚搓卑雮� 0鞚� 靾� 鞐嗢潓',
+ msg1:'璇峰～鍏ラ渶瑕佸悎骞剁殑灞�',
},
@@ -945,10 +1022,19 @@
changeUserName:'靷毄鞛� 氇� 靾橃爼',
userNameCannotBeEmpty:'靷毄鞛� 鞚措鞚� 頃勳垬 鞛呺牓 頃鞛呺媹雼�',
},
+ userLog:{
+ page:{
+ userListLog:'鏃ュ織棣栭〉',
+ },
+ loginName:'鐧诲綍鍚�',
+ userName:'鐢ㄦ埛鍚�',
+ loginDate:'鐧诲綍鏃堕棿',
+ },
orderBasicData:{
page:{
searchOrderBasicData:'旮半掣 鞙犿槙',
searchGlassType:'鞙犽Μ 攵勲',
+ searchProcessAttributeConfig:'宸ヨ壓灞炴�х被鍒�',
},
glassCategory:'鞙犽Μ 攵勲',
order:'欤茧 甏�毽�',
@@ -989,6 +1075,9 @@
laminatingProcessB:'欷戧车 頉� 鞝戫暕 瓿奠爼',
laminatingProcessC:'鞝侅傅 瓿奠爼',
laminatingProcessD:'欷戧车 鞙犽Μ 鞝滌“ 瓿奠爼',
+ please1:'璇烽�夋嫨绫诲埆',
+ please2:'璇疯緭鍏ュ悕绉�',
+ please3:'璇疯緭鍏ュ埆鍚�',
},
machine:{
page:{
@@ -1052,7 +1141,10 @@
finishedProductReport :'鞕勳牅頀� 氤搓碃靹�',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
+ WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+ processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
productionReport:'靸濎偘 氤搓碃靹�',
workInProgressReport:'歆勴枆 欷戩澑 鞝滍拡 氤搓碃靹�',
processToBeCompleted:'鞕勲頃挫暭 頃� 頂勲靹胳姢 氤搓碃靹�',
@@ -1068,11 +1160,13 @@
qualityReport:'頀堨 氤搓碃靹�',
productionScheduling:'靸濎偘 鞚检爼 韼胳劚',
yieldReport:'鞏戫拡毳� 氤搓碃靹�',
+ yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
workingProcedure:'瓿奠爼',
inventoryArea:'鞛碃 歆�鞐�',
pleaseSelectADateFirst:'雮犾毳� 靹犿儩頃橃劯鞖�',
pleaseSelectAProcessFirst:'瓿奠爼鞚� 靹犿儩頃橃劯鞖�',
theFilteringTimeForExportCannotExceed180Days:'雮措炒雮搓赴 頃勴劙毵� 旮瓣皠鞚� 180鞚检潉 齑堦臣頃� 靾� 鞐嗢姷雼堧嫟.',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'欤茧 鞚检嫓',
deliveryDate:'雮╆赴 鞚检瀽',
completedQuantity:'鞕勲 靾橂焿',
@@ -1097,7 +1191,9 @@
finishedProductReport :'鞕勳牅頀� 氤搓碃靹�',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
+
},
productionBasicData:{
page:{
@@ -1132,6 +1228,7 @@
pleaseEnter :'鞛呺牓',
msg1 :'斓滊寑 5MB 鞚措偞 鞚措歆� 韺岇澕鞚� 靹犿儩頃挫＜靹胳殧',
unit :'鍗曚綅',
+ msg2 :'璇ョ墿鏂欏凡瀛樺湪',
},
ingredientsStock:{
page:{
@@ -1186,7 +1283,10 @@
additionOfSurplusMaterials :'浣欐枡鏂板',
excessMaterialOutflow :'浣欐枡鍑哄簱',
pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷',
- pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�'
+ pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+ msg1:'搴撳瓨瀛樺湪澶氭潯',
+ msg2:'鏁伴噺涓嶅璇锋鏌�',
+ msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
},
warehouseBasicData:{
page:{
@@ -1214,6 +1314,8 @@
materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'霛茧波氇� 於旉皜',
@@ -1264,7 +1366,9 @@
role :'鞐暊 甓岉暅',
userPassWord :'牍勲皜氩堩樃 氤�瓴�',
glassPrice:'鞙犽Μ 臧�瓴�',
- glassOptimize:'鞙犽Μ 斓滌爜頇�'
+ glassOptimize:'鞙犽Μ 斓滌爜頇�',
+ finishedGlassShelf:'鎴愬搧鏂欐灦',
+ userLog:'鐧诲綍鏃ュ織'
},
glassPrice:{
@@ -1284,6 +1388,61 @@
addProduce:'鞝滍拡 靹犿儩',
reorder:'鞚挫洈 欤茧',
unit:'氅旐儉/m虏'
+ },
+
+ finishedGlassShelf:{
+ finishedGlassShelfInformation:'鏂欐灦搴撳瓨',
+ finishedGlassShelfEmit:'鏂欐灦鍑哄簱',
+ finishedGlassShelfWithdraw:'鏂欐灦鍏ュ簱',
+ createFinishedGlassShelf:'鏂欐灦鏂板',
+ msg:{
+ errorNotNull1:'鏂欐灦缂栧彿涓嶈兘涓虹┖',
+ errorNotNull2:'鏂欐灦鍚嶇О涓嶈兘涓虹┖',
+ errorNotNull3:'鏁伴噺涓嶈兘涓虹┖',
+ errorNotNull4:'鍗曚环涓嶈兘涓虹┖',
+ errorNotNull5:'鍗曚綅涓嶈兘涓虹┖',
+ errorNotNull6:'鏈�澶ф壙閲嶄笉鑳戒负绌�',
+ errorNotNull7:'鏈�澶у涓嶈兘涓虹┖',
+ errorNotNull8:'鏈�澶ч珮涓嶈兘涓虹┖',
+ pleaseWithdrawTime:'璇疯緭鍏ュ綊杩樻棩鏈�',
+ error1:'宸插瓨鍦ㄥ綊杩樻暟鎹棤娉曞垹闄�!',
+ error2:'璇烽�変腑涓�琛屾暟鎹�!',
+ error3:'宸插叏閮ㄥ綊杩�!',
+
+ },
+ glassShelfNumber:'鏂欐灦缂栧彿',
+ glassShelfName:'鏂欐灦鍚嶇О',
+ availableQuantity:'鐜版湁鏁伴噺',
+ totalQuantity:'鎬绘暟閲�',
+ maxWidth:'鏈�澶у',
+ maxHeight:'鏈�澶ч珮',
+ maxWeight:'鏈�澶ф壙閲�',
+ withdrawQuantity:'褰掕繕鏁伴噺',
+ withdrawTime:'褰掕繕鏃ユ湡',
+ operator:'缁忓姙浜�',
+ withdraw:'褰掕繕',
+ emitId:'鍑哄簱缂栧彿',
+ 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