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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index c8fcf3e..29b8374 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -64,6 +64,10 @@
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:
@@ -83,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',
@@ -292,6 +297,7 @@
totalArea:'TotalArea',
childWidth:'Child Width',
childHeight:'Child Height',
+ arc:'arc',
area:'Area',
process:'Process',
orderDetail:'Order Detail',
@@ -329,6 +335,7 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
+ msg:'Please select all data'
},
processCard:{
@@ -418,7 +425,7 @@
labelPrinting2:'Label printing 2',
addAutomatically:'Auto fill',
selectFill:'Selected fill',
- engineeringPrinting:'宸ョ▼鎵撳嵃'
+ engineeringPrinting:'Engineering Printing'
},
reportingWorks:{
glassNumber:'Code',
@@ -614,7 +621,7 @@
endOperationOrderNumber:'Transfer sequence number',
typeClaim:'Take out type',
- pleaseEnterTheBoxNumber:'璇疯緭鍏ョ鍙�',
+ pleaseEnterTheBoxNumber:'Please enter the box number',
},
@@ -679,10 +686,12 @@
money:'Amount',
pleaseSelectTheSameCustomerProject:'Please select the project for the same customer',
- noMoney:'鏃犻噾棰�',
- freightPrice:'杩愯垂鍗曚环',
- freightQuantity:'杩愯垂鏁伴噺',
- freight:'杩愯垂閲戦',
+ noMoney:'No money',
+ freightPrice:'Freight Price',
+ freightQuantity:'Freight Quantity',
+ freight:'Freight Money',
+
+ pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
},
replenish:{
@@ -945,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