更新

jsproot/login_yr.jsp

@@ -60,13 +60,12 @@ var isbg = false;
 	function openWin() {
 		var url = window.location.href;
 		url = url.substring(0, url.lastIndexOf("/"));
-		url = url + "/toMain.do";
+		to_url = url + "/toMain.do";
 		var loginLevel = $("#loginLevel").val();
 		if(loginLevel == 'desk'){
-			url += "?loginLevel=1";
+			to_url = url + "/toMTMain.do?loginLevel=1";
 		}
-		
-		window.location.href = url;
+		window.location.href = to_url;
 
 	}
 	
@@ -141,6 +140,9 @@ var isbg = false;
 							if (data == -203) {
 								$("#msg").html("用户名不存在或密码错误");
 							}
+							if (data == -99) {
+								$("#msg").html("域名不存在");
+							}
 							if (data == -204) {
 								if (confirm("该用户已登录，是否继续登录！")) {
 									login(1);

jsproot/main1.jsp

@@ -243,7 +243,7 @@
 		}catch(e){}
 	}
 	function loginSystem(){
-		submitTargetAUrl('toMain.do?loginLevel=1','_self');
+		submitTargetAUrl('toMTMain.do?loginLevel=1','_self');
 	}
 	function openPrj(){
 		var prjCount = $(".nav_hl").length;

jsproot/yw/hr/staff/createStaffInfo.jsp

@@ -391,7 +391,7 @@
 			 </tr>
 			 <tr>
 			 	<td>¼®¹á£º</td>
-			 	<td><input type="text" id="native" name="native" value="${requestScope.staff.native }"></td>
+			 	<td><input type="text" id="native" name="native" value="${staff._native }"></td>
 				<td><yr:pr text="${pr.eu_org_dept_other}"/><FONT COLOR="red">*</FONT>£º</td>														
 				<td colspan="2">
 					<c:if test="${empty followGroups}">

jsproot/yw/hr/staff/include/staffInfo.jsp

@@ -5,7 +5,7 @@
 <form id="editForm" action=""  method='post'>
 <script type="text/javascript">
 
-var old_tabid = "${requestScope.tabid}";
+var old_tabid = "${tabid}";
 $(function() {
 	loadingShow();
 	addFlowDept();
@@ -119,34 +119,34 @@ function delOtherDept(e){
 				</tr>
 				<tr>
 					<td colspan="1">
-						<input type="hidden" name="old_is_active_eu" id="old_is_active_eu"  value="${requestScope.staff.is_active_eu }" />
+						<input type="hidden" name="old_is_active_eu" id="old_is_active_eu"  value="${staff.is_active_eu }" />
 						<input type="checkbox" id="checkbox_active" name="checkbox_active" <c:if test="${empty checked}">onclick="checkUserName()"</c:if><c:if test="${not empty checked}">checked="checked"</c:if>>&nbsp;&nbsp;<c:if test="${not empty checked}">修改</c:if><c:if test="${empty checked}">激活</c:if>至EU平台
 					</td>
-					<td colspan="4"><input type="text" id="username" name="username" style="display: none;" onblur="checkuserhide('is_username')" value="${requestScope.staff.username}"/><div id="staff_name_div">${requestScope.staff.username}</div>
+					<td colspan="4"><input type="text" id="username" name="username" style="display: none;" onblur="checkuserhide('is_username')" value="${staff.username}"/><div id="staff_name_div">${staff.username}</div>
 					</td>
 				 </tr>
 				<tr>
 					<td>工号<FONT COLOR="red">*</FONT>：</td>
 				 	<td>
-				 		<input type="text" id="job_number" name="job_number" value="${requestScope.staff.job_number }" maxlength="15">
+				 		<input type="text" id="job_number" name="job_number" value="${staff.job_number }" maxlength="15">
 					 	<span id="jobNumSpan"></span>
 						<input type="hidden" name="jobNumCheck" id="jobNumCheck" value="" >
 				 	</td>
 				 	<td>档案号：</td>
-				 	<td><input type="text" id="file_num" name="file_num" value="${requestScope.staff.file_num }"></td>				 	
+				 	<td><input type="text" id="file_num" name="file_num" value="${staff.file_num }"></td>				 	
 				 	<td rowspan="5" width="20%">
 				 	<c:choose>
-				 		<c:when test="${null==requestScope.staff.staff_photo_path||requestScope.staff.staff_photo_path=='' }">
+				 		<c:when test="${null==staff.staff_photo_path||staff.staff_photo_path=='' }">
 				 			<img id="stuPic" alt="1寸照片" src="/shares/images/hr/job/man.png" width="150px;" height="200px;"><br>
 				 		</c:when>
 				 		<c:otherwise>
-				 			<img id="stuPic" alt="1寸照片" src="${requestScope.staff.staff_photo_path }" width="150px;" height="200px;"><br>
+				 			<img id="stuPic" alt="1寸照片" src="${staff.staff_photo_path }" width="150px;" height="200px;"><br>
 				 		</c:otherwise>
 				 	</c:choose>	
 					照片上传： <jsp:include page="/include/file.jsp">
 							<jsp:param name="fieldName" value="staff_photo" />
 							<jsp:param name="folder" value="hr/staff" />
-							<jsp:param name="documentId" value="${requestScope.staff.staff_photo}" />
+							<jsp:param name="documentId" value="${staff.staff_photo}" />
 							<jsp:param name="size" value="1" />
 							<jsp:param name="isView" value="1" />
 							<jsp:param name="isDelFile" value="1" />
@@ -159,7 +159,7 @@ function delOtherDept(e){
 				 <tr>
 				 	<td>考勤用户号<FONT COLOR="red">*</FONT>：</td>
 				 	<td>
-				 		<input type="text" id="att_user_id" name="att_user_id" value="${requestScope.staff.att_user_id }">
+				 		<input type="text" id="att_user_id" name="att_user_id" value="${staff.att_user_id }">
 				 		<span id="attUserNumSpan"></span>
 						<input type="hidden" name="attUserNumCheck" id="attUserNumCheck" value="" >	
 				 	</td>
@@ -167,7 +167,7 @@ function delOtherDept(e){
 				 	<td>
 				 		<select id="att_shit_id" name="att_shit_id" class="short-text">
 				 			<option value="" selected="selected">--请选择--</option>
-							<c:forEach items="${requestScope.listAttendanceShift}" var="attendanceShift">
+							<c:forEach items="${listAttendanceShift}" var="attendanceShift">
 									<option value="${attendanceShift.shift_id }"  ${staff.att_shit_id==attendanceShift.shift_id?"selected":"" }>${attendanceShift.shift_name }</option>
 							</c:forEach>
 						</select>
@@ -176,13 +176,13 @@ function delOtherDept(e){
 				<tr>
 					<td>姓名<FONT COLOR="red">*</FONT>：
 					</td>
-					<td><input type="text" id="staff_name" name="staff_name" <c:if test="${empty checked}">onblur="checkUserName()"</c:if> value="${requestScope.staff.staff_name }" maxlength="6"/></td>
+					<td><input type="text" id="staff_name" name="staff_name" <c:if test="${empty checked}">onblur="checkUserName()"</c:if> value="${staff.staff_name }" maxlength="6"/></td>
 					<td>性别：</td>
 					<td><select name="staff_sex" id="staff_sex">
 							<c:forEach var="listSex" items="${listStaffSex}">
 								<c:choose>
 									<c:when
-										test="${listSex.data_id eq requestScope.staff.staff_sex}">
+										test="${listSex.data_id eq staff.staff_sex}">
 										<option value="${listSex.data_id }" selected="selected">${listSex.value_name}</option>
 									</c:when>
 									<c:otherwise>
@@ -196,29 +196,29 @@ function delOtherDept(e){
 				<tr>
 				<td>民族：</td>
 					<td><input type="text" id="ethnic_group"
-						name="ethnic_group" value="${requestScope.staff.ethnic_group}"></td>
+						name="ethnic_group" value="${staff.ethnic_group}"></td>
 					<td>出生日期：</td>
 					<td><input type="text" id="staff_birthday"
 						name="staff_birthday"
-						value="${requestScope.staff.staff_birthday}"></td>
+						value="${staff.staff_birthday}"></td>
 				</tr>
 				<tr>
 					<td>血型：</td>
 					<td><input type="text" id="blood_type" name="blood_type"
-						value="${requestScope.staff.blood_type }"></td>
+						value="${staff.blood_type }"></td>
 					<td>身高：</td>
 					<td><input type="text" id="body_height" name="body_height"
-						value="${requestScope.staff.body_height }"></td>					
+						value="${staff.body_height }"></td>					
 				</tr>
 				<tr>
 					<td>体重：</td>
 					<td><input type="text" id="body_weight" name="body_weight"
-						value="${requestScope.staff.body_weight }"></td>
+						value="${staff.body_weight }"></td>
 			 		<td>婚姻状况：</td>
 					<td colspan="2"><select name="marital_status" id="marital_status">
 							<c:forEach var="listMaritalStatus" items="${listMaritalStatus}">
 								<c:choose>
-									<c:when test="${listMaritalStatus.data_id eq requestScope.staff.marital_status}">
+									<c:when test="${listMaritalStatus.data_id eq staff.marital_status}">
 										<option value="${listMaritalStatus.data_id }" selected="selected">${listMaritalStatus.value_name}</option>
 									</c:when>
 									<c:otherwise>
@@ -233,19 +233,19 @@ function delOtherDept(e){
 					<td>是否党员：</td>
 			 		<td>
 			 			<select name="is_party" id="is_party">
-			 				<option value="0" <c:if test="${requestScope.staff.is_party == '0' }">selected="selected"</c:if> >否</option>
-			 				<option value="1" <c:if test="${requestScope.staff.is_party == '1' }">selected="selected"</c:if> >是</option>
+			 				<option value="0" <c:if test="${staff.is_party == '0' }">selected="selected"</c:if> >否</option>
+			 				<option value="1" <c:if test="${staff.is_party == '1' }">selected="selected"</c:if> >是</option>
 			 			</select>
 			 		</td>
 					<td>政治面貌：</td>
 					<td colspan="2"><input type="text" id="political_landscape"
 						name="political_landscape"
-						value="${requestScope.staff.political_landscape }"></td>					
+						value="${staff.political_landscape }"></td>					
 				</tr>
 				<tr>
 					<td>籍贯：</td>
 					<td><input type="text" id="native" name="native"
-						value="${requestScope.staff.native }"></td>
+						value="${staff._native }"></td>
 					<td><yr:pr text="${pr.eu_org_dept_other}"/><FONT COLOR="red">*</FONT>：</td>	
 					<td colspan="2">
 					<c:if test="${empty followGroups}">
@@ -310,63 +310,63 @@ function delOtherDept(e){
 			  	<td>身份证号码<FONT COLOR="red">*</FONT>：</td>
 			 	<td>
 					<input type="text" id="id_number"
-						name="id_number" value="${requestScope.staff.id_number }" onblur="checkIdNumber(this);" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="18" >
+						name="id_number" value="${staff.id_number }" onblur="checkIdNumber(this);" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="18" >
 						<div id="id_number_div"></div>
 				</td>
 			 	<td>户口性质：</td>
-			 	<td colspan="2"><input type="text" id="anmelden_pro" name="anmelden_pro" value="${requestScope.staff.anmelden_pro }"></td>			 	
+			 	<td colspan="2"><input type="text" id="anmelden_pro" name="anmelden_pro" value="${staff.anmelden_pro }"></td>			 	
 			 </tr>
 				<tr>
 					<td>职称：</td>
 					<td><input type="text" id="job_title"
-						name="job_title" value="${requestScope.staff.job_title }"
+						name="job_title" value="${staff.job_title }"
 						size="50"></td>
 					<td>家庭住址：</td>
 					<td colspan="2"><input type="text" id="census_address"
 						name="census_address"
-						value="${requestScope.staff.census_address }" size="50"></td>
+						value="${staff.census_address }" size="50"></td>
 					
 				</tr>
 				<tr>
 					<td>现住址：</td>
 					<td><input type="text" id="home_address"
-						name="home_address" value="${requestScope.staff.home_address }"
+						name="home_address" value="${staff.home_address }"
 						size="50"></td>
 					<td>手机号：</td>
 					<td colspan="2"><input type="text" id="self_phone"
-						name="self_phone" value="${requestScope.staff.self_phone }"
+						name="self_phone" value="${staff.self_phone }"
 						size="50"></td>
 				</tr>
 				<tr>
 					<td>入司日期：</td>
 					<td><input type="text" id="register_time"
 						name="register_time"
-						value="${requestScope.staff.register_time}"></td>
+						value="${staff.register_time}"></td>
 					<td>劳动合同有效期至：</td>
 					<td colspan="2"><input type="text" id="agreement_time"
 						name="agreement_time"
-						value="${requestScope.staff.agreement_time}"></td>
+						value="${staff.agreement_time}"></td>
 				</tr>
 
 				<tr>
 					<td>社保起始日期：</td>
 					<td><input type="text" id="social_time"
-						name="social_time" value="${requestScope.staff.social_time}"></td>
+						name="social_time" value="${staff.social_time}"></td>
 					<td>医保起始日期：</td>
 					<td colspan="2"><input type="text" id="health_time"
-						name="health_time" value="${requestScope.staff.health_time}"></td>
+						name="health_time" value="${staff.health_time}"></td>
 				</tr>
 
 				<tr>
 					<td>住房公积金起始日期：</td>
 					<td><input type="text" id="fund_time"
-						name="fund_time" value="${requestScope.staff.fund_time }"></td>	
+						name="fund_time" value="${staff.fund_time }"></td>	
 					<td>工种：</td>
 					<td colspan="2">
 						<select id="craft_type" name="craft_type" class="short-text">
 							<option value="0" selected="selected">==请选择==</option>
 							<c:forEach items="${crafttype }" var="craft">
-								<option value="${craft.dvalue }" ${requestScope.staff.craft_type == craft.dvalue?"selected":"" }>${craft.dname }</option>
+								<option value="${craft.dvalue }" ${staff.craft_type == craft.dvalue?"selected":"" }>${craft.dname }</option>
 							</c:forEach>
 						</select>
 					</td>				
@@ -376,11 +376,11 @@ function delOtherDept(e){
 					<td>联系人：</td>
 					<td><input type="text" id="contact_person"
 						name="contact_person"
-						value="${requestScope.staff.contact_person }"></td>
+						value="${staff.contact_person }"></td>
 					<td>联系电话：</td>
 					<td colspan="2"><input type="text"
 						id="contact_person_phone" name="contact_person_phone"
-						value="${requestScope.staff.contact_person_phone }"></td>
+						value="${staff.contact_person_phone }"></td>
 				</tr>
 
 				<tr>
@@ -390,7 +390,7 @@ function delOtherDept(e){
 							page="/include/file.jsp">
 							<jsp:param name="fieldName" value="sfzDocumentId" />
 							<jsp:param name="folder" value="hr/staff" />
-							<jsp:param name="documentId" value="${requestScope.staff.id_number_affix}" />
+							<jsp:param name="documentId" value="${staff.id_number_affix}" />
 							<jsp:param name="size" value="5" />
 							<jsp:param name="isView" value="1" />
 							<jsp:param name="isDelFile" value="1" />
@@ -405,14 +405,14 @@ function delOtherDept(e){
 							page="/include/file.jsp">
 							<jsp:param name="fieldName" value="htDocumentId" />
 							<jsp:param name="folder" value="hr/staff" />
-							<jsp:param name="documentId" value="${requestScope.staff.agreement_affix}" />
+							<jsp:param name="documentId" value="${staff.agreement_affix}" />
 							<jsp:param name="size" value="30" />
 							<jsp:param name="isView" value="1" />
 							<jsp:param name="isDelFile" value="1" />
 							<jsp:param name="definedCss" value="file-style" />
 						</jsp:include></td>
 				</tr>
-				<input type="hidden" name="is_dimission" id="is_dimission" value="${requestScope.staff.is_dimission}"/>
+				<input type="hidden" name="is_dimission" id="is_dimission" value="${staff.is_dimission}"/>
 			</table>
 		</center>
 	</div>

jsproot/yw/hr/staff/viewStaff.jsp

@@ -249,19 +249,19 @@ function getOther(){
 						<table class="l-table-edit line">
 							<tr>
 								<td>工号：</td>
-								<td>${requestScope.staff.job_number }</td>
+								<td>${staff.job_number }</td>
 	
 								<td>档案号：</td>
 								<td>
-									${requestScope.staff.file_num }
+									${staff.file_num }
 								</td>
 								<td rowspan="5" width="20%">
 					 	<c:choose>
-					 		<c:when test="${null==requestScope.staff.staff_photo_path||requestScope.staff.staff_photo_path=='' }">
+					 		<c:when test="${null==staff.staff_photo_path||staff.staff_photo_path=='' }">
 					 			<img id="stuPic" alt="1寸照片" src="/shares/images/hr/job/man.png" width="150px;" height="200px;"><br>
 					 		</c:when>
 					 		<c:otherwise>
-					 			<img id="stuPic" alt="1寸照片" src="${requestScope.staff.staff_photo_path }" width="150px;" height="200px;"><br>
+					 			<img id="stuPic" alt="1寸照片" src="${staff.staff_photo_path }" width="150px;" height="200px;"><br>
 					 		</c:otherwise>
 					 	</c:choose>	
 						</td>
@@ -269,11 +269,11 @@ function getOther(){
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">考勤用户号：</td>
-								<td class="l-table-edit-td">${requestScope.staff.att_user_id }</td>
+								<td class="l-table-edit-td">${staff.att_user_id }</td>
 	
 								<td class="l-table-edit-text">班次：</td>
 								<td class="l-table-edit-td">
-									<c:forEach items="${requestScope.listAttendanceShift}" var="attendanceShift">
+									<c:forEach items="${listAttendanceShift}" var="attendanceShift">
 										<c:choose>
 											<c:when test="${staff.att_shit_id eq attendanceShift.shift_id}">${attendanceShift.shift_name }</c:when>
 										</c:choose>
@@ -282,39 +282,39 @@ function getOther(){
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">姓名：</td>
-								<td class="l-table-edit-td">${requestScope.staff.staff_name }</td>
+								<td class="l-table-edit-td">${staff.staff_name }</td>
 	
 								<td class="l-table-edit-text">性别：</td>
 								<td class="l-table-edit-td">
 									<c:forEach items="${listStaffSex}" var="listSex">
 										<c:choose>
-											<c:when test="${listSex.data_id eq requestScope.staff.staff_sex}">${listSex.value_name}</c:when>
+											<c:when test="${listSex.data_id eq staff.staff_sex}">${listSex.value_name}</c:when>
 										</c:choose>
 									</c:forEach>
 								</td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">民族：</td>
-								<td class="l-table-edit-td">${requestScope.staff.ethnic_group}</td>
+								<td class="l-table-edit-td">${staff.ethnic_group}</td>
 	
 								<td class="l-table-edit-text">出生日期：</td>
-								<td class="l-table-edit-td">${requestScope.staff.staff_birthday}</td>
+								<td class="l-table-edit-td">${staff.staff_birthday}</td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">血型：</td>
-								<td class="l-table-edit-td">${requestScope.staff.blood_type }</td>
+								<td class="l-table-edit-td">${staff.blood_type }</td>
 	
 								<td class="l-table-edit-text">身高：</td>
-								<td class="l-table-edit-td">${requestScope.staff.body_height }</td>
+								<td class="l-table-edit-td">${staff.body_height }</td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">体重：</td>
-								<td class="l-table-edit-td">${requestScope.staff.body_weight }</td>
+								<td class="l-table-edit-td">${staff.body_weight }</td>
 								<td class="l-table-edit-text">婚姻状况：</td>
 								<td class="l-table-edit-td">
 									<c:forEach var="listMaritalStatus" items="${listMaritalStatus}">
 									<c:choose>
-										<c:when test="${listMaritalStatus.data_id eq requestScope.staff.marital_status}">
+										<c:when test="${listMaritalStatus.data_id eq staff.marital_status}">
 											${listMaritalStatus.value_name}
 										</c:when>
 										
@@ -327,7 +327,7 @@ function getOther(){
 								<td class="l-table-edit-text">是否党员：</td>
 								<td class="l-table-edit-td">
 									<c:choose>
-										<c:when test="${requestScope.staff.is_party == '1'}">
+										<c:when test="${staff.is_party == '1'}">
 											是
 										</c:when>
 										<c:otherwise>否</c:otherwise>
@@ -336,12 +336,12 @@ function getOther(){
 								</td>
 	
 								<td class="l-table-edit-text">政治面貌：</td>
-								<td class="l-table-edit-td">${requestScope.staff.political_landscape }</td>
+								<td class="l-table-edit-td">${staff.political_landscape }</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">籍贯：</td>
-								<td class="l-table-edit-td">${requestScope.staff.native }</td>
+								<td class="l-table-edit-td">${staff._native }</td>
 	
 								<td class="l-table-edit-text">所属部门及岗位：</td>
 								<td class="l-table-edit-td">
@@ -365,53 +365,53 @@ function getOther(){
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">身份证号码：</td>
-								<td class="l-table-edit-td">${requestScope.staff.id_number }</td>
+								<td class="l-table-edit-td">${staff.id_number }</td>
 	
 								<td class="l-table-edit-text">户口性质：</td>
-								<td class="l-table-edit-td">${requestScope.staff.anmelden_pro }</td>
+								<td class="l-table-edit-td">${staff.anmelden_pro }</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">职称：</td>
-								<td class="l-table-edit-td">${requestScope.staff.job_title }</td>
+								<td class="l-table-edit-td">${staff.job_title }</td>
 	
 								<td class="l-table-edit-text">家庭住址：</td>
-								<td class="l-table-edit-td">${requestScope.staff.census_address }</td>
+								<td class="l-table-edit-td">${staff.census_address }</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">现住址：</td>
-								<td class="l-table-edit-td">${requestScope.staff.home_address }</td>
+								<td class="l-table-edit-td">${staff.home_address }</td>
 	
 								<td class="l-table-edit-text">手机号：</td>
-								<td class="l-table-edit-td">${requestScope.staff.self_phone }</td>
+								<td class="l-table-edit-td">${staff.self_phone }</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">入司日期：</td>
-								<td class="l-table-edit-td">${requestScope.staff.register_time}</td>
+								<td class="l-table-edit-td">${staff.register_time}</td>
 	
 								<td class="l-table-edit-text">劳动合同有效期至：</td>
-								<td class="l-table-edit-td">${requestScope.staff.agreement_time}</td>
+								<td class="l-table-edit-td">${staff.agreement_time}</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">社保起始日期：</td>
-								<td class="l-table-edit-td">${requestScope.staff.social_time}</td>
+								<td class="l-table-edit-td">${staff.social_time}</td>
 	
 								<td class="l-table-edit-text">医保起始日期：</td>
-								<td class="l-table-edit-td">${requestScope.staff.health_time}</td>
+								<td class="l-table-edit-td">${staff.health_time}</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">住房公积金起始日期：</td>
-								<td class="l-table-edit-td">${requestScope.staff.fund_time }</td>
+								<td class="l-table-edit-td">${staff.fund_time }</td>
 	
 								<td class="l-table-edit-text">工种</td>
 								<td class="l-table-edit-td">
 									<c:forEach items="${crafttype }" var="craft">
 										<c:choose>
-											<c:when test="${requestScope.staff.craft_type eq craft.dvalue}">${craft.dname }</c:when>
+											<c:when test="${staff.craft_type eq craft.dvalue}">${craft.dname }</c:when>
 										</c:choose>
 									</c:forEach>
 								</td>
@@ -419,19 +419,19 @@ function getOther(){
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">联系人：</td>
-								<td class="l-table-edit-td">${requestScope.staff.contact_person }</td>
+								<td class="l-table-edit-td">${staff.contact_person }</td>
 	
 								<td class="l-table-edit-text">联系电话：</td>
-								<td class="l-table-edit-td">${requestScope.staff.contact_person_phone }</td>
+								<td class="l-table-edit-td">${staff.contact_person_phone }</td>
 								<td></td>
 							</tr>
 							<tr>
 								<td class="l-table-edit-text">身份证附件：</td>
 								<td class="l-table-edit-td">
-									<c:if test="${!empty requestScope.staff.id_number_affix }">
+									<c:if test="${!empty staff.id_number_affix }">
 										<input type="hidden" id="id_number_affix" name="id_number_affix"> 
 										<jsp:include page="/include/file.jsp">
-											<jsp:param name="documentId" value="${requestScope.staff.id_number_affix}" />
+											<jsp:param name="documentId" value="${staff.id_number_affix}" />
 											<jsp:param name="isView" value="1" />
 											<jsp:param name="definedCss" value="file-style" />
 										</jsp:include>
@@ -439,10 +439,10 @@ function getOther(){
 								</td>
 								<td class="l-table-edit-text">合同附件：</td>
 								<td class="l-table-edit-td">
-									<c:if test="${!empty requestScope.staff.agreement_affix }">
+									<c:if test="${!empty staff.agreement_affix }">
 										<input type="hidden" id="agreement_affix" name="agreement_affix" value=""> 
 										<jsp:include page="/include/file.jsp">
-											<jsp:param name="documentId" value="${requestScope.staff.agreement_affix}" />
+											<jsp:param name="documentId" value="${staff.agreement_affix}" />
 											<jsp:param name="isView" value="1" />
 											<jsp:param name="definedCss" value="file-style" />
 										</jsp:include>

jsproot/yw/master1/master.jsp

@@ -38,9 +38,9 @@
 
 $(function() {
 		try{
-			var type = loadBrowserType();			
+			var type = loadBrowserType();
 			keepSession();
-			loadBirthday();
+		/* 	loadBirthday(); */
 			win8Desktop.taskBar.taskCount();
 			loadDefaultHead();
 			document.title = $("#titleName").val();
@@ -374,7 +374,7 @@ $(function() {
 				<span style="display:block;text-align:right;margin-right:10px;">
 					<a id="navigate" href="#" onclick="openNavWin()">使用导航</a>
 					<a id="logout" href="#" onclick="logoutSystem()">退出系统</a>
-					<a id="ls" href="#" onclick="loginSystem()">经典版</a>
+				<!-- 	<a id="ls" href="#" onclick="loginSystem()">经典版</a> -->
 				</span>
 			</div>