Compare commits
No commits in common. "658a747a632138be8b6b0056f5d498642f1b8f1f" and "894b3cc488507fb05ba3c562149d4094c73efa90" have entirely different histories.
658a747a63
...
894b3cc488
|
|
@ -15,17 +15,18 @@
|
||||||
|
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<ul class="nav nav-pills" role="tablist">
|
<ul class="nav nav-pills" role="tablist">
|
||||||
<li role="presentation" class="nav-item ms-2">
|
<li role="presentation" class="nav-item" style="margin-left: 16px"><a
|
||||||
<a class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
|
class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
|
||||||
</li>
|
</li>
|
||||||
<li role="presentation" class="nav-item">
|
<li role="presentation" class="nav-item"><a
|
||||||
<a class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a>
|
class="nav-link ${useRequestSearchVO.status eq '0'?'active':''}" href="/admin/request?status=0">승인</a>
|
||||||
</li>
|
</li>
|
||||||
<li role="presentation" class="nav-item">
|
<li role="presentation" class="nav-item"><a
|
||||||
<a class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}" href="/admin/request?status=-1">반려</a>
|
class="nav-link ${useRequestSearchVO.status eq '-1'?'active':''}"
|
||||||
</li>
|
href="/admin/request?status=-1">반려</a></li>
|
||||||
<li role="presentation" class="nav-item">
|
<li role="presentation" class="nav-item"><a
|
||||||
<a class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}" href="/admin/request?status=99">승인대기(${statusCnt})</a>
|
class="nav-link ${useRequestSearchVO.status eq '99'?'active':''}"
|
||||||
|
href="/admin/request?status=99">승인대기<span class="badge"><c:out value="${statusCnt}"/></span></a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -33,12 +34,21 @@
|
||||||
<div class="col-auto row">
|
<div class="col-auto row">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<select class="form-select " name="searchCondition">
|
<select class="form-select " name="searchCondition">
|
||||||
<option value="all" ${useRequestSearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
|
<option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected"/></c:if>
|
||||||
<option value="title" ${useRequestSearchVO.searchCondition eq 'title'?'selected':''}>작업명</option>
|
value="all">통합검색
|
||||||
<option value="name" ${useRequestSearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
|
</option>
|
||||||
<option value="company" ${useRequestSearchVO.searchCondition eq 'company'?'selected':''}>소속</option>
|
<option <c:if test="${useRequestSearchVO.searchCondition eq 'title'}"><c:out
|
||||||
|
value="selected"/></c:if> value="title">작업명
|
||||||
|
</option>
|
||||||
|
<option <c:if test="${useRequestSearchVO.searchCondition eq 'name'}"><c:out
|
||||||
|
value="selected"/></c:if> value="name">이름
|
||||||
|
</option>
|
||||||
|
<option <c:if test="${useRequestSearchVO.searchCondition eq 'company'}"><c:out
|
||||||
|
value="selected"/></c:if> value="company">소속
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}"/>
|
<input type="text" class="form-control" name="searchKeyword" value="${userSearchVO.searchKeyword}"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -17,13 +17,12 @@
|
||||||
|
|
||||||
<div class="row justify-content-between bg-white mx-3 py-2">
|
<div class="row justify-content-between bg-white mx-3 py-2">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<ul class="nav nav-pills ms-2" role="tablist">
|
<ul class="nav nav-pills" role="tablist" style="margin-left: 16px">
|
||||||
<li role="presentation" class="nav-item">
|
<li role="presentation" class="nav-item"><a
|
||||||
<a class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기(${standByCount})</a>
|
class="nav-link ${userSearchVO.auth eq '99'?'active':''}" href="/admin/userInfo?auth=99">승인대기<span
|
||||||
</li>
|
class="badge"><c:out value='${standByCount}'/></span></a></li>
|
||||||
<li role="presentation" class="nav-item">
|
<li role="presentation" class="nav-item"><a class="nav-link ${empty userSearchVO.auth?'active':''}"
|
||||||
<a class="nav-link ${empty userSearchVO.auth?'active':''}" href="/admin/userInfo">회원 관리</a>
|
href="/admin/userInfo">회원 관리</a></li>
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
<input type="hidden" name="auth" value="${userSearchVO.auth}"/>
|
<input type="hidden" name="auth" value="${userSearchVO.auth}"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -31,11 +30,24 @@
|
||||||
<div class="col-auto row">
|
<div class="col-auto row">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<select class="form-select" name="searchCondition">
|
<select class="form-select" name="searchCondition">
|
||||||
<option value="all" ${userSearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
|
<option
|
||||||
<option value="name" ${userSearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
|
<c:if test="${userSearchVO.searchCondition eq 'all'}">selected</c:if> value="all">통합검색
|
||||||
<option value="company" ${userSearchVO.searchCondition eq 'company'?'selected':''}>소속</option>
|
</option>
|
||||||
<option value="email" ${userSearchVO.searchCondition eq 'email'?'selected':''}>이메일</option>
|
<option
|
||||||
<option value="phonenum" ${userSearchVO.searchCondition eq 'phonenum'?'selected':''}>전화번호</option>
|
<c:if test="${userSearchVO.searchCondition eq 'name'}">selected</c:if> value="name">이름
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
<c:if test="${userSearchVO.searchCondition eq 'company'}">selected</c:if>
|
||||||
|
value="company">소속
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
<c:if test="${userSearchVO.searchCondition eq 'email'}">selected</c:if> value="email">
|
||||||
|
이메일
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
<c:if test="${userSearchVO.searchCondition eq 'phonenum'}">selected</c:if>
|
||||||
|
value="phonenum">전화번호
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -66,6 +78,7 @@
|
||||||
<c:if test="${count >= 1}">
|
<c:if test="${count >= 1}">
|
||||||
<c:forEach var="user" items="${userList}" varStatus="idx">
|
<c:forEach var="user" items="${userList}" varStatus="idx">
|
||||||
<tr>
|
<tr>
|
||||||
|
<%--<a href="/admin/userInfo/<c:out value='${item.userid}' />"></a>--%>
|
||||||
<td class="clickAbleObj userInfoModalBtn useridTd"><c:out value='${user.userid}'/></td>
|
<td class="clickAbleObj userInfoModalBtn useridTd"><c:out value='${user.userid}'/></td>
|
||||||
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.name}'/></td>
|
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.name}'/></td>
|
||||||
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.company}'/></td>
|
<td class="clickAbleObj userInfoModalBtn"><c:out value='${user.company}'/></td>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue