From 4170df95c30c0e761ce14ed1a33d1bccfe542c34 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 18 九月 2024 16:27:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 7c79146..8b3595d 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:'鐞嗙墖绗间俊鎭�',
@@ -207,7 +208,8 @@
now:'褰撳墠椤垫樉绀�',
tit:'鏉℃暟鎹�',
temperingqueries:'閽㈠寲鏌ヨ',
- specifytempering:'鎸囧畾閽㈠寲',
+ specifytempering:'鎸囧畾涓�鐐�',
+ specifyengineerid:'鎸囧畾宸ョ▼',
projectnumber:'宸ョ▼鍙�',
layoutnumber:'閽㈠寲鐗堝浘鍙�',
numberglasses:'鐜荤拑鏁伴噺',
@@ -263,6 +265,8 @@
height:'楂�',
thickness:'鍘�',
glasstakeout:'鐜荤拑鎷胯蛋娓呭崟',
+ layoutID:'鐗堝浘ID',
+ glassID:'鐜荤拑ID',
},
reportWork:{
lowerbit:'涓嬬墖浣�',
@@ -455,6 +459,10 @@
projectnumber: '宸ョ▼鍙�',
right: '姝ｅ父',
stop: '缁堟',
+ inquire: '鏌ヨ',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ loading :'姝ｅ湪涓婄墖锛�',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
--
Gitblit v1.8.0