From 9b9fdcb4711279a303cf8da9ce9e3ff30b1bf6e0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 三月 2025 16:45:06 +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 | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 256 insertions(+), 27 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index c608cf8..8c4e6d4 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,15 +87,20 @@
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',
range9999Dec: "Please enter a four digit integer",
+ quantityError: "Quantity Error",
+ dataDoesNotExist: "Data Does Not Exist",
}
},
product:{
- ProductHomePage:'Product home page',
- create:'Creat',
+ page:{
+ selectProduct:'Product home page',
+ createProduct:'Creat',
+ },
coloredGlaze:'Coloured glaze',
frostedSand:'Frosted glass',
coating:'Coating film',
@@ -126,7 +135,7 @@
hollowThickness:'* Hollow thickness',
hollowGasType:'* Inflation mode',
hollowType:'* Sealing compound',
- hollowGlueDepth:'* Default glue depth',
+ hollowGlueDepth:'Default glue depth',
hollow:'Hollow spacer',
hollowUpdate:'Hollow spacers modified',
interlayerThickness:'*Lamination thickness',
@@ -158,8 +167,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',
@@ -205,7 +220,7 @@
areaAmountPerPiece:'Area amount (single piece)',
areaAmountAge:'Area amount (total area)',
errorValue:'Error value',
- orderDetailsSummary:'Order detail summary',
+
details:'Details',
workmanship:'Technology',
processCard:'Flow card',
@@ -230,8 +245,11 @@
sheet3:'View shipping information',
sheet5:'Production and processing of single curved glass (single sheet)',
oneClickStorage:'One-click completion',
+ oneClickReturn:'涓�閿��鍥�',
quantityMount:'Quantity and Amount',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+
msg:{
productCheck:'Please select a product',
tableLengthNot:'No table data',
@@ -256,6 +274,8 @@
calculationAreaPrompt5:'Do you want to continue creating duplicate orders',
pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
+ grossAreaIsNot0:'There is an actual total area equal to0',
+ differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
}
},
@@ -291,6 +311,7 @@
totalArea:'TotalArea',
childWidth:'Child Width',
childHeight:'Child Height',
+ arc:'arc',
area:'Area',
process:'Process',
orderDetail:'Order Detail',
@@ -316,11 +337,15 @@
xMargin:'X axis margin',
yMargin:'Y-axis margin',
location:'Trademark position',
+ sort:'鐜荤拑鍙嶅集'
},
workOrder:{
- workOrder:'Work Order Management',
+ page:{
+ selectWorkOrder:'Work order',
+ addWorkOrder:'Forward production order'
+ },
productionId:'Production Order Number',
convert:'Convert',
unConverted:'UnConverted',
@@ -328,9 +353,22 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
+ msg:'Please select all data',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
+ page:{
+ selectProcessCard:'Process Card',
+ selectAddProcess:'Rack Allocation',
+ productionScheduling:'Production Scheduling',
+ selectPrintProject:'Engineering Printing',
+ selectPrintFlowCard:"print",
+ splittingDetails:"Frame query",
+ addProcessCard:"Split-frame addition",
+ printFlowCard:"Process card printing",
+ selectDetailProcessCard:"Process card details query"
+ },
processId:'Process Card Number',
founder:'Divider',
layoutStatus:'Type Setting',
@@ -344,6 +382,7 @@
weight:'Weight',
selectedQuantity:'Select Quantity',
establishProcessCards:'Add',
+ createBySequenceNumber:'By Sequence Number',
return:'Return',
ProductionSchedulingOk:'Scheduled Production',
ProductionSchedulingNo:'Unscheduled Production',
@@ -377,6 +416,7 @@
composingOk:'Can Be Typesetter',
composingNo:'Non Typesetting',
typesetter:'typesetter',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'Scheduled Start Time',
planEndTime:'Plan End Time',
customerId:'Customer Id',
@@ -398,9 +438,12 @@
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',
+ notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
landingSequence:'Landing sequence',
labelStyle:'Label Style',
+ detailPrinting:'Detail Printing',
+ detailsPrintedSeparately:'Details Printed Separately',
customLabelPrinting:'Custom label printing',
labelPrinting:'Lable Printing',
sortingSuccessful:'Sorting successful',
@@ -415,10 +458,27 @@
mergePrinting:'Merge printing',
printStatus:'Print times',
labelPrinting2:'Label printing 2',
+ finishedProductPrinting2:'Finished Product Printing2',
+ editablePrinting:'Editable Printing',
+ invertSelection:'Invert Selection',
+ sortSummary:'Sort Summary',
addAutomatically:'Auto fill',
- selectFill:'Selected fill'
+ selectFill:'Selected fill',
+ engineeringPrinting:'Engineering Printing',
+ pleaseSelectProject:'Please Select Project',
+
+
+ mergeState:'Merge State',
+ merge:'Merge',
+ printQuantity:'Print Quantity',
+ printWarn1:'The print quantity cannot be greater than the order quantity'
},
reportingWorks:{
+ page:{
+ selectReportingWorks:"Work Reporting Management",
+ addReportingWork:"New Work Reporting",
+ qualityInspectionReview:"Quality Inspection Review",
+ },
glassNumber:'Code',
glassAddress:'Glass Address',
WorkReportingManagement:'Work Reporting Management ',
@@ -491,7 +551,7 @@
thisCompletedQuantity:'This Completed Quantity',
thisWornQuantity:'This Worn Quantity',
passAudit:'Pass The Audit',
-
+ patchCondition:'Patch Condition',
selectResponsibleTeam:'Please select a responsible team',
selectWorkReportingTeam:'Please select a responsible team',
@@ -518,10 +578,20 @@
pleaseNumber7:'The quantity cannot be greater than the quantity of the previous process',
pleaseNumber8:'Please enter serial number',
pleaseNumber9:'Correct number of completions or breakdowns',
+ pleaseNumber10:'The number of completions cannot be greater than the number of process cards',
},
-
productStock:{
+ page:{
+ productStockList:"Stock Inquiry",
+ createProductStock:"Finished product Into Stock",
+ storageRecord:"Entry and exit records",
+ orderAllocation:'Order Allocation',
+ finishedProductOut:'Finished Product Out Of Stock',
+ finishedGoodsIssue:'Finished Goods Delivery',
+ transferRecord:'Mutual Exchange Records',
+ takeOutRecord:'Take Out Records'
+ },
inventoryQuery:'Stock Inquiry',
finishedProductWarehousing:"Finished product Into Stock ",
finishedProductOutbound:'Finished Product Out Of Stock',
@@ -597,7 +667,6 @@
singlePieceArea:'Single Piece Area',
perimeter:'Perimeter',
returnToWarehouse:'Return To Warehouse',
-
entryFailure:'Put in storage failure',
entry:'Put in storage',
failedToRetrieve:'Take out failure',
@@ -611,10 +680,19 @@
staterOperationOrderNumber:'Transfer the sales order number',
endOperationOrderNumber:'Transfer sequence number',
typeClaim:'Take out type',
+ pleaseEnterTheBoxNumber:'Please enter the box number',
-
+ boxNumber:'Case number',
+ msg1:'The invoice is out of the warehouse. Please refresh the interface',
+ msg2:'Invoice inventory number does not exist',
+ msg3:'The quantity of incoming orders shall not exceed the total number of orders'
},
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',
@@ -628,8 +706,6 @@
telephone:"Telephone ",
customerNumber:'Customer Id',
customerName:"Customer",
- customerHomePage:'Customer Homepage',
- increaseCustomers:'Increase Customers',
resetting:'Revoke',
customerOrders:'Customer order',
orderAmount:'Order amount',
@@ -638,13 +714,22 @@
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',
produce:'Produce',
traveler:'Traveler',
warehousing:'Warehousing',
- unpaidQuantity:"Unpaid Quantity ",
+ unpaidQuantity:"Quantity not shipped",
availableStock:'Available Stock',
deliveryQuantity:'Delivery Quantity',
pleaseEnterTheAmountOfFunds:'Please enter the project name',
@@ -662,22 +747,28 @@
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',
money:'Amount',
pleaseSelectTheSameCustomerProject:'Please select the project for the same customer',
+ noMoney:'No money',
+ freightPrice:'Freight Price',
+ freightQuantity:'Freight Quantity',
+ freight:'Freight Money',
+ pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
},
replenish:{
+ page:{
+ selectReplenish:"Patch Management",
+ addReplenish:"Add Patches",
+ printReplenishFlowCard:"Print Patches"
+ },
patchManagement:'Patch Management',
addPatches:"Add Patches ",
printPatches:'Print Patches',
@@ -687,6 +778,11 @@
},
rework:{
+ page:{
+ selectRework:"Rework Management",
+ addRework:"Add Rework",
+ printReworkFlowCard:"Print Rework"
+ },
reworkManagement:'Rework Management',
addRework:"Add Rework ",
printRework:'Print Rework',
@@ -696,6 +792,7 @@
reworkProcess:'Rework Process',
reworkType:'Rework Type',
reworkArea:'Rework Area',
+ responsibilityInformation:'responsibility Information',
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',
@@ -703,12 +800,15 @@
role:{
+ page:{
+ roleList:'Role Home',
+ },
id:'ID',
characterHomepage:'Role Home',
role:'Character',
roleAdd:'Role addition',
menu:'Menu',
- page:'Page',
+ page1:'Page',
permission:'Limits of authority',
rolePermissions:'Role authority',
permissionSelection:'Permission selection',
@@ -718,8 +818,10 @@
CannotBeEmptyAndTheLengthCannotExceed255:'The value cannot be empty and cannot exceed 255 characters',
},
user:{
+ page:{
+ userList:'User home page',
+ },
userId:'User ID',
- userHomepage:'User home page',
user:'User',
setUpRoles:'Set a role',
changePassword:'Change password',
@@ -732,12 +834,18 @@
ConfirmPasswordCannotBeEmpty:'Confirm that the password cannot be empty',
TheTwoPasswordsAreNotTheSame:'Two different passwords',
OldPasswordError:'Old password error',
+ roleSelection:'Role Selection',
userName:'User name',
changeUserName:'Modifying a user name',
userNameCannotBeEmpty:'The user name cannot be empty',
},
orderBasicData:{
+ page:{
+ searchOrderBasicData:'Base type',
+ searchGlassType:'Type of glass',
+ },
+ glassCategory:'Type of glass',
order:'Order',
orderType:'Order type',
orderClassify:'Order classification',
@@ -762,9 +870,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',
@@ -773,8 +879,16 @@
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',
+ commonProcess:'鏅�氬伐搴�',
+ laminatingProcess:'鍚堢墖宸ュ簭',
},
machine:{
+ page:{
+ selectMachine:'Equipment management',
+ addMachine:"Device addition",
+ maintenanceAndRepair:"Maintenance and repair",
+ addMaintenanceAndRepair:"Maintenance and repair added"
+ },
basicId:'Equipment number',
basicName:'Device name',
basicCategory:'Working procedure',
@@ -811,6 +925,24 @@
tempering:'Tempering',
},
report:{
+ page:{
+ productionReport:'Production report',
+ workInProgress:'Product in process report',
+ processToBeCompleted:'Process to be completed report',
+ productionSchedule:'Production and delivery progress report',
+ processCardProgress:'Flow card progress report',
+ orderPlanDecomposition:'Flow card progress report',
+ damageReport:'Breakage statement',
+ crossProcessBreaking:'Cross process breakage report',
+ teamOutput:'Team production report',
+ splittingDetailsOutside:'Separate frame detail report',
+ taskCompletionStatus:'Task completion report',
+ rawMaterialRequisition:'Raw material requisition report',
+ qualityReport:'Quality statement',
+ productionScheduling:'Production scheduling report',
+ yield:'Yield report',
+ finishedProductReport :'Finished product report',
+ },
productionReport:'Production report',
workInProgressReport:'Product in process report',
processToBeCompleted:'Process to be completed report',
@@ -827,7 +959,7 @@
productionScheduling:'Production scheduling report',
yieldReport:'Yield report',
workingProcedure:'Process',
- inventoryArea:'Stock area',
+ inventoryArea:'Stock area锛坢虏锛�',
pleaseSelectADateFirst:'Please select the date first',
pleaseSelectAProcessFirst:'Please select the process first',
theFilteringTimeForExportCannotExceed180Days:'The export filtering period cannot exceed 180 days',
@@ -855,6 +987,12 @@
finishedProductReport :'Finished product report',
},
productionBasicData:{
+ page:{
+ selectProductionBasicData:"Basic data query",
+ addBreakageType:"New secondary break type",
+ addBreakageReason:"Secondary failure cause added",
+ addTeamGroup:"Group Added Added"
+ },
basicDataQuery :'Basic data query',
newTypeOfSecondaryDamageAdded :'New secondary break type',
reasonForSecondaryFailureAdded :'Secondary failure cause added',
@@ -865,7 +1003,11 @@
teamName:'Squad name',
processInvolved:'Working procedure',
},
- mainIngredient:{
+ ingredients:{
+ page:{
+ selectIngredients:"Material data",
+ createIngredients:"Material addition"
+ },
materialInformation :'Material data',
materialAddition :'Material addition',
originalFilm :'Original glass',
@@ -875,8 +1017,18 @@
films :'Coating Type',
pleaseEnterData :'Please enter data',
pleaseEnter :'Please enter',
+ msg1 :'This material is already in stock and cannot be deleted',
+ unit :'unit',
},
- mainIngredientStock:{
+ ingredientsStock:{
+ page:{
+ selectIngredientsStock:"Material inventory",
+ materialOutbound:"Material delivery",
+ returnToStorage:"Return to the warehouse",
+ selectSurplusMaterials:"Waste material management",
+ createOutbound:'New material delivery',
+ returnToStorageCreate:'Returned warehouse addition'
+ },
materialName :'Material name',
producer :'Place of origin',
dateOfManufacture :'Production date',
@@ -916,13 +1068,36 @@
returnQuantity :'Quantity returned to storage',
materialReturnType :'Material return type',
createTime :'Returned warehouse date',
+
+ surplusMaterialManagement :'Waste material management',
+ additionOfSurplusMaterials :'Surplus addition',
+ excessMaterialOutflow :'Residual materials out of storage',
+ pleaseSelectTheTypeOfReturnToStock:'Please select a return type'
},
- mainBasicData:{
+ warehouseBasicData:{
+ page:{
+ warehouseSearchBasicData:"Warehouse Basic Data"
+ },
BasicData :'Basic data',
operateTypeName :'Name',
operateType :'Another name',
type :'Type',
takeOut :'Take out',
+ },
+ stockReport:{
+ page:{
+ warehouseReport:"Warehouse Basic Data",
+ finishedProductReport:"Finished product report",
+ materialReport:"Material statement",
+
+ },
+ finishedProductInventoryReport:"Finished product receipt report",
+ finishedProductOutboundReport:"Finished product delivery report",
+ finishedProductTransferReport:"Finished product transfer report",
+ finishedProductDeliveryReport:"Finished product take-out report",
+ materialAdditionReport:"Material addition report",
+ materialOutboundReport:"Material delivery report",
+ materialReturnReport:"Material return report",
},
components:{
addNewSignature :'Add label name',
@@ -937,6 +1112,60 @@
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',
+ glassPrice:'Glass Price'
+ },
+
+ glassPrice:{
+ glassPriceComputed:'Glass quotation',
+ priceSet:'Price setting',
+ priceList:'Price list',
+ msg:{
+ error1:'Please select all parameters',
+ error2:'This membrane system already exists, please re-select',
+ success:'Data saved successfully',
+ addProduce:'Please add the product first'
+ },
+ glass:'glass',
+ interlayer:'gum',
+ hollow:'hollow',
+ process:'process',
+ addProduce:'Select product',
+ reorder:'reorder'
}
--
Gitblit v1.8.0