Merge branch 'bo_fixes' into 'dev'
[BO] 수정사항 반영 See merge request korea-research/korea-research!110
This commit is contained in:
@@ -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
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user