Merge branch 'JIWOO'
This commit is contained in:
JIWOO
commit
59b9eb2904
@ -6,7 +6,7 @@
|
||||
<sqlMap resource="egovframework/sqlmap/let/cmm/use/EgovCmmUse_SQL_Oracle.xml"/>
|
||||
<sqlMap resource="egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Oracle.xml"/>
|
||||
<sqlMap resource="egovframework/sqlmap/let/cmm/read/Read_SQL_Oracle.xml"/>
|
||||
<!-- <sqlMap resource="egovframework/sqlmap/let/orgChart/OrgChartManage_SQL_Oracle.xml"/>조직도 -->
|
||||
<sqlMap resource="egovframework/sqlmap/let/orgChart/OrgChartManage_SQL_Oracle.xml"/><!--조직도 -->
|
||||
|
||||
<!-- <sqlMap resource="egovframework/sqlmap/com/cmm/util/SequenceUtil_SQL_Oracle.xml"/>시퀀스UTIL -->
|
||||
</sqlMapConfig>
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
sub_loc.LOC_ORDR ,
|
||||
loc.LOC_LPAD|| ','|| LPAD(sub_loc.LOC_ORDR, 5, 0) AS LOC_LPAD ,
|
||||
sub_loc.GW_STATUS
|
||||
FROM ITSM_LOC AS sub_loc
|
||||
FROM ITSM_LOC sub_loc
|
||||
INNER JOIN (
|
||||
|
||||
SELECT LOC_NO ,
|
||||
|
||||
@ -19,13 +19,11 @@
|
||||
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
|
||||
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
|
||||
<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
|
||||
<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Language" content="ko" >
|
||||
<link rel="stylesheet" href="/kccadrPb/adm/css/popup.css">
|
||||
<link rel="stylesheet" href="<c:url value='/innorix/innorix.css'/>" type="text/css">
|
||||
<script type="text/javascript" src="<c:url value="/validator.do"/>"></script>
|
||||
<validator:javascript formName="userManageVO" staticJavascript="false" xhtml="true" cdata="false"/>
|
||||
<script src="/direct/js/jquery.nice-select.min.js"></script>
|
||||
@ -468,7 +466,6 @@ function wrapWindowByMask(){
|
||||
<form:input class="showMask" path="emplyrId" id="emplyrId" title="사용자아이디" size="50" maxlength="20" readonly="true" />
|
||||
<a href="#" class="showMask">
|
||||
<button type="button" class="btnType02 bg_888888">중복아이디 검색</button>
|
||||
<!-- <input type="button" class="btnType1 bg_888888" value="중복아이디 검색"> -->
|
||||
</a>
|
||||
<form:errors path="emplyrId" cssClass="error"/>
|
||||
</td>
|
||||
@ -490,14 +487,6 @@ function wrapWindowByMask(){
|
||||
<input name="password2" id="password2" title="비밀번호확인" type="password" autocomplete="off" size="50" maxlength="20" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><span class="reqArea">로그인 유형</span></th>
|
||||
<td colspan="3">
|
||||
<div class="radio_wrap">
|
||||
<kc:radio codeId="CC051" name="loginTypeCd" id="loginTypeCd" selectedValue="001" css="style='margin-left: 10px;'"/>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><span class="reqArea">이름</span></th>
|
||||
<td colspan="3">
|
||||
@ -519,43 +508,7 @@ function wrapWindowByMask(){
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>직책</th>
|
||||
<td colspan="3">
|
||||
<select name="ofcpsNm" title="직급" id="rank1" >
|
||||
<option value="10">조정조사관</option>
|
||||
<option value="20">조정팀장</option>
|
||||
<option value="30">부서장</option>
|
||||
<option value="40">위원장</option>
|
||||
</select>
|
||||
<select name="ofcpsNm" title="직급" id="rank2" style="display:none;" disabled="disabled">
|
||||
<option value="admin">시스템관리자</option>
|
||||
</select>
|
||||
<select name="ofcpsNm" title="직급" id="rank3" style="display:none;" disabled="disabled">
|
||||
<option value="80">법원연계 조정위원</option>
|
||||
<option value="90">법원연계 총괄조정위원</option>
|
||||
</select>
|
||||
</td>
|
||||
<%-- <td colspan="3">
|
||||
<form:input path="ofcpsNm" id="ofcpsNm" cssClass="txaIpt" size="50" maxlength="15" placeholder="" />
|
||||
<form:errors path="ofcpsNm" cssClass="error" />
|
||||
</td> --%>
|
||||
</tr>
|
||||
|
||||
<%-- <th>부서</th>
|
||||
<td id="select_part_hidden">
|
||||
<select name="orgDepth_01" id="orgDepth_01" class="asset_sec_sort">
|
||||
<option value="">선택</option>
|
||||
<c:forEach var="hiddenResult_one" items="${orgHiddenList}" varStatus="status">
|
||||
<c:if test="${hiddenResult_one.depths eq '1'}">
|
||||
<option value="<c:out value='${hiddenResult_one.id}'/>"><c:out value='${hiddenResult_one.text}'/></option>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</select>
|
||||
<select name="orgDepth_02" id="orgDepth_02" class="asset_sec_sort displayN" onchange="onChagneOrgDepth_02(); return false;" style="display:none;"/>
|
||||
</td>
|
||||
</tr> --%>
|
||||
|
||||
<tr>
|
||||
<th>전화번호</th>
|
||||
<td colspan="3">
|
||||
@ -587,15 +540,6 @@ function wrapWindowByMask(){
|
||||
<form:errors path="emailAdres" cssClass="error" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><span class="">서명이미지</span></th>
|
||||
<td class="upload_area">
|
||||
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display: none" />
|
||||
<button type="button" onclick="control.openFileDialog();" class="btnType01 btn_add_file">파일찾기</button> <!-- 솔루션 파일 찾기 이벤트 -->
|
||||
<p style="font-size: 16px; float: right; margin-top: 16px; color: #666;">* 첨부파일을 등록해 주세요. (최대3개)</p>
|
||||
<div id="fileControl"></div><br/> <!-- 파일 리스트 보여주는 div -->
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -616,32 +560,9 @@ function wrapWindowByMask(){
|
||||
</div>
|
||||
<!-- //cont -->
|
||||
</form:form>
|
||||
<!-- selectbox 미리만들기 -->
|
||||
<!-- 2뎁스 만들기 -->
|
||||
<c:forEach var="hiddenResult_one" items="${orgHiddenList}" varStatus="status">
|
||||
<c:if test="${hiddenResult_one.depths eq '1'}">
|
||||
<span id="span_one_${hiddenResult_one.id}" style="display:none;">
|
||||
<option value="">선택</option>
|
||||
<c:forEach var="hiddenResult_two" items="${orgHiddenList}" varStatus="status"><c:if test="${hiddenResult_one.id eq hiddenResult_two.parent}"><option value="<c:out value='${hiddenResult_two.id}'/>"><c:out value='${hiddenResult_two.text}'/></option></c:if></c:forEach>
|
||||
</span>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
||||
<form name="searchForm" id="searchForm" method="get" action="<c:url value='/uss/umt/user/EgovUserManage.do'/>" ></form>
|
||||
<div class="setDiv">
|
||||
<!-- <div class="mask"></div>
|
||||
<div class="window">
|
||||
<div class="id_check1">
|
||||
<input type="button" href="#" class="close">
|
||||
<span>아이디 중복 확인</span>
|
||||
</div>
|
||||
<div class="id_check2">
|
||||
<span>사용할 아이디</span><input type="text" id="checkIdModal">
|
||||
</div>
|
||||
<div class="id_check3">
|
||||
<span>중복확인을 실행하십시오</span><button onclick="fn_id_check(); return false;">중복확인조회</button>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="mask"></div>
|
||||
<div class="popup_wrap window">
|
||||
<div class="popup_tit">
|
||||
|
||||
@ -281,7 +281,7 @@ function userListExcelDownload(){
|
||||
</c:if> --%>
|
||||
|
||||
<span class="privateInfo">
|
||||
<kc:code codeId="CC401" code="${result.ofcpsNm}"/>
|
||||
<c:out value="${result.ofcpsNm}"/>
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user