Merge branch 'bo_fixes' into 'dev'
[BO] 수정사항 반영 See merge request korea-research/korea-research!110
This commit is contained in:
@@ -168,7 +168,6 @@
|
||||
<th:block th:each="item, status : ${menuHierarchy}">
|
||||
<a th:if="${status.first}" th:href="${item.uri}" >홈</a>
|
||||
<a th:if="${!status.first and item.id != currentURI.id}"
|
||||
th:href="${item.uri}"
|
||||
th:text="${@coreUtil.getUriTitle(item)}"></a>
|
||||
<span th:if="${!status.first and item.id == currentURI.id}" th:text="${@coreUtil.getUriTitle(item)}" ></span>
|
||||
</th:block>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-tit" >임가 매핑</h3>
|
||||
</div>
|
||||
<form autocomplete="off" method="get" name="reqHouseholdForm" id="reqHouseholdForm">
|
||||
<form autocomplete="off" method="get" name="reqHouseholdForm" id="reqHouseholdForm" onsubmit="return false;">
|
||||
<div class="modal-content">
|
||||
<div class="modal-content-inner">
|
||||
<section class="filter-wrap">
|
||||
@@ -34,7 +34,8 @@
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="text" id="ownerValue" name="ownerValue" placeholder="입력" th:value="${ownerValue}">
|
||||
<input type="text" id="ownerValue" name="ownerValue" placeholder="입력" th:value="${ownerValue}"
|
||||
onkeydown="if(event.key === 'Enter'){ event.preventDefault(); initSearchHousehold(); }">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -94,7 +95,7 @@
|
||||
<button type="button" class="btn" onclick="resetSearchForm()">
|
||||
<span class="btn-txt">초기화</span>
|
||||
</button>
|
||||
<button type="button" class="btn btn-primary" th:onclick="|searchHouseholdList(0,${regionMainCode})|">
|
||||
<button type="button" class="btn btn-primary" onclick="initSearchHousehold();">
|
||||
<span class="btn-txt">검색</span>
|
||||
</button>
|
||||
</div>
|
||||
@@ -161,6 +162,7 @@
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode',
|
||||
defaultOptionText: '전체'
|
||||
});
|
||||
|
||||
document.querySelector(".modal01").ui.open();
|
||||
@@ -178,6 +180,8 @@
|
||||
$('#isPanel').val('');
|
||||
$('#searchMapping').val('');
|
||||
$('#ownerValue').val('');
|
||||
|
||||
initSearchHousehold();
|
||||
};
|
||||
|
||||
const searchHouseholdList = (pageNo,regionMainCode) => {
|
||||
@@ -214,6 +218,16 @@
|
||||
</tr>
|
||||
`);
|
||||
});
|
||||
|
||||
// nodata 처리
|
||||
if (!$(response.content).length) {
|
||||
tbody.append(`
|
||||
<tr>
|
||||
<td colspan="8" class="text-center text-muted">임가정보가 존재하지 않습니다.</td>
|
||||
</tr>
|
||||
`);
|
||||
}
|
||||
|
||||
// Pagination 구성하기
|
||||
const paging = $('.mapping-paging');
|
||||
paging.empty();
|
||||
@@ -271,6 +285,11 @@
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const initSearchHousehold = () => {
|
||||
const regionMainCode = document.querySelector('[name="regionMainCode"]')?.value || '';
|
||||
searchHouseholdList(0, regionMainCode);
|
||||
};
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -121,7 +121,7 @@
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionMainCode" required>
|
||||
<option value="">전체</option>
|
||||
<option value="">선택</option>
|
||||
<option th:each="item : ${regionMainList}"
|
||||
th:value="${item.id}"
|
||||
th:text="${item.codeText}">
|
||||
@@ -132,7 +132,7 @@
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionSubCode" id="regionSubCode" required>
|
||||
<option value="">전체</option>
|
||||
<option value="">선택</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -140,7 +140,7 @@
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="regionDetailCode" id="regionDetailCode" required>
|
||||
<option value="">전체</option>
|
||||
<option value="">선택</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -160,7 +160,7 @@
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="industryLargeCode" id="industryLargeCode">
|
||||
<option value="">전체</option>
|
||||
<option value="">선택</option>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -168,7 +168,7 @@
|
||||
<td>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="industryMiddleCode" id="industryMiddleCode">
|
||||
<option value="">전체</option>>
|
||||
<option value="">선택</option>>
|
||||
</select>
|
||||
</div>
|
||||
</td>
|
||||
@@ -320,7 +320,8 @@
|
||||
setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode'
|
||||
childSelector: '#regionDetailCode',
|
||||
defaultOptionText: '선택'
|
||||
});
|
||||
|
||||
// 업종 대분류, 중분류 셀렉트박스 세팅
|
||||
@@ -328,6 +329,7 @@
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
defaultOptionText: '선택'
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -307,22 +307,27 @@
|
||||
|
||||
$(document).ready(function () {
|
||||
// 지역, 세부지역 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
setSelectBoxUiCode({
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode',
|
||||
defaultOptionText: '전체',
|
||||
selectedParentCode: selectedRegionSubCode,
|
||||
selectedChildCode: selectedRegionDetailCode
|
||||
});
|
||||
|
||||
// 업종 대분류, 중분류 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
selectedParentCode: selectedIndustryLargeCode,
|
||||
selectedChildCode: selectedIndustryMiddleCode
|
||||
});
|
||||
// 업종 대분류, 중분류 셀렉트박스 세팅
|
||||
setSelectBoxUiCode({
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
defaultOptionText: '전체',
|
||||
selectedParentCode: selectedIndustryLargeCode,
|
||||
selectedChildCode: selectedIndustryMiddleCode
|
||||
});
|
||||
|
||||
// 최초 리스트 로드
|
||||
getHouseholds(document.reqForm.page.value);
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -409,9 +414,6 @@
|
||||
'json'
|
||||
);
|
||||
}
|
||||
|
||||
// 최초 리스트 로드
|
||||
getHouseholds(document.reqForm.page.value);
|
||||
</script>
|
||||
|
||||
<script th:inline="javascript">
|
||||
|
||||
@@ -191,9 +191,6 @@
|
||||
<h3>지출 <strong>(<span id="expenseCount">0</span>건)</strong></h3>
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn small">
|
||||
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
<button type="button" class="btn small">
|
||||
<span class="btn-txt">
|
||||
<label class="radio-inner">
|
||||
|
||||
@@ -313,7 +313,7 @@
|
||||
<div class="input-textarea-field">
|
||||
<textarea id="memo" name="memo" class="textarea"
|
||||
placeholder=""
|
||||
th:value="${householdInfo.memo}"></textarea>
|
||||
th:text="${householdInfo.memo}"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
@@ -353,6 +353,7 @@
|
||||
codeList: regionList,
|
||||
parentSelector: '#regionSubCode',
|
||||
childSelector: '#regionDetailCode',
|
||||
defaultOptionText: '선택',
|
||||
selectedParentCode: selectedRegionSubCode,
|
||||
selectedChildCode: selectedRegionDetailCode
|
||||
});
|
||||
@@ -362,6 +363,7 @@
|
||||
codeList: industryLargeList,
|
||||
parentSelector: '#industryLargeCode',
|
||||
childSelector: '#industryMiddleCode',
|
||||
defaultOptionText: '선택',
|
||||
selectedParentCode: selectedIndustryLargeCode,
|
||||
selectedChildCode: selectedIndustryMiddleCode
|
||||
});
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
</div>
|
||||
<div class="component-btns">
|
||||
<div class="btns-row">
|
||||
<button type="button" class="btn" onclick="goInit();">
|
||||
<button type="button" class="btn" onclick="location.href = location.pathname">
|
||||
<span class="btn-txt">초기화</span>
|
||||
</button>
|
||||
<button type="button" class="btn btn-primary" onclick="goSearch();" >
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="password" id="floatingPassword" name="password" placeholder="비밀번호 입력">
|
||||
<input type="password" id="floatingPassword" name="password" placeholder="비밀번호 입력" maxlength="5">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user