From 21eed4f6a8065bb59d0aaf7481dfe145dba74f2a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 09:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 98 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 2a95ce8..9844d84 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -69,6 +69,13 @@
partiallySelected:'partially selected',
unchecked :'unchecked',
copy:'Copy',
+
+ orderRemarks:'璁㈠崟澶囨敞',
+ filmNumber:'浜у搧澶囨敞',
+ remarks1:'澶囨敞1',
+ remarks2:'澶囨敞2',
+ remarks3:'澶囨敞3',
+ remarks4:'澶囨敞4',
msg:{
max255:"The value contains a maximum of 255 characters",
max10:"鏈�澶氳緭鍏�10涓瓧绗�",
@@ -96,7 +103,10 @@
range9999Dec: "Please enter a four digit integer",
quantityError: "Quantity Error",
dataDoesNotExist: "Data Does Not Exist",
- greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�"
+ greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+ greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+ notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+ notUpdate:"鍙傛暟鏈慨鏀�",
}
},
product:{
@@ -167,6 +177,8 @@
productAbbreviation:'Product abbreviation',
productDuplication:'Product repetition',
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
@@ -272,6 +284,17 @@
surtax:'闄勫姞绋�',
valueAddedTax:'澧炲�肩◣',
cuttingTransport:'杩愯緭娑堝噺',
+ colourCeramicGlaze:'褰╅噳鍥惧彿',
+ transferPage:{
+ oldOrderId:'鍘熻鍗曞彿',
+ newOrderId:'鏂拌鍗曞彿',
+ oldOrderNumber:'鍘熻鍗曞簭鍙�',
+ newOrderNumber:'鏂拌鍗曞簭鍙�',
+ confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+ errorToMes:'涓巑es閫氳寮傚父'
+
+ },
+
msg:{
productCheck:'Please select a product',
tableLengthNot:'No table data',
@@ -305,7 +328,6 @@
updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
-
},
preciseMode:'绮剧‘妯″紡',
ambiguityModels:'妯＄硦妯″紡',
@@ -417,6 +439,8 @@
printFlowCard:"Process card printing",
selectDetailProcessCard:"Process card details query"
},
+ yesTitle:'鏈夋爣棰樻墦鍗�',
+ noTitle:'鏃犳爣棰樻墦鍗�',
buildingNumber:'妤煎彿',
longSide:'闀胯竟',
shortSide:'鐭竟',
@@ -449,6 +473,7 @@
reviewedState:'Review Status',
reviewed:'Reviewer',
schedulingId:'Production Scheduling Number',
+ notes:'袩褉懈屑械褔邪薪懈褟',
scheduling:'Production Scheduling',
schedulingOk:'Please select the data on the right first',
schedulingNo:'Please enter a positive integer',
@@ -519,8 +544,6 @@
selectFill:'Selected fill',
engineeringPrinting:'Engineering Printing',
pleaseSelectProject:'Please Select Project',
-
-
mergeState:'Merge State',
merge:'Merge',
printQuantity:'Print Quantity',
@@ -553,7 +576,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:{
@@ -561,6 +600,9 @@
addReportingWork:"New Work Reporting",
qualityInspectionReview:"Quality Inspection Review",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'Code',
glassAddress:'Glass Address',
WorkReportingManagement:'Work Reporting Management ',
@@ -638,7 +680,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'Please select a responsible team',
selectWorkReportingTeam:'Please select a responsible team',
successfulModificationOfWorkApplication:'Report modification succeeded',
@@ -670,6 +712,17 @@
pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
+
+ pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+ woodenBox:'鏈ㄧ:',
+ brandreth:'閾佹灦',
+ tilting:'鍊掓灦',
+ secondaryBreakage:'搴忓彿娆＄牬鐩稿悓',
+ checkedBreakage:'閫変腑娆＄牬鐩稿悓',
+ unreviewed:'鏈鏍�',
+ notunreviewed:'瀹℃牳鏈�氳繃',
+ notQualified:'鏃犻渶璐ㄦ',
},
productStock:{
page:{
@@ -780,6 +833,8 @@
packing:'瑁呯璋冩灦',
msgPacking:'瑁呯璋冩灦鎴愬姛',
boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+ msg4:'鍙戣揣鍗曞凡鍒涘缓',
+ msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
},
customer:{
page:{
@@ -818,7 +873,6 @@
shipmentProductClassificationReport:"Category report of shipped products ",
createDelivery:'Create delivery',
deliveryReport:'Delivery report',
-
},
delivery:'Delivery',
place :'Place',
@@ -858,6 +912,8 @@
freightQuantity:'Freight Quantity',
freight:'Freight Money',
pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
+ print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+ print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
},
replenish:{
@@ -866,6 +922,7 @@
addReplenish:"Add Patches",
printReplenishFlowCard:"Print Patches"
},
+
patchManagement:'Patch Management',
addPatches:"Add Patches ",
printPatches:'Print Patches',
@@ -875,6 +932,7 @@
printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
labelTemplate:'鏍囩妯℃澘锛�',
listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
+
},
rework:{
page:{
@@ -895,6 +953,7 @@
PleaseSelectAReworkTeam:'Please select a rework team',
TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'The rework quantity cannot be greater than the second break quantity',
reworkQuantityCannotBeEmptyOr0:'Rework quantity cannot be empty or 0',
+ msg1:'璇峰～鍏ラ渶瑕佸悎骞剁殑灞�',
},
@@ -923,6 +982,7 @@
userId:'User ID',
user:'User',
setUpRoles:'Set a role',
+ setProcess:'璁剧疆宸ュ簭',
changePassword:'Change password',
OldPassword:'Old password',
TheNewPassword:'New password',
@@ -1046,7 +1106,10 @@
finishedProductReport :'Finished product report',
orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
},
+ allProcess:'鍏ㄩ儴',
teamsGroupsName:'涓婂伐搴忔姤宸�',
+ WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+ processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
productionReport:'Production report',
workInProgressReport:'Product in process report',
processToBeCompleted:'Process to be completed report',
@@ -1062,11 +1125,13 @@
qualityReport:'Quality statement',
productionScheduling:'Production scheduling report',
yieldReport:'Yield report',
+ yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
workingProcedure:'Process',
inventoryArea:'Stock area锛坢虏锛�',
pleaseSelectADateFirst:'Please select the date first',
pleaseSelectAProcessFirst:'Please select the process first',
theFilteringTimeForExportCannotExceed180Days:'The export filtering period cannot exceed 180 days',
+ theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
orderTime :'Order time',
deliveryDate:'Delivery date',
completedQuantity:'Quantity completed',
@@ -1091,7 +1156,9 @@
finishedProductReport :'Finished product report',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
+
},
productionBasicData:{
page:{
@@ -1126,6 +1193,7 @@
pleaseEnter :'Please enter',
msg1 :'This material is already in stock and cannot be deleted',
unit :'unit',
+ msg2 :'璇ョ墿鏂欏凡瀛樺湪',
},
ingredientsStock:{
page:{
@@ -1180,7 +1248,10 @@
additionOfSurplusMaterials :'Surplus addition',
excessMaterialOutflow :'Residual materials out of storage',
pleaseSelectTheTypeOfReturnToStock:'Please select a return type',
- pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�'
+ pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+ msg1:'搴撳瓨瀛樺湪澶氭潯',
+ msg2:'鏁伴噺涓嶅璇锋鏌�',
+ msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
},
warehouseBasicData:{
page:{
@@ -1318,6 +1389,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