From 0e684fe9e105167c5980b26f045221411200a2f2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 10:37:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/oprsrch.jsp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/WebRoot/oprsrch.jsp b/gx_tieta/WebRoot/oprsrch.jsp
index 4ab0384..486969d 100644
--- a/gx_tieta/WebRoot/oprsrch.jsp
+++ b/gx_tieta/WebRoot/oprsrch.jsp
@@ -61,6 +61,7 @@
 								<option value="7"><s:text name="Cancel"/></option>				<!-- 鍙栨秷 -->
 								<option value="8"><s:text name="Start_up"/></option>			<!-- 鍚姩 -->
 								<option value="9"><s:text name="End"/></option>					<!-- 缁堟 -->
+								<option value="10">鎵归噺鎿嶄綔</option>								<!-- 鎵归噺鎿嶄綔 -->
 							</select>
 						</td>
 						<td><input type="text" name="bup.ulog.uOprateDay" readonly="readonly" id="startrecorddate" value="2000-1-1" onfocus="showCalendar(this)"  class="FixedLen"></td>
@@ -211,6 +212,7 @@
 				case 7:opaatetype="<s:text name='Cancel'/>";break;				/* 鍙栨秷 */
 				case 8:opaatetype="<s:text name='Start_up'/>";break;			/* 鍚姩 */
 				case 9:opaatetype="<s:text name='End'/>";break;					/* 缁堟 */
+				case 10:opaatetype="鎵归噺鎿嶄綔";break;								/* 鎵归噺鎿嶄綔 */
 			}			
 		}
 		return opaatetype;

--
Gitblit v1.9.1