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 | 15 +++++++++------
1 files changed, 9 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 2c993d2..29b8374 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -87,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',
@@ -296,6 +297,7 @@
totalArea:'TotalArea',
childWidth:'Child Width',
childHeight:'Child Height',
+ arc:'arc',
area:'Area',
process:'Process',
orderDetail:'Order Detail',
@@ -333,6 +335,7 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
+ msg:'Please select all data'
},
processCard:{
@@ -954,16 +957,16 @@
},
menu:{
- salesAndDistribution :'Sales and Distribution',
- productionPlanning :'Production Planning',
- materialManage :'Material Manage',
- userManage :'User Manage',
+ "1" :'Sales and Distribution',
+ "2" :'Production Planning',
+ "3" :'Material Manage',
+ "4" :'User Manage',
product :'Product',
order :'Order',
delivery :'Delivery',
returns :'Returns',
- customer :'Customer',
+ Customer :'Customer',
workOrder :'Work Order',
processCard :'Process Card',
reportingWorks :'Report for work',
@@ -972,7 +975,7 @@
machine :'Machine',
bOM :'BOM',
report :'Report',
- productStock :'Product Stock',
+ ProductStock :'Product Stock',
ingredientsStock :'Ingredients Stock',
ingredients :'Ingredients',
trader :'Trader',
--
Gitblit v1.8.0