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/ru.js | 242 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 231 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 4641e4d..fb2f94e 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -69,8 +69,17 @@
partiallySelected:'閮ㄥ垎閫変腑',
unchecked :'鏈�変腑',
copy:'澶嶅埗',
+
+ orderRemarks:'璁㈠崟澶囨敞',
+ filmNumber:'浜у搧澶囨敞',
+ remarks1:'澶囨敞1',
+ remarks2:'澶囨敞2',
+ remarks3:'澶囨敞3',
+ remarks4:'澶囨敞4',
+ otherColumns:'鍏朵粬鍒�',
msg:{
max255:"袙胁械写懈褌械 255 褋懈屑胁芯谢芯胁.",
+ max10:"鏈�澶氳緭鍏�10涓瓧绗�",
range99999Dec2:
"袙胁械写懈褌械 褔懈褋谢芯 屑械卸写褍 0 - 99999 懈 褋芯褏褉邪薪懈褌械 写芯 写胁褍褏 写械褋褟褌懈褔薪褘褏 蟹薪邪泻芯胁.",
range99999Dec3:
@@ -95,6 +104,10 @@
range9999Dec: "袙胁械写懈褌械 褔械褌褘褉械 褑械谢褘褏 褔懈褋谢邪.",
quantityError: "鏁伴噺閿欒锛岃鍒锋柊鍐嶄繚瀛�",
dataDoesNotExist: "鏁版嵁涓嶅瓨鍦�",
+ greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+ greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+ notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+ notUpdate:"鍙傛暟鏈慨鏀�",
}
},
product:{
@@ -141,7 +154,7 @@
hollowUpdate:'袩褍褋褌芯械 芯斜薪芯胁谢械薪懈械',
interlayerThickness:'* 孝芯谢褖懈薪邪 褋谢芯褟',
interlayerType:'* 孝懈锌',
- interlayerColor:'* 笑胁械褌',
+ interlayerColor:' 笑胁械褌',
interlayer:'孝褉懈锌谢械泻褋',
interlayerUpdate:'孝褉懈锌谢械泻褋 芯斜薪芯胁谢械薪懈械',
glassAttribute:'小胁芯泄褋褌胁邪 屑芯薪芯谢懈褌薪芯谐芯 褋褌械泻谢邪',
@@ -165,6 +178,8 @@
productAbbreviation:'袩褉芯写褍泻褑懈褟',
productDuplication:'浜у搧閲嶅',
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
@@ -252,6 +267,35 @@
allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
+ graphic:'鍥惧舰',
+ drawingNo:'鍥惧彿',
+ upper:'涓�',
+ down:'涓�',
+ horizontal:'妯�',
+ vertical:'绔�',
+ exportDXF:'瀵煎嚭dxf',
+ selectFile:'閫夋嫨鏂囦欢',
+ left:'宸�',
+ right:'鍙�',
+ edgeAngleCurvature:'杈硅寮у害',
+ cuttingCorners:'鍒囪竟瑙�',
+ fourCornerExcavation:'鍥涜鎸栫己',
+
+ ownerForProduction:'鐢熶骇閮ㄩ棬璐熻矗浜�',
+ surtax:'闄勫姞绋�',
+ valueAddedTax:'澧炲�肩◣',
+ cuttingTransport:'杩愯緭娑堝噺',
+ colourCeramicGlaze:'褰╅噳鍥惧彿',
+ transferPage:{
+ oldOrderId:'鍘熻鍗曞彿',
+ newOrderId:'鏂拌鍗曞彿',
+ oldOrderNumber:'鍘熻鍗曞簭鍙�',
+ newOrderNumber:'鏂拌鍗曞簭鍙�',
+ confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+ errorToMes:'涓巑es閫氳寮傚父'
+
+ },
+
msg:{
productCheck:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯写褍泻褌',
tableLengthNot:'袧械褌 写邪薪薪褘褏 褌邪斜谢懈褑褘',
@@ -284,12 +328,34 @@
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:'妯＄硦妯″紡',
- glassSizeRange:'鐜荤拑灏哄鑼冨洿'
-
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿',
+ glassQuantity:'灏忕墖鏁伴噺',
+ merge:'瀹屾暣妯″紡',
+ layer:'鍗曠墖妯″紡',
+ notFinish:'寰呭畬鎴�',
+ processCardCollect:'娴佺▼鍗℃眹鎬�',
+ fileUpload:'鏂囦欢涓婁紶'
},
searchOrder:{
createOrder:'袙褘锌懈褋邪褌褜 蟹邪泻邪蟹',
@@ -316,7 +382,9 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
+
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
@@ -355,7 +423,12 @@
xMargin:'袚褉邪薪懈褑褘 芯褋懈 X',
yMargin:'袠薪褌械褉胁邪谢 芯褋懈 Y',
location:'袪邪褋锌芯谢芯卸械薪懈械 褌芯胁邪褉薪芯谐芯 蟹薪邪泻邪',
- sort:'鐜荤拑鍙嶅集'
+ sort:'鐜荤拑鍙嶅集',
+ archRise:'鎷遍珮',
+ qr1Local:'浜岀淮鐮�1浣嶇疆',
+ qr2Local:'浜岀淮鐮�2浣嶇疆',
+ default:'榛樿'
+
},
workOrder:{
@@ -385,8 +458,15 @@
addProcessCard:"鍒嗘灦鏂板",
printFlowCard:"娴佺▼鍗℃墦鍗�",
selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
+
},
- flashback:'鍊掑彊',
+ yesTitle:'鏈夋爣棰樻墦鍗�',
+ noTitle:'鏃犳爣棰樻墦鍗�',
+ buildingNumber:'妤煎彿',
+ longSide:'闀胯竟',
+ shortSide:'鐭竟',
+ printCompound:'闇�瑕佸悓鏋剁殑灞�',
+ flashback:'鍊掑簭',
processId:'袧芯屑械褉 锌褉芯褑械褋褋邪',
founder:'袛懈褋锌械褌褔械褉',
layoutStatus:'肖芯褉屑邪褌',
@@ -512,6 +592,29 @@
addFlowCardMsg2:'璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�',
okFlowCard:'宸插垎鏋�',
noFlowCard:'鏈垎鏋�',
+ mainWidth:'瀹介珮',
+ mainHeight:'楂樺',
+ terminationQuantity:'鐢熶骇缁堟鏁伴噺',
+ terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
+ updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
+ termination:'缁堟',
+
+ quantity:'宸ョ▼鐢ㄦ暟閲�',
+ print1:'11鍒�4琛�',
+ print2:'6琛�3鍒�',
+ glassId:'鐜荤拑缂栧彿',
+ polysId:'灏忕墖搴忓彿',
+ msg:{
+ msg1:'娴佺▼鍗″垱寤哄け璐�',
+ msg2:'璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧',
+ msg3:'鎵�閫夋暟鎹殑鏁伴噺鎬诲拰',
+ msg4:'涓庤鍗曟暟閲�',
+ msg5:'涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛�',
+ msg6:'鏄惁鍚堝苟?',
+ msg7:'鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�',
+ }
},
reportingWorks:{
page:{
@@ -519,6 +622,9 @@
addReportingWork:"袧芯胁褘械 芯褌蟹褘胁褘",
qualityInspectionReview:"袩褉芯胁械褉泻邪 泻邪褔械褋褌胁邪",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'number',
glassAddress:'小褌械泻谢褟薪薪邪褟 屑邪褉泻懈褉芯胁泻邪',
WorkReportingManagement:'校锌褉邪胁谢械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹褜褞',
@@ -593,8 +699,10 @@
passAudit:'袩褉芯胁械褉泻邪 锌褉芯褕谢邪',
patchCondition:'琛ョ墖鐘舵��',
changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
+ hiddenVal:'闅愯棌',
-
+ futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
selectWorkReportingTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 谐褉褍锌锌褍 芯褌胁械褌褋褌胁械薪薪芯褋褌懈.',
successfulModificationOfWorkApplication:'袠蟹屑械薪械薪懈械 芯斜褉邪褌薪芯泄 褋胁褟蟹懈 褍褋锌械褕薪芯',
@@ -621,6 +729,22 @@
pleaseNumber8:'袙胁械写懈褌械 褋械褉懈泄薪褘泄 薪芯屑械褉.',
pleaseNumber9:'袩褉邪胁懈谢褜薪芯械 蟹邪胁械褉褕械薪懈械 懈 泻芯谢懈褔械褋褌胁芯 锌芯胁褉械卸写械薪薪褘褏',
pleaseNumber10:'瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺',
+ pleaseNumber11:'瀹屽伐+娆＄牬鏁伴噺涓嶈兘澶т簬鍙畬宸ユ暟閲�',
+ pleaseNumber12:'鏈伐搴忔姤宸ユ暟:',
+ pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
+ pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
+ pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
+
+ pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+ woodenBox:'鏈ㄧ:',
+ brandreth:'閾佹灦',
+ tilting:'鍊掓灦',
+ secondaryBreakage:'搴忓彿娆＄牬鐩稿悓',
+ checkedBreakage:'閫変腑娆＄牬鐩稿悓',
+ unreviewed:'鏈鏍�',
+ notunreviewed:'瀹℃牳鏈�氳繃',
+ notQualified:'鏃犻渶璐ㄦ',
},
productStock:{
page:{
@@ -728,6 +852,11 @@
msg2:'鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�',
msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟',
boxingPrinting:'瑁呯鎵撳嵃',
+ packing:'瑁呯璋冩灦',
+ msgPacking:'瑁呯璋冩灦鎴愬姛',
+ boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+ msg4:'鍙戣揣鍗曞凡鍒涘缓',
+ msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
},
customer:{
page:{
@@ -805,6 +934,9 @@
freightQuantity:'杩愯垂鏁伴噺',
freight:'杩愯垂閲戦',
pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
+ print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+ print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+ orderAdd:'璁㈠崟娣诲姞',
},
replenish:{
@@ -844,6 +976,7 @@
PleaseSelectAReworkTeam:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 褉邪斜芯褔褍褞 谐褉褍锌锌褍.',
TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'袩械褉械褉邪斜芯褌泻邪 薪械 写芯谢卸薪邪 锌褉械胁褘褕邪褌褜 泻芯谢懈褔械褋褌胁芯 锌芯胁褉械卸写械薪懈泄.',
reworkQuantityCannotBeEmptyOr0:'袩械褉械褉邪斜芯褌泻邪 薪械 屑芯卸械褌 斜褘褌褜 锌褍褋褌芯泄 懈谢懈 薪褍谢械胁芯泄.',
+ msg1:'璇峰～鍏ラ渶瑕佸悎骞剁殑灞�',
},
@@ -872,6 +1005,7 @@
userId:'袠写械薪褌懈褎懈泻邪褌芯褉 锌芯谢褜蟹芯胁邪褌械谢褟',
user:'袩芯谢褜蟹芯胁邪褌械谢懈',
setUpRoles:'袧邪褋褌褉芯泄泻邪 褉芯谢械泄',
+ setProcess:'璁剧疆宸ュ簭',
changePassword:'袠蟹屑械薪懈褌褜 锌邪褉芯谢褜',
OldPassword:'小褌邪褉褘泄 锌邪褉芯谢褜',
TheNewPassword:'袧芯胁褘泄 锌邪褉芯谢褜',
@@ -888,10 +1022,19 @@
changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
+ userLog:{
+ page:{
+ userListLog:'鏃ュ織棣栭〉',
+ },
+ loginName:'鐧诲綍鍚�',
+ userName:'鐢ㄦ埛鍚�',
+ loginDate:'鐧诲綍鏃堕棿',
+ },
orderBasicData:{
page:{
searchOrderBasicData:'袘邪蟹芯胁褘泄 褌懈锌',
searchGlassType:'小褌械泻谢芯 泻邪褌械谐芯褉懈懈',
+ searchProcessAttributeConfig:'宸ヨ壓灞炴�х被鍒�',
},
glassCategory:'小褌械泻谢芯 泻邪褌械谐芯褉懈懈',
order:'袟邪泻邪蟹褘',
@@ -932,6 +1075,9 @@
laminatingProcessB:'涓┖鍚庡悎鐗囧伐搴�',
laminatingProcessC:'澶硅兌宸ュ簭',
laminatingProcessD:'涓┖宸ュ簭',
+ please1:'璇烽�夋嫨绫诲埆',
+ please2:'璇疯緭鍏ュ悕绉�',
+ please3:'璇疯緭鍏ュ埆鍚�',
},
machine:{
page:{
@@ -995,7 +1141,10 @@
finishedProductReport :'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
+ WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+ processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
productionReport:'袨褌褔械褌 芯 锌褉芯懈蟹胁芯写褋褌胁械',
workInProgressReport:'袨褌褔械褌 芯 薪械蟹邪胁械褉褕械薪薪芯泄 锌褉芯写褍泻褑懈懈',
processToBeCompleted:'袨褌褔械褌 芯 薪械蟹邪胁械褉褕械薪薪芯泄 芯锌械褉邪褑懈懈',
@@ -1011,11 +1160,13 @@
qualityReport:'袨褌褔械褌 芯 泻邪褔械褋褌胁械',
productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
yieldReport:'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
+ yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
workingProcedure:'袨锌械褉邪褑懈懈',
inventoryArea:'小泻谢邪写褋泻邪褟 锌谢芯褖邪写褜',
pleaseSelectADateFirst:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 写邪褌褍.',
pleaseSelectAProcessFirst:'袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 锌褉芯褑械写褍褉褍.',
theFilteringTimeForExportCannotExceed180Days:'袙褉械屑褟 芯褌斜芯褉邪 薪械 屑芯卸械褌 锌褉械胁褘褕邪褌褜 180 写薪械泄.',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'袙褉械屑褟 蟹邪泻邪蟹邪',
deliveryDate:'袛邪褌邪 锌芯褋褌邪胁泻懈',
completedQuantity:'袣芯谢懈褔械褋褌胁芯 胁褘锌芯谢薪械薪薪褘褏',
@@ -1039,6 +1190,10 @@
finished :'袣芯褝褎褎懈褑懈械薪褌 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
finishedProductReport :'袨褌褔械褌 芯 谐芯褌芯胁芯泄 锌褉芯写褍泻褑懈懈',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н',
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
+
},
productionBasicData:{
page:{
@@ -1073,6 +1228,7 @@
pleaseEnter :'袙胁械写懈褌械',
msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
unit :'鍗曚綅',
+ msg2 :'璇ョ墿鏂欏凡瀛樺湪',
},
ingredientsStock:{
page:{
@@ -1126,7 +1282,11 @@
surplusMaterialManagement :'浣欐枡绠＄悊',
additionOfSurplusMaterials :'浣欐枡鏂板',
excessMaterialOutflow :'浣欐枡鍑哄簱',
- pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷'
+ pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷',
+ pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+ msg1:'搴撳瓨瀛樺湪澶氭潯',
+ msg2:'鏁伴噺涓嶅璇锋鏌�',
+ msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
},
warehouseBasicData:{
page:{
@@ -1154,6 +1314,8 @@
materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+ finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+ finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
},
components:{
addNewSignature :'袛芯斜邪胁懈褌褜 懈屑褟 屑械褌泻懈',
@@ -1204,7 +1366,9 @@
role :'袩褉邪胁邪 薪邪 褉芯谢褜',
userPassWord :'袠蟹屑械薪懈褌褜 锌邪褉芯谢褜',
glassPrice:'笑械薪邪 褋褌械泻谢邪.',
- glassOptimize:'鐜荤拑浼樺寲'
+ glassOptimize:'鐜荤拑浼樺寲',
+ finishedGlassShelf:'鎴愬搧鏂欐灦',
+ userLog:'鐧诲綍鏃ュ織'
},
glassPrice:{
@@ -1222,7 +1386,63 @@
hollow:'涓┖',
process:'宸ヨ壓',
addProduce:'閫夋嫨浜у搧',
- reorder:'杞鍗�'
+ 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