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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 83739d2..8c4e6d4 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -245,8 +245,10 @@
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',
@@ -335,6 +337,7 @@
xMargin:'X axis margin',
yMargin:'Y-axis margin',
location:'Trademark position',
+ sort:'鐜荤拑鍙嶅集'
},
@@ -350,7 +353,8 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
- msg:'Please select all data'
+ msg:'Please select all data',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
@@ -412,6 +416,7 @@
composingOk:'Can Be Typesetter',
composingNo:'Non Typesetting',
typesetter:'typesetter',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'Scheduled Start Time',
planEndTime:'Plan End Time',
customerId:'Customer Id',
@@ -433,6 +438,7 @@
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',
--
Gitblit v1.8.0