From bf90cf8568301edb38920e8b0a0ce7e137a668ef Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 21 八月 2025 09:51: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 | 6 ++++--
1 files changed, 4 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 cbfee4b..20f4b41 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -321,7 +321,8 @@
glassQuantity:'灏忕墖鏁伴噺',
merge:'瀹屾暣妯″紡',
layer:'鍗曠墖妯″紡',
- notFinish:'寰呭畬鎴�'
+ notFinish:'寰呭畬鎴�',
+ processCardCollect:'娴佺▼鍗℃眹鎬�',
},
searchOrder:{
@@ -675,6 +676,7 @@
pleaseNumber12:'鏈伐搴忔姤宸ユ暟:',
pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
+ pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
},
productStock:{
page:{
@@ -827,7 +829,7 @@
produce:'鐢熶骇',
traveler:'娴佺▼鍗�',
warehousing:'鍏ュ簱',
- unpaidQuantity:"鏈彂鏁伴噺 ",
+ unpaidQuantity:"璁㈠崟鏈彂鏁伴噺 ",
availableStock:'鍙敤搴撳瓨',
deliveryQuantity:'鍙戣揣鏁伴噺',
pleaseEnterTheAmountOfFunds:'璇疯緭鍏ラ」鐩悕绉�',
--
Gitblit v1.8.0