From 0805eb4ef9b0342e11d3a938b879df1b93de5520 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 06 九月 2024 15:14:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 UI-Project/src/lang/zh.js |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 7c79146..d365f5b 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -104,7 +104,8 @@
     },
     order:{
         dilapidation:'鐮存崯',
-        Takeaway:'浜哄伐鎷胯蛋',
+        takeaway:'浜哄伐鎷胯蛋',
+        takeon:'鎽嗙墖瀹屾垚',
     },
     searchOrder:{
         cageinformation:'鐞嗙墖绗间俊鎭�',
@@ -263,6 +264,8 @@
         height:'楂�',
         thickness:'鍘�',
         glasstakeout:'鐜荤拑鎷胯蛋娓呭崟',
+        layoutID:'鐗堝浘ID',
+        glassID:'鐜荤拑ID',
     },
     reportWork:{
         lowerbit:'涓嬬墖浣�',
@@ -455,6 +458,10 @@
         projectnumber: '宸ョ▼鍙�',
         right: '姝e父',
         stop: '缁堟',
+        inquire: '鏌ヨ',
+        starttime :'寮�濮嬫椂闂�',
+        endtime :'缁撴潫鏃堕棿',
+        loading :'姝e湪涓婄墖锛�',
     },
     reportmanage:{
         productiontime :'鐢熶骇鏃堕棿',

--
Gitblit v1.8.0