Merge branch 'dev' into bo_daily

# Conflicts:
#	admin/src/main/resources/templates/households/{seq}.html
This commit is contained in:
김현주
2025-07-02 16:39:06 +09:00
78 changed files with 2284 additions and 1353 deletions

View File

@@ -200,6 +200,12 @@
<!-- 임산물현황등록 모달 -->
<th:block th:replace="households/modal/modal-forest-product :: modalFragment"/>
<!-- 은행자동이체(수입) 모달 -->
<th:block th:replace="households/modal/modal-bank-auto-transfer-income :: modalFragment"/>
<!-- 은행자동이체(지출) 모달 -->
<th:block th:replace="households/modal/modal-bank-auto-transfer-expense :: modalFragment"/>
</section>
<section layout:fragment="script">
@@ -233,16 +239,23 @@
<script>
const tabStorageName = 'tabActive';
const monthStorageName = 'recordMonth';
let tabActive = 'tab1';
let tabMonth = document.reqForm.recordMonth.value;
window.onpageshow = function (event) {
if (event.persisted || (window.performance && window.performance.navigation.type == 1)) {
if (('sessionStorage' in window) && window['sessionStorage'] !== null) {
if (sessionStorage.getItem(tabStorageName)) {
tabActive = sessionStorage.getItem(tabStorageName);
}
if (sessionStorage.getItem(monthStorageName)) {
tabMonth = sessionStorage.getItem(monthStorageName);
document.reqForm.recordMonth.value = tabMonth;
}
}
} else if (event.persisted || (window.performance && window.performance.navigation.type == 2)) {
sessionStorage.removeItem(tabStorageName);
sessionStorage.removeItem(monthStorageName);
}
}
@@ -267,7 +280,7 @@
const selectedTab = document.querySelector('.tab-label[aria-selected="true"]');
if (!selectedTab) return;
getTabData(selectedTab.dataset.tabType);
getTabData(selectedTab.dataset.tabType, selectedTab.dataset.tabValue);
}
const getTabData = (tabType, tabValue) => {
@@ -287,6 +300,7 @@
}
sessionStorage.setItem(tabStorageName, tabValue);
sessionStorage.setItem(monthStorageName, document.reqForm.recordMonth.value);
document.querySelector('.component-tab').ui.setValue(tabValue);
@@ -397,6 +411,22 @@
wrap.querySelector('.component-input').classList.remove('input-disabled');
}
}
// 직접입력 선택시 input 활성화
const selectedSelf = (el) => {
const tr = el.closest('tr');
const unitArea = tr.querySelector('.self-input');
const unitInput = tr.querySelector('.self-input input');
if (el.value?.endsWith('.self')) {
unitInput.disabled = false;
unitArea.classList.remove('input-disabled');
} else {
unitInput.disabled = true;
unitInput.value = '';
unitArea.classList.add('input-disabled');
}
}
</script>
<script>