From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/lang/ar.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index 97899b5..9fec150 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -364,7 +364,8 @@
isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
- BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+ BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+ filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
},
updateOrderId:"淇敼璁㈠崟鍙�",
reportingTransfer:'鎶ュ伐杞Щ'
@@ -576,7 +577,8 @@
mainHeight:'楂樺',
terminationQuantity:'鐢熶骇缁堟鏁伴噺',
terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
- maxCompleted:'鏈�澶у凡瀹屽伐鏁伴噺',
+ maxCompleted:'缁堟鏁伴噺',
+ terminationNo:'鍙栨秷缁堟',
updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
termination:'缁堟',
@@ -679,7 +681,7 @@
hiddenVal:'闅愯棌',
futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
- longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�15澶�',
+ longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
selectResponsibleTeam:'丕賱乇噩丕亍 丕禺鬲賷丕乇 丕賱賮乇賷賯 丕賱賲爻丐賵賱',
selectWorkReportingTeam:'丕賱乇噩丕亍 丕禺鬲賷丕乇 丕賱賮乇賷賯 丕賱賲爻丐賵賱',
successfulModificationOfWorkApplication:'鬲賲 鬲毓丿賷賱 丕賱鬲賯乇賷乇 亘賳噩丕丨',
@@ -1155,7 +1157,8 @@
finishedProductReport :'鬲賯乇賷乇 丕賱賲賳鬲噩丕鬲 丕賱賳賴丕卅賷丞',
workProcessName:'鍦ㄥ埗鍝佸悕绉�',
StorageArea:'鍏ュ簱闈㈢Н',
- shippedArea:'鍙戣揣闈㈢Н'
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
},
productionBasicData:{
@@ -1330,7 +1333,8 @@
userPassWord :'鬲睾賷賷乇 賰賱賲丞 丕賱賲乇賵乇',
glassPrice:'鐜荤拑浠锋牸',
glassOptimize:'鐜荤拑浼樺寲',
- finishedGlassShelf:'鎴愬搧鏂欐灦'
+ finishedGlassShelf:'鎴愬搧鏂欐灦',
+ userLog:'鐧诲綍鏃ュ織'
},
glassPrice:{
--
Gitblit v1.8.0