From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index f389899..29b8374 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -57,10 +57,25 @@
print:'Print',
export:'Derive',
empty:'Clear',
+
+ incrementalAll:'Increase successively after selecting',
+ incrementalChecked:'Selected and increased successively',
+ true:'Yes',
+ false:'No',
+ computedSize:'Scientific counting',
+ paste:'Paste',
+
+ selected:'selected',
+ partiallySelected:'partially selected',
+ unchecked :'unchecked',
msg:{
max255:"The value contains a maximum of 255 characters",
range99999Dec2:
"Please enter a number between 0 and 99999 with a maximum of two decimals",
+ range99999Dec3:
+ "Please enter a number between 0 and 99999 with a maximum of three decimals",
+ range999999Dec2:
+ "Please enter a number between 0 and 999999 with a maximum of two decimals",
greater0:"Please enter an integer greater than 0",
checkoutLose:'Check fail',
saveSuccess:'save successfully',
@@ -72,6 +87,7 @@
deleteSuccess:'Deletion success',
deleteFail:'Deletion failure',
cancelReviewFail:'Review failure',
+ cancelReviewFailWork:'Counter-audit failed please check whether to report',
reviewFail:'Audit failure',
noProductDataInTheTable:'There is no product data in the table',
tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
@@ -143,6 +159,7 @@
theProductHasBeenReviewedAndCannotBeDeleted:'The product has been reviewed and cannot be removed',
productAbbreviation:'Product abbreviation',
+ productDuplication:'Product repetition',
}
},
order:{
@@ -208,6 +225,18 @@
orderDetailsSummaryReport:'Order details summary report',
buildingNumber:'Floor number',
saveHeader:'Save header',
+
+ orderNotApproved:'Order not reviewed',
+ orderHasBeenReceived:'The order is in stock',
+ printingNumber:'Print times',
+ processingOrder:'Processing sheet',
+ sheet2:'Horizontal - multi-layer details',
+ sheet4:'Production and processing of single vertical plate',
+ sheet3:'View shipping information',
+ sheet5:'Production and processing of single curved glass (single sheet)',
+ oneClickStorage:'One-click completion',
+
+ quantityMount:'Quantity and Amount',
msg:{
productCheck:'Please select a product',
tableLengthNot:'No table data',
@@ -230,6 +259,9 @@
calculationAreaPrompt4:'Calculate',
warning:'Tips',
calculationAreaPrompt5:'Do you want to continue creating duplicate orders',
+
+ pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
+ grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
}
},
@@ -265,6 +297,7 @@
totalArea:'TotalArea',
childWidth:'Child Width',
childHeight:'Child Height',
+ arc:'arc',
area:'Area',
process:'Process',
orderDetail:'Order Detail',
@@ -302,6 +335,7 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
+ msg:'Please select all data'
},
processCard:{
@@ -372,9 +406,11 @@
deleteNo:'Failed to delete Check whether the flow card has been reported (feedback)',
deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
pleaseCheckTheRequiredData:'Please check the required data',
+ landingSequence:'Landing sequence',
labelStyle:'Label Style',
customLabelPrinting:'Custom label printing',
+ labelPrinting:'Lable Printing',
sortingSuccessful:'Sorting successful',
sorting:'Sorting',
pleaseSelect:'Please select',
@@ -382,12 +418,17 @@
thisIsTheIndoorSurface:'This is the indoor surface',
thisSideIsOutsideTheRoom:'This side is outside the room',
finishedProductLabel:'Finished product label',
- halfProductLabel:'Half product label',
+ halfProductLabel:'Half-finished product label',
pleaseSelectCustomPrintLabelStyle:'Please select a custom print label style',
mergePrinting:'Merge printing',
+ printStatus:'Print times',
+ labelPrinting2:'Label printing 2',
+ addAutomatically:'Auto fill',
+ selectFill:'Selected fill',
+ engineeringPrinting:'Engineering Printing'
},
reportingWorks:{
- glassNumber:'number',
+ glassNumber:'Code',
glassAddress:'Glass Address',
WorkReportingManagement:'Work Reporting Management ',
addReportingWorks:'New Work Reporting',
@@ -580,6 +621,8 @@
endOperationOrderNumber:'Transfer sequence number',
typeClaim:'Take out type',
+ pleaseEnterTheBoxNumber:'Please enter the box number',
+
},
customer:{
@@ -642,6 +685,14 @@
salesman:'Salesman',
money:'Amount',
+ pleaseSelectTheSameCustomerProject:'Please select the project for the same customer',
+ noMoney:'No money',
+ freightPrice:'Freight Price',
+ freightQuantity:'Freight Quantity',
+ freight:'Freight Money',
+
+ pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
+
},
replenish:{
patchManagement:'Patch Management',
@@ -698,6 +749,10 @@
ConfirmPasswordCannotBeEmpty:'Confirm that the password cannot be empty',
TheTwoPasswordsAreNotTheSame:'Two different passwords',
OldPasswordError:'Old password error',
+
+ userName:'User name',
+ changeUserName:'Modifying a user name',
+ userNameCannotBeEmpty:'The user name cannot be empty',
},
orderBasicData:{
order:'Order',
@@ -731,6 +786,10 @@
firstLevel:'Primary class',
towLevel:'Secondary class',
alias:'alias',
+ msg1:'Upload picture size can not exceed 5MB!',
+ msg2:'Upload picture can only be JPG or PNG format!',
+ selectFile:'Selecting file',
+ msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
},
machine:{
basicId:'Equipment number',
@@ -782,6 +841,7 @@
TaskCompletionStatus:'Task completion report',
rawMaterialRequisition:'Raw material requisition report',
qualityReport:'Quality statement',
+ productionScheduling:'Production scheduling report',
yieldReport:'Yield report',
workingProcedure:'Process',
inventoryArea:'Stock area',
@@ -894,6 +954,41 @@
inconsistentParameters :'The required parameters are inconsistent',
strip :'Piece',
exportSelected :'Export selected',
+ },
+
+ menu:{
+ "1" :'Sales and Distribution',
+ "2" :'Production Planning',
+ "3" :'Material Manage',
+ "4" :'User Manage',
+
+ product :'Product',
+ order :'Order',
+ delivery :'Delivery',
+ returns :'Returns',
+ Customer :'Customer',
+ workOrder :'Work Order',
+ processCard :'Process Card',
+ reportingWorks :'Report for work',
+ rework :'Rework',
+ replenish :'Replenish',
+ machine :'Machine',
+ bOM :'BOM',
+ report :'Report',
+ ProductStock :'Product Stock',
+ ingredientsStock :'Ingredients Stock',
+ ingredients :'Ingredients',
+ trader :'Trader',
+ stockReport :'Stock Report',
+ purchaseOrder :'Purchase Order',
+ purchaseStorage :'Purchase Storage',
+ purchaseReturn :'Purchase Return',
+ orderBasicData :'Order Basic Data',
+ productionBasicData :'Production Basic Data',
+ warehouseBasicData :'Warehouse Basic Data',
+ user :'User',
+ role :'Role',
+ userPassWord :'User Pass Word',
}
--
Gitblit v1.8.0