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/zh.js | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index eaa5641..9130aed 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -87,6 +87,7 @@
deleteSuccess:'鍒犻櫎鎴愬姛',
deleteFail:'鍒犻櫎澶辫触',
cancelReviewFail:'鍙嶅澶辫触',
+ cancelReviewFailWork:'鍙嶅澶辫触,璇锋鏌ユ槸鍚︽姤宸�',
reviewFail:'瀹℃牳澶辫触',
noProductDataInTheTable:'琛ㄦ牸涓棤浜у搧鏁版嵁',
tableDataExceedsMaximumLimit:'琛ㄦ牸鏁版嵁瓒呰繃鏈�澶ч檺鍒�',
@@ -334,7 +335,8 @@
deleteOk:'鍒犻櫎鎴愬姛',
transferOrder:'杞伐鍗�',
perimeter:'鍛ㄩ暱',
- deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦'
+ deleteNo:'鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦',
+ msg:'璇烽�夋嫨鎵�鏈夋暟鎹�'
},
processCard:{
@@ -424,7 +426,9 @@
labelPrinting2:'鏍囩鎵撳嵃2',
addAutomatically:'鑷姩濉厖',
selectFill:'閫変腑濉厖',
- engineeringPrinting:'宸ョ▼鎵撳嵃'
+ engineeringPrinting:'宸ョ▼鎵撳嵃',
+
+ mergeState:'鍚堝苟鐘舵��',
},
reportingWorks:{
glassNumber:'缂栧彿',
--
Gitblit v1.8.0