From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/zh.js | 322 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 283 insertions(+), 39 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 7deec49..2d8db87 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -68,6 +68,7 @@
selected:'閫変腑',
partiallySelected:'閮ㄥ垎閫変腑',
unchecked :'鏈�変腑',
+ copy:'澶嶅埗',
msg:{
max255:"鏈�澶氳緭鍏�255涓瓧绗�",
range99999Dec2:
@@ -92,11 +93,15 @@
noProductDataInTheTable:'琛ㄦ牸涓棤浜у搧鏁版嵁',
tableDataExceedsMaximumLimit:'琛ㄦ牸鏁版嵁瓒呰繃鏈�澶ч檺鍒�',
range9999Dec: "璇疯緭鍏ュ洓浣嶆暣鏁�",
+ quantityError: "鏁伴噺閿欒锛岃鍒锋柊鍐嶄繚瀛�",
+ dataDoesNotExist: "鏁版嵁涓嶅瓨鍦�",
}
},
product:{
- ProductHomePage:'浜у搧棣栭〉',
- create:'鍒涘缓',
+ page:{
+ selectProduct:'浜у搧棣栭〉',
+ createProduct:'鍒涘缓',
+ },
coloredGlaze:'褰╅噳',
frostedSand:'钂欑爞',
coating:'闀�鑶�',
@@ -120,7 +125,7 @@
glassRepeat:'璇峰厛閫夋嫨闂撮殧鐗�',
HollowReview:'璇烽�夋嫨鍏ㄩ儴涓┖闂撮殧鐗╀笅鎷夋',
firstGlass:"璇峰厛閫夋嫨浜у搧",
- InterlayerReview:'璇烽�夋嫨鍏ㄩ儴涓┖闂撮殧鐗╀笅鎷夋',
+ InterlayerReview:'璇烽�夋嫨鍏ㄩ儴闂撮殧鐗╁甫鏄熷彿涓嬫媺妗�',
glassTypeTitle:'鏉愭枡灞炴��',
thickness:'*鍘氬害',
color:'*棰滆壊',
@@ -131,12 +136,12 @@
hollowThickness:'*涓┖鍘氬害',
hollowGasType:'*鍏呮皵鏂瑰紡:',
hollowType:'*灏佽兌',
- hollowGlueDepth:'*榛樿鑳舵繁:',
+ hollowGlueDepth:'榛樿鑳舵繁:',
hollow:'涓┖闂撮殧鐗�',
hollowUpdate:'涓┖闂撮殧鐗╀慨鏀�',
interlayerThickness:'*澶瑰眰鍘氬害',
interlayerType:'*绫诲瀷',
- interlayerColor:'*棰滆壊',
+ interlayerColor:'棰滆壊',
interlayer:'澶瑰眰闂撮殧鐗�',
interlayerUpdate:'澶瑰眰闂撮殧鐗╀慨鏀�',
glassAttribute:'鍗曠墖鐜荤拑灞炴��:',
@@ -163,8 +168,14 @@
}
},
order:{
- orderHomePage:'璁㈠崟棣栭〉',
- orderReport:'璁㈠崟鏄庣粏鎶ヨ〃',
+ page:{
+ selectOrder:'璁㈠崟棣栭〉',
+ createOrder:'鍒涘缓',
+ orderReport:'璁㈠崟鏄庣粏鎶ヨ〃',
+ orderSummaryReport:'璁㈠崟鎬绘姤琛�',
+ orderDetailsSummary:'璁㈠崟鏄庣粏姹囨��',
+ updateOrderCraft:'宸ヨ壓瀹℃牳'
+ },
project:'椤圭洰鍚嶇О',
orderId:'閿�鍞崟鍙�',
money:'鎬婚噾棰�',
@@ -210,7 +221,7 @@
areaAmountPerPiece:'闈㈢Н閲戦锛堝崟鐗囷級',
areaAmountAge:'闈㈢Н閲戦锛堟�婚潰绉級',
errorValue:'璇樊鍊�',
- orderDetailsSummary:'璁㈠崟鏄庣粏姹囨��',
+
details:'璇︽儏',
workmanship:'宸ヨ壓',
processCard:'娴佺▼鍗�',
@@ -235,9 +246,21 @@
sheet3:'娴忚鍙戣揣淇℃伅',
sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
oneClickStorage:'涓�閿畬宸�',
+ oneClickReturn:'涓�閿��鍥�',
quantityMount:'鏁伴噺閲戦',
- orderSummaryReport:'璁㈠崟鎬绘姤琛�',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+ orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
+ transferPage:{
+ oldOrderId:'鍘熻鍗曞彿',
+ newOrderId:'鏂拌鍗曞彿',
+ oldOrderNumber:'鍘熻鍗曞簭鍙�',
+ newOrderNumber:'鏂拌鍗曞簭鍙�',
+ confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+ errorToMes:'涓巑es閫氳寮傚父'
+
+ },
+
msg:{
productCheck:'璇烽�夋嫨浜у搧',
tableLengthNot:'娌℃湁琛ㄦ牸鏁版嵁',
@@ -263,7 +286,18 @@
pleaseCancelTheFilteringFirst:'璇峰厛鍙栨秷绛涢��',
grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
- }
+ differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+ updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+ updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+ updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+ updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+ updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+ updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
+ updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
+ },
+ preciseMode:'绮剧‘妯″紡',
+ ambiguityModels:'妯＄硦妯″紡',
+ glassSizeRange:'鐜荤拑灏哄鑼冨洿'
},
searchOrder:{
@@ -287,8 +321,14 @@
copy:'澶嶅埗璁㈠崟',
copyTitle:'澶嶅埗琛ㄥご',
msgList:{
- checkOrder:'鏈煡璇㈠埌璁㈠崟淇℃伅锛岃鍏堝崟鍑昏鍗�'
- }
+ checkOrder:'鏈煡璇㈠埌璁㈠崟淇℃伅锛岃鍏堝崟鍑昏鍗�',
+ isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
+ isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
+ isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ },
+ updateOrderId:"淇敼璁㈠崟鍙�",
+ reportingTransfer:'鎶ュ伐杞Щ'
},
craft:{
glassAddress:'鏍囪',
@@ -321,14 +361,18 @@
tag:'鎵撴爣浣胯兘',
tag2:'浜岀淮鐮佹墦鍗�1',
tag3:'浜岀淮鐮佹墦鍗�2',
- xMargin:'X杞磋竟璺�',
- yMargin:'Y杞磋竟璺�',
+ xMargin:'瀹芥柟鍚戝潗鏍�',
+ yMargin:'楂樻柟鍚戝潗鏍�',
location:'鍟嗘爣浣嶇疆',
+ sort:'鐜荤拑鍙嶅集'
},
workOrder:{
- workOrder:'宸ュ崟绠＄悊',
+ page:{
+ selectWorkOrder:'宸ュ崟绠＄悊',
+ addWorkOrder:'杞敓浜ц鍗�'
+ },
productionId:'鐢熶骇璁㈠崟鍙�',
convert:'宸茶浆',
unConverted:'鏈浆',
@@ -336,10 +380,25 @@
transferOrder:'杞伐鍗�',
perimeter:'鍛ㄩ暱',
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦',
- msg:'璇烽�夋嫨鎵�鏈夋暟鎹�'
+ msg:'璇烽�夋嫨鎵�鏈夋暟鎹�',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
+ page:{
+ selectProcessCard:'娴佺▼鍗＄鐞�',
+ selectAddProcess:'鍒嗘灦',
+ productionScheduling:'鎺掍骇',
+ selectPrintProject:'宸ョ▼鎵撳嵃',
+ selectPrintFlowCard:"鎵撳嵃",
+ splittingDetails:"鍒嗘灦鏌ヨ",
+ addProcessCard:"鍒嗘灦鏂板",
+ printFlowCard:"娴佺▼鍗℃墦鍗�",
+ selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
+
+ },
+ printCompound:'闇�瑕佸悓鏋剁殑灞�',
+ flashback:'鍊掑簭',
processId:'娴佺▼鍗″彿',
founder:'鍒嗘灦鍛�',
layoutStatus:'鎺掔増鐘舵��',
@@ -352,6 +411,7 @@
weight:'閲嶉噺',
selectedQuantity:'閫変腑鏁伴噺',
establishProcessCards:'寤虹珛娴佺▼鍗�',
+ createBySequenceNumber:'鎸夊簭鍙峰垱寤�',
return:'杩斿洖',
ProductionSchedulingOk:'宸叉帓浜�',
ProductionSchedulingNo:'鏈帓浜�',
@@ -386,6 +446,7 @@
composingOk:'鍙帓鐗�',
composingNo:'涓嶅彲鎺掔増',
typesetter:'宸叉帓鐗�',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'璁″垝寮�濮嬫椂闂�',
planEndTime:'璁″垝缁撴潫鏃堕棿',
customerId:'瀹㈡埛缂栫爜',
@@ -407,9 +468,12 @@
deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�',
deleteNoProcedure:'鍒犻櫎澶辫触锛岃妫�鏌ヤ笅宸ュ簭鏄惁宸叉姤宸ユ垨鑰呭凡琛ョ墖杩斿伐',
pleaseCheckTheRequiredData:'璇峰嬀閫夐渶瑕佺殑鏁版嵁',
+ notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
landingSequence:'钀芥灦椤哄簭',
labelStyle:'鏍囩鏍峰紡',
+ detailPrinting:'鏄庣粏鎵撳嵃',
+ detailsPrintedSeparately:'鏄庣粏鍒嗘灦鎵撳嵃',
customLabelPrinting:'鑷畾涔夋爣绛炬墦鍗�',
labelPrinting:'鏍囩鎵撳嵃',
sortingSuccessful:'鎺掑簭鎴愬姛',
@@ -424,13 +488,54 @@
mergePrinting:'鍚堝苟鎵撳嵃',
printStatus:'鎵撳嵃娆℃暟',
labelPrinting2:'鏍囩鎵撳嵃2',
+ finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
+ editablePrinting:'鏍囩鑷畾涔夋墦鍗�',
+ invertSelection:'鍙嶉��',
+ sortSummary:'鎺掑簭姹囨��',
addAutomatically:'鑷姩濉厖',
selectFill:'閫変腑濉厖',
engineeringPrinting:'宸ョ▼鎵撳嵃',
-
+ pleaseSelectProject:'璇烽�夋嫨宸ョ▼',
mergeState:'鍚堝苟鐘舵��',
+ merge:'鍚堝苟',
+ printQuantity:'鎵撳嵃鏁�',
+ printWarn1:'鎵撳嵃鏁伴噺涓嶈兘澶т簬璁㈠崟鏁伴噺',
+ depthShelf:"鏋跺瓙绾垫繁(mm)",
+ shelfCapacity:"鏋跺瓙鎵块噸(KG)",
+ IntervalThickness:"闂撮殧鍘氬害(mm)",
+ LongestLargestMax:"闀胯竟鏈�澶�(mm)",
+ LongestShortestMax:"闀胯竟鏈�鐭�(mm)",
+ quantityMax:"鏈�澶ф暟閲�",
+ shortestLongest:"鐭竟鏈�澶�(mm)",
+ shortestSide:"鐭竟鏈�鐭�(mm)",
+ intelligentBranching:"鏅鸿兘鍒嗘灦",
+ reset:"閲嶇疆",
+ combinedFrame:"鍚堟灦",
+ shelfNumber:'鏋跺彿',
+ totalSequenceNumber:'鎬诲簭鍙�',
+ cancelMerger:'鍙栨秷鍚堝苟',
+ projectMsg1:'璇烽�夋嫨宸ョ▼瀵瑰簲鐨勭増鍥惧彿',
+ orderPrint:'璁㈠崟鎵撳嵃',
+ numberLabelPrintingOperations:'鏍囩鎵撳嵃娆℃暟',
+ numberTimesProcessCardPrinted:'娴佺▼鍗℃墦鍗版鏁�',
+ projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
+ layoutNumber:'鐗堝浘鍙�',
+ addFlowCardMsg1:'璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�',
+ addFlowCardMsg2:'璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�',
+ okFlowCard:'宸插垎鏋�',
+ noFlowCard:'鏈垎鏋�',
+
+
},
reportingWorks:{
+ page:{
+ selectReportingWorks:"鎶ュ伐绠＄悊",
+ addReportingWork:"鎶ュ伐鏂板",
+ qualityInspectionReview:"璐ㄦ瀹℃牳",
+ },
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'缂栧彿',
glassAddress:'鐗囨爣璁�',
WorkReportingManagement:'鎶ュ伐绠＄悊',
@@ -503,6 +608,8 @@
thisCompletedQuantity:'鏈伐搴忓畬宸�',
thisWornQuantity:'鏈伐搴忔鐮�',
passAudit:'瀹℃牳閫氳繃',
+ patchCondition:'琛ョ墖鐘舵��',
+ changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
selectResponsibleTeam:'璇烽�夋嫨璐ｄ换鐝粍',
@@ -515,7 +622,7 @@
qualityInsTime:'璐ㄦ鏃堕棿',
completedArea:'瀹屽伐闈㈢Н',
wornArea:'娆＄牬闈㈢Н',
- pleaseGreaterThanOrEqual1:'璇疯緭鍏ュぇ浜庣瓑浜�',
+ pleaseGreaterThanOrEqual1:'璇疯緭鍏ュ皬浜庣瓑浜�',
pleaseGreaterThanOrEqual2:'鐨勬暟瀛�',
lossCount1:'鎹熻�楁暟',
lossCount2:'涓嶈兘澶т簬',
@@ -530,10 +637,19 @@
pleaseNumber7:'鐨勬暟閲忎笉鑳藉ぇ浜庝笂宸ュ簭鏁伴噺',
pleaseNumber8:'璇疯緭鍏ュ簭鍙�',
pleaseNumber9:'姝ｇ‘鐨勫畬宸ユ垨娆＄牬鏁伴噺',
-
+ pleaseNumber10:'瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺',
},
-
productStock:{
+ page:{
+ productStockList:"搴撳瓨鏌ヨ",
+ createProductStock:"鎴愬搧鍏ュ簱",
+ storageRecord:"鍑哄叆搴撹褰�",
+ orderAllocation:'璁㈠崟璋冩嫧',
+ finishedProductOut:'鎴愬搧鍑哄簱',
+ finishedGoodsIssue:'鎴愬搧棰嗗嚭',
+ transferRecord:'璋冩嫧璁板綍',
+ takeOutRecord:'棰嗗嚭璁板綍'
+ },
inventoryQuery:'搴撳瓨鏌ヨ',
finishedProductWarehousing:"鎴愬搧鍏ュ簱 ",
finishedProductOutbound:'鎴愬搧鍑哄簱',
@@ -609,7 +725,6 @@
singlePieceArea:'鍗曠墖闈㈢Н',
perimeter:'鍛ㄩ暱',
returnToWarehouse:'鎾ら攢',
-
entryFailure:'鍏ュ簱澶辫触',
entry:'鍏ュ簱',
failedToRetrieve:'棰嗗嚭澶辫触',
@@ -623,13 +738,20 @@
staterOperationOrderNumber:'璋冩嫧閿�鍞崟鍙�',
endOperationOrderNumber:'璋冩嫧搴忓彿',
typeClaim:'棰嗗嚭绫诲瀷',
-
pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
+
boxNumber:'绠卞彿',
-
-
+ msg1:'鍙戣揣鍗曞凡鍑哄簱璇峰埛鏂扮晫闈�',
+ msg2:'鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�',
+ msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟',
+ boxingPrinting:'瑁呯鎵撳嵃',
},
customer:{
+ page:{
+ selectCustomer:'瀹㈡埛棣栭〉',
+ createCustomer:'瀹㈡埛鏂板',
+ selectCustomerOrder:'瀹㈡埛璁㈠崟'
+ },
pleaseEnterTheCustomerName:'璇疯緭鍏ュ鎴峰悕绉�',
pleaseEnterCustomerLevel:"璇疯緭鍏ュ鎴风瓑绾� ",
pleaseEnterTheAmountOfFunds:'璇疯緭鍏ラ噾棰濋搴�',
@@ -643,16 +765,25 @@
telephone:"鑱旂郴鐢佃瘽 ",
customerNumber:'瀹㈡埛缂栧彿',
customerName:"瀹㈡埛鍚嶇О ",
- customerHomePage:'瀹㈡埛棣栭〉',
- increaseCustomers:'瀹㈡埛鏂板',
resetting:'閲嶇疆',
customerOrders:'瀹㈡埛璁㈠崟',
orderAmount:'璁㈠崟閲戦',
customerAbbreviation:'瀹㈡埛绠�绉�',
pleaseEnterTheCustomerAbbreviation:'璇疯緭鍏ュ鎴风畝绉�',
+ msgList:{
+ notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+ }
},
delivery:{
+ page:{
+ selectDelivery:'鍙戣揣棣栭〉',
+ selectOrderList:"璁㈠崟鍙戣揣 ",
+ shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
+ shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
+ createDelivery:'鍙戣揣鍒涘缓',
+ deliveryReport:'鍙戣揣鎶ヨ〃'
+ },
delivery:'鍙戣揣',
place :'涓嬪崟',
technology:'宸ヨ壓',
@@ -677,13 +808,9 @@
shippingAddress:'閫佽揣鍦板潃',
deliveryReportDate:'鍙戣揣鎶ヨ〃鏃ユ湡',
shipper:"鍙戣揣鍛� ",
- shippingHomepage:'鍙戣揣棣栭〉',
- orderShipment:"璁㈠崟鍙戣揣 ",
deliveryNoteId:'鍙戣揣鍗曞彿',
deliveryNoteNumber:'鍙戣揣搴忓彿',
deliveryDate:"鍙戣揣鏃ユ湡 ",
- shipmentDetailsReport:"鍙戣揣鏄庣粏鎶ヨ〃 ",
- shipmentProductClassificationReport:"鍙戣揣浜у搧鍒嗙被鎶ヨ〃 ",
contacts:'鑱旂郴浜�',
contactNumber:'鑱旂郴鐢佃瘽',
salesman:'閿�鍞憳',
@@ -698,15 +825,28 @@
},
replenish:{
+ page:{
+ selectReplenish:"琛ョ墖绠＄悊",
+ addReplenish:"琛ョ墖鏂板",
+ printReplenishFlowCard:"琛ョ墖鎵撳嵃"
+ },
+
patchManagement:'琛ョ墖绠＄悊',
addPatches:"琛ョ墖鏂板 ",
printPatches:'琛ョ墖鎵撳嵃',
patchNumber:'琛ョ墖鍗曞彿',
mark:'鏍囪',
sliceMarking:'鐗囨爣璁�',
-
+ printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
+ labelTemplate:'鏍囩妯℃澘锛�',
+ listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
},
rework:{
+ page:{
+ selectRework:"杩斿伐绠＄悊",
+ addRework:"杩斿伐鏂板",
+ printReworkFlowCard:"杩斿伐鎵撳嵃"
+ },
reworkManagement:'杩斿伐绠＄悊',
addRework:"杩斿伐鏂板 ",
printRework:'杩斿伐鎵撳嵃',
@@ -716,6 +856,7 @@
reworkProcess:'杩斿伐宸ュ簭',
reworkType:'杩斿伐绫诲瀷',
reworkArea:'杩斿伐闈㈢Н',
+ responsibilityInformation:'璐ｄ换淇℃伅',
PleaseSelectAReworkTeam:'璇烽�夋嫨杩斿伐鐝粍',
TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'杩斿伐鏁伴噺涓嶈兘澶т簬娆＄牬鏁伴噺',
reworkQuantityCannotBeEmptyOr0:'杩斿伐鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0',
@@ -723,12 +864,15 @@
role:{
+ page:{
+ roleList:'瑙掕壊棣栭〉',
+ },
id:'ID',
characterHomepage:'瑙掕壊棣栭〉',
role:'瑙掕壊',
roleAdd:'瑙掕壊鏂板',
menu:"鑿滃崟 ",
- page:'椤甸潰',
+ page1:'椤甸潰',
permission:'鏉冮檺',
rolePermissions:'瑙掕壊鏉冮檺',
permissionSelection:"鏉冮檺閫夋嫨 ",
@@ -738,10 +882,13 @@
CannotBeEmptyAndTheLengthCannotExceed255:'涓嶈兘涓虹┖涓旈暱搴︿笉鑳借秴杩�255',
},
user:{
+ page:{
+ userList:'鐢ㄦ埛棣栭〉',
+ },
userId:'鐢ㄦ埛ID',
- userHomepage:'鐢ㄦ埛棣栭〉',
user:'鐢ㄦ埛',
setUpRoles:'璁剧疆瑙掕壊',
+ setProcess:'璁剧疆宸ュ簭',
changePassword:'淇敼瀵嗙爜',
OldPassword:'鏃у瘑鐮�',
TheNewPassword:'鏂板瘑鐮�',
@@ -752,12 +899,18 @@
ConfirmPasswordCannotBeEmpty:'纭瀵嗙爜涓嶈兘涓虹┖',
TheTwoPasswordsAreNotTheSame:'涓ゆ瀵嗙爜涓嶇浉鍚�',
OldPasswordError:'鏃у瘑鐮侀敊璇�',
+ roleSelection:'瑙掕壊閫夋嫨',
userName:'鐢ㄦ埛鍚嶇О',
changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'鍩虹绫诲瀷',
+ searchGlassType:'鐜荤拑绫诲埆',
+ },
+ glassCategory:'鐜荤拑绫诲埆',
order:'璁㈠崟',
orderType:'璁㈠崟绫诲瀷',
orderClassify:'璁㈠崟鍒嗙被',
@@ -782,9 +935,7 @@
paymentTerms:'浠樻鏉′欢',
payMethod:'鏀舵鏂瑰紡',
delivery:'閫佽揣',
- basicType:'鍩虹绫诲瀷',
name:'鍚嶇О',
- glassCategory:'鐜荤拑绫诲埆',
level:'绫诲埆绛夌骇',
firstLevel:'涓�绾х被鍒�',
towLevel:'浜岀骇绫诲埆',
@@ -793,8 +944,19 @@
msg2:'涓婁紶鍥剧墖鍙兘鏄� JPG鎴栬�匬NG 鏍煎紡!',
selectFile:'閫夊彇鏂囦欢',
msg3:'鍙兘涓婁紶jpg/png鏂囦欢,涓斾笉瓒呰繃5m',
+ commonProcess:'鏅�氬伐搴�',
+ laminatingProcessA:'澶硅兌鍚庡悎鐗囧伐搴�',
+ laminatingProcessB:'涓┖鍚庡悎鐗囧伐搴�',
+ laminatingProcessC:'澶硅兌宸ュ簭',
+ laminatingProcessD:'涓┖宸ュ簭',
},
machine:{
+ page:{
+ selectMachine:'璁惧绠＄悊',
+ addMachine:"璁惧鏂板",
+ maintenanceAndRepair:"淇濆吇涓庣淮淇�",
+ addMaintenanceAndRepair:"淇濆吇涓庣淮淇柊澧�"
+ },
basicId:'璁惧缂栧彿',
basicName:'璁惧鍚嶇О',
basicCategory:'鎵�鍦ㄥ伐搴�',
@@ -831,6 +993,26 @@
tempering:'閽㈠寲',
},
report:{
+ page:{
+ productionReport:'鐢熶骇鎶ヨ〃',
+ workInProgress:'鍦ㄥ埗鍝佹姤琛�',
+ processToBeCompleted:'宸ュ簭寰呭畬鎴愭姤琛�',
+ productionSchedule:'鐢熶骇鍙戣揣杩涘害鎶ヨ〃',
+ processCardProgress:'娴佺▼鍗¤繘搴︽姤琛�',
+ orderPlanDecomposition:'璁㈠崟璁″垝鍒嗚В鎶ヨ〃',
+ damageReport:'娆＄牬鎶ヨ〃',
+ crossProcessBreaking:'璺ㄥ伐搴忔鐮存姤琛�',
+ teamOutput:'鐝粍浜ч噺鎶ヨ〃',
+ splittingDetailsOutside:'鍒嗘灦鏄庣粏鎶ヨ〃',
+ taskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
+ rawMaterialRequisition:'鍘熺墖棰嗘枡鎶ヨ〃',
+ qualityReport:'鍝佽川鎶ヨ〃',
+ productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
+ yield:'鎴愬搧鐜囨姤琛�',
+ finishedProductReport :'鎴愬搧鎶ヨ〃',
+ orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
+ },
+ teamsGroupsName:'涓婂伐搴忔姤宸�',
productionReport:'鐢熶骇鎶ヨ〃',
workInProgressReport:'鍦ㄥ埗鍝佹姤琛�',
processToBeCompleted:'宸ュ簭寰呭畬鎴愭姤琛�',
@@ -873,19 +1055,30 @@
patchNum :'琛ョ墖鏁伴噺',
finished :'鎴愬搧鐜�',
finishedProductReport :'鎴愬搧鎶ヨ〃',
+ workProcessName:'鍦ㄥ埗鍝佸悕绉�',
},
productionBasicData:{
+ page:{
+ selectProductionBasicData:"鍩虹鏁版嵁鏌ヨ",
+ addBreakageType:"娆＄牬绫诲瀷鏂板",
+ addBreakageReason:"娆＄牬鍘熷洜鏂板",
+ addTeamGroup:"鐝粍鏂板"
+ },
basicDataQuery :'鍩虹鏁版嵁鏌ヨ',
newTypeOfSecondaryDamageAdded :'娆＄牬绫诲瀷鏂板',
reasonForSecondaryFailureAdded :'娆＄牬鍘熷洜鏂板',
- teamAdditionAndAddition :'鐝粍鏂板鏂板',
+ teamAdditionAndAddition :'鐝粍鏂板',
id:'id',
basicName:'绫诲埆',
basicDataEdit:'鍩虹鏁版嵁淇敼',
teamName:'鐝粍鍚嶇О',
processInvolved:'鎵�鍦ㄥ伐搴�',
},
- mainIngredient:{
+ ingredients:{
+ page:{
+ selectIngredients:"鐗╂枡璧勬枡",
+ createIngredients:"鐗╂枡鏂板"
+ },
materialInformation :'鐗╂枡璧勬枡',
materialAddition :'鐗╂枡鏂板',
originalFilm :'鍘熺墖',
@@ -895,8 +1088,18 @@
films :'鑶滅郴',
pleaseEnterData :'璇疯緭鍏ユ暟鎹�',
pleaseEnter :'璇疯緭鍏�',
+ msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
+ unit :'鍗曚綅',
},
- mainIngredientStock:{
+ ingredientsStock:{
+ page:{
+ selectIngredientsStock:"鐗╂枡搴撳瓨",
+ materialOutbound:"鐗╂枡鍑哄簱",
+ returnToStorage:"杩斿簱",
+ selectSurplusMaterials:"浣欐枡绠＄悊",
+ createOutbound:'鐗╂枡鍑哄簱鏂板',
+ returnToStorageCreate:'杩斿簱鏂板'
+ },
materialName :'鐗╂枡鍚嶇О',
producer :'浜у湴',
dateOfManufacture :'鐢熶骇鏃ユ湡',
@@ -940,13 +1143,34 @@
surplusMaterialManagement :'浣欐枡绠＄悊',
additionOfSurplusMaterials :'浣欐枡鏂板',
excessMaterialOutflow :'浣欐枡鍑哄簱',
+ pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷'
},
- mainBasicData:{
+ warehouseBasicData:{
+ page:{
+ warehouseSearchBasicData:"搴撳瓨鍩虹"
+ },
BasicData :'鍩虹鏁版嵁',
operateTypeName :'鍚嶇О',
operateType :'鍒О',
type :'绫诲瀷',
takeOut :'棰嗗嚭',
+ },
+ stockReport:{
+ page:{
+ warehouseReport:"浠撳偍鎶ヨ〃",
+ finishedProductReport:"鎴愬搧鎶ヨ〃",
+ materialReport:"鐗╂枡鎶ヨ〃",
+
+ },
+ finishedProductInventoryReport:"鎴愬搧鍏ュ簱鎶ヨ〃",
+ finishedProductOutboundReport:"鎴愬搧鍑哄簱鎶ヨ〃",
+ finishedProductTransferReport:"鎴愬搧璋冩嫧鎶ヨ〃",
+ finishedProductDeliveryReport:"鎴愬搧棰嗗嚭鎶ヨ〃",
+ materialAdditionReport:"鐗╂枡鏂板鎶ヨ〃",
+ materialOutboundReport:"鐗╂枡鍑哄簱鎶ヨ〃",
+ materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
+ optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
+ optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
},
components:{
addNewSignature :'鏂板鏍囩鍚�',
@@ -996,6 +1220,26 @@
user :'鐢ㄦ埛鍒楄〃',
role :'瑙掕壊鏉冮檺',
userPassWord :'淇敼瀵嗙爜',
+ glassPrice:'鐜荤拑浠锋牸',
+ glassOptimize:'鐜荤拑浼樺寲'
+ },
+
+ glassPrice:{
+ glassPriceComputed:'鐜荤拑鎶ヤ环',
+ priceSet:'浠锋牸璁剧疆',
+ priceList:'浠锋牸鍒楄〃',
+ msg:{
+ error1:'璇烽�夋嫨鍏ㄩ儴鍙傛暟',
+ error2:'姝よ啘绯诲凡缁忓瓨鍦紝璇烽噸鏂伴�夋嫨',
+ success:'鏁版嵁淇濆瓨鎴愬姛',
+ addProduce:'璇峰厛娣诲姞浜у搧'
+ },
+ glass:'鐜荤拑',
+ interlayer:'澶硅兌',
+ hollow:'涓┖',
+ process:'宸ヨ壓',
+ addProduce:'閫夋嫨浜у搧',
+ reorder:'杞鍗�'
}
--
Gitblit v1.8.0