From 896424535eedd5da407d2e1d58bda8e1ea588145 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 26 九月 2024 12:35:05 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/en.js | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 5ddeb30..1460f89 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -95,8 +95,10 @@
}
},
product:{
- ProductHomePage:'Product home page',
- create:'Creat',
+ page:{
+ selectProduct:'Product home page',
+ createProduct:'Creat',
+ },
coloredGlaze:'Coloured glaze',
frostedSand:'Frosted glass',
coating:'Coating film',
@@ -163,8 +165,14 @@
}
},
order:{
- orderHomePage:'Order Home Page',
- orderReport:'Order Detail Report',
+ page:{
+ selectOrder:'Order Home Page',
+ createOrder:'Create',
+ orderReport:'Order Detail Report',
+ orderSummaryReport:'Order Summary Report',
+ orderDetailsSummary:'Order Detail Summary',
+ updateOrderCraft:'Update Order Craft'
+ },
project:'Project',
orderId:'Order ID',
money:'Total Amount',
@@ -210,7 +218,6 @@
areaAmountPerPiece:'Area amount (single piece)',
areaAmountAge:'Area amount (total area)',
errorValue:'Error value',
- orderDetailsSummary:'Order detail summary',
details:'Details',
workmanship:'Technology',
processCard:'Flow card',
@@ -626,6 +633,11 @@
},
customer:{
+ page:{
+ selectCustomer:'Customer Homepage',
+ createCustomer:'Increase Customers',
+ selectCustomerOrder:'Customer Order'
+ },
pleaseEnterTheCustomerName:'Please enter the customer name',
pleaseEnterCustomerLevel:"Please enter customer level ",
pleaseEnterTheAmountOfFunds:'Please enter the amount of funds',
@@ -639,8 +651,6 @@
telephone:"Telephone ",
customerNumber:'Customer Id',
customerName:"Customer",
- customerHomePage:'Customer Homepage',
- increaseCustomers:'Increase Customers',
resetting:'Revoke',
customerOrders:'Customer order',
orderAmount:'Order amount',
@@ -649,6 +659,15 @@
pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
},
delivery:{
+ page:{
+ selectDelivery:'Shipping Homepage',
+ selectOrderList:"Order Shipment",
+ shipmentDetailsReport:"Delivery detail report ",
+ shipmentProductClassificationReport:"Category report of shipped products ",
+ createDelivery:'Create delivery',
+ deliveryReport:'Delivery report',
+
+ },
delivery:'Delivery',
place :'Place',
technology:'Technology',
@@ -673,13 +692,9 @@
shippingAddress:'Shipping Address',
deliveryReportDate:'Delivery Report Date',
shipper:"Shipper ",
- shippingHomepage:'Shipping Homepage',
- orderShipment:"Order Shipment ",
deliveryNoteId:'Delivery Note Id',
deliveryNoteNumber:'Delivery Note Number',
deliveryDate:"Delivery Date ",
- shipmentDetailsReport:"Delivery detail report ",
- shipmentProductClassificationReport:"Category report of shipped products ",
contacts:'Contact person',
contactNumber:'Contact number',
salesman:'Salesman',
@@ -755,6 +770,10 @@
userNameCannotBeEmpty:'The user name cannot be empty',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'Base type',
+ searchGlassType:'Type of glass',
+ },
order:'Order',
orderType:'Order type',
orderClassify:'Order classification',
@@ -779,9 +798,7 @@
paymentTerms:'Payment terms',
payMethod:'Payment method',
delivery:'Deliver goods',
- basicType:'Base type',
name:'Name',
- glassCategory:'Type of glass',
level:'Class level',
firstLevel:'Primary class',
towLevel:'Secondary class',
--
Gitblit v1.8.0