From c4901764c4a7b6babf3110c9df7429ab55f870e0 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期一, 14 一月 2019 15:18:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/oprsrch.jsp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/oprsrch.jsp b/gx_tieta/WebRoot/oprsrch.jsp
index b869e10..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>
@@ -113,7 +114,7 @@
//鍒濆鍖栭〉闈㈠唴瀹�
$(document).ready(function(){
- setUserName();
+ //setUserName();
//瀹氫箟椤甸潰楂樺害
var srnHt=$(window).height(); //娴忚鍣ㄥ彲浠ュ尯鍩熺殑楂樺害
@@ -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