| 외상 또는 카드 구입 여부 |
@@ -159,10 +186,156 @@
form.price.value = '';
form.estimatedValue.value = '';
+ const currentDateStr = form.currentDate ? form.currentDate.value : ''; // "2025-08-09"
+ const selectedGroupNo = form.selectedGroupNo ? form.selectedGroupNo.value : ''; // "2025-08-09"
+ const startYear = form.startYear ? parseInt(form.startYear.value, 10) : 2024;
+ const startMonth = form.startMonth ? parseInt(form.startMonth.value, 10) : 8;
+
+ // 오늘 Y/M/D 파싱
+ const ymd = /^(\d{4})-(\d{2})-(\d{2})$/.exec(currentDateStr);
+ const cur = ymd ? { y: +ymd[1], m: +ymd[2], d: +ymd[3] } : { y: null, m: null, d: null };
+ if (!cur.y || !cur.m || !cur.d) return;
+
+ // selectedGroupNo가 있으면 초기 연/월은 #recordMonthStr(value: "yyyyMM")에서 취득
+ let baseY = cur.y, baseM = cur.m;
+ if (selectedGroupNo) {
+ const rmSel = document.getElementById('recordMonthStr');
+ const rmVal = rmSel?.value || '';
+ const rm = /^(\d{4})(\d{2})$/.exec(rmVal);
+ if (rm) { baseY = +rm[1]; baseM = +rm[2]; }
+ }
+
+ // 연/월 셀렉트 요소
+ const yearSel = form.targetYear;
+ const monthSel = form.targetMonth;
+ const daySel = form.targetDayGroup;
+
+ // 일자 그룹 정의(1~17)
+ const DAY_GROUPS = [
+ { groupNo: 1, startDay: 1, endDay: 2 },
+ { groupNo: 2, startDay: 3, endDay: 4 },
+ { groupNo: 3, startDay: 5, endDay: 6 },
+ { groupNo: 4, startDay: 7, endDay: 7 },
+ { groupNo: 5, startDay: 8, endDay: 9 },
+ { groupNo: 6, startDay: 10, endDay: 11 },
+ { groupNo: 7, startDay: 12, endDay: 13 },
+ { groupNo: 8, startDay: 14, endDay: 14 },
+ { groupNo: 9, startDay: 15, endDay: 16 },
+ { groupNo: 10, startDay: 17, endDay: 18 },
+ { groupNo: 11, startDay: 19, endDay: 20 },
+ { groupNo: 12, startDay: 21, endDay: 21 },
+ { groupNo: 13, startDay: 22, endDay: 23 },
+ { groupNo: 14, startDay: 24, endDay: 25 },
+ { groupNo: 15, startDay: 26, endDay: 27 },
+ { groupNo: 16, startDay: 28, endDay: 29 },
+ { groupNo: 17, startDay: 30, endDay: 31 },
+ ];
+ const daysInMonth = (y, m) => new Date(y, m, 0).getDate();
+ const findGroupNoByDay = (day) => {
+ const g = DAY_GROUPS.find(g => day >= g.startDay && day <= g.endDay);
+ return g ? g.groupNo : null;
+ };
+
+ // 연도 옵션: startYear ~ currentDate.year
+ function fillYears(preselectYear) {
+ if (!yearSel) return;
+ yearSel.innerHTML = '';
+ for (let y = startYear; y <= cur.y; y++) {
+ const opt = document.createElement('option');
+ opt.value = String(y);
+ opt.textContent = `${y}년`;
+ yearSel.appendChild(opt);
+ }
+ // 선택: selectedGroupNo 있으면 baseY, 없으면 cur.y
+ const pickY = (typeof preselectYear === 'number') ? preselectYear : cur.y;
+ yearSel.value = String(pickY);
+ }
+
+ // 월 옵션: (startYear → startMonth~12), (cur.y → 1~cur.m), (그 외 과거연도 → 1~12)
+ function fillMonths(year, preselectMonth) {
+ if (!monthSel) return;
+ monthSel.innerHTML = '';
+ let from = 1, to = 12;
+ if (year === startYear) from = startMonth;
+ if (year === cur.y) to = cur.m;
+
+ for (let m = from; m <= to; m++) {
+ const opt = document.createElement('option');
+ opt.value = String(m);
+ opt.textContent = `${m}월`;
+ monthSel.appendChild(opt);
+ }
+ // 선택: selectedGroupNo 있으면 baseM, 없으면 cur.m (범위 밖이면 첫 항목)
+ const candidate = (typeof preselectMonth === 'number') ? preselectMonth : cur.m;
+ monthSel.value = (candidate >= from && candidate <= to)
+ ? String(candidate)
+ : (monthSel.options[0]?.value || '');
+ }
+
+ // 일자그룹 옵션: 존재 & 미래 제외
+ function fillDayGroups(year, month, preselectGroupNo) {
+ if (!daySel) return;
+ daySel.innerHTML = '';
+
+ // "선택하세요" 옵션 추가
+ const placeholder = document.createElement('option');
+ placeholder.value = '';
+ placeholder.textContent = '선택하세요';
+ daySel.appendChild(placeholder);
+
+ const dim = daysInMonth(year, month);
+ const isCurYM = (year === cur.y && month === cur.m);
+ const maxDay = isCurYM ? cur.d : dim;
+
+ const candidates = DAY_GROUPS
+ .filter(g => g.endDay <= dim)
+ .filter(g => g.startDay <= maxDay);
+
+ candidates.forEach(g => {
+ const opt = document.createElement('option');
+ opt.value = String(g.groupNo);
+ opt.textContent = (g.startDay === g.endDay) ? `${g.startDay}일` : `${g.startDay}~${g.endDay}일`;
+ daySel.appendChild(opt);
+ });
+
+ // 선택 우선순위: 전달된 groupNo가 리스트에 있으면 → 그것, 아니면 첫 항목
+ let pick = preselectGroupNo ? String(preselectGroupNo) : '';
+ if (pick && ![...daySel.options].some(o => o.value === pick)) pick = '';
+ if (!pick) pick = daySel.options[0]?.value || '';
+ if (pick) daySel.value = pick;
+ }
+
+ // ----- 초기 세팅 -----
+ // 1) 연도/월 옵션은 currentDate 기준으로 생성
+ fillYears(selectedGroupNo ? baseY : undefined);
+ fillMonths(parseInt(yearSel.value, 10), selectedGroupNo ? baseM : undefined);
+
+ // 2) 일자그룹 선택값 계산
+ const initGroupNo = selectedGroupNo
+ ? parseInt(selectedGroupNo, 10)
+ : findGroupNoByDay(cur.d);
+
+ fillDayGroups(parseInt(yearSel.value, 10), parseInt(monthSel.value, 10), initGroupNo);
+
+ // ----- 이벤트 -----
+ yearSel?.addEventListener('change', function () {
+ const y = parseInt(this.value, 10);
+ // selectedGroupNo가 있으면 월 선택은 baseM 유지 시도(범위 밖이면 첫 항목)
+ fillMonths(y, selectedGroupNo ? baseM : undefined);
+ // 일그룹: selectedGroupNo 우선(존재하지 않으면 폴백)
+ fillDayGroups(y, parseInt(monthSel.value, 10), selectedGroupNo ? parseInt(selectedGroupNo, 10) : undefined);
+ });
+
+ monthSel?.addEventListener('change', function () {
+ const y = parseInt(yearSel.value, 10);
+ fillDayGroups(y, parseInt(this.value, 10), selectedGroupNo ? parseInt(selectedGroupNo, 10) : undefined);
+ });
+
document.getElementById('isCredit_N').checked = true;
priceDisabledReset(form.price, form.estimatedValue);
}
+
// 일계부 상세 값 set
const setDailyExpenseFormData = (data) => {
const form = document.reqExpenseForm;
@@ -199,6 +372,11 @@
mf.groupNo.value = document.reqForm.groupNo.value;
mf.dailyId.value = document.reqForm.dailyId.value;
mf.id.value = (id === undefined) ? '' : id;
+ // if(id === undefined){
+ // mf.selectedGroupNo.value = null;
+ // } else {
+ mf.selectedGroupNo.value = document.reqForm.groupNo.value;
+ // }
resetDailyExpenseForm();
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html
index ade463cb..0fa875e7 100644
--- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html
+++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html
@@ -10,6 +10,10 @@
+
+
+
+
@@ -31,7 +35,28 @@
+
+ | 등록일 |
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
| 외상판매 여부 |
@@ -172,6 +197,151 @@
form.price.value = '';
form.estimatedValue.value = '';
+ const currentDateStr = form.currentDate ? form.currentDate.value : ''; // "2025-08-09"
+ const selectedGroupNo = form.selectedGroupNo ? form.selectedGroupNo.value : ''; // "2025-08-09"
+ const startYear = form.startYear ? parseInt(form.startYear.value, 10) : 2024;
+ const startMonth = form.startMonth ? parseInt(form.startMonth.value, 10) : 8;
+
+ // 오늘 Y/M/D 파싱
+ const ymd = /^(\d{4})-(\d{2})-(\d{2})$/.exec(currentDateStr);
+ const cur = ymd ? { y: +ymd[1], m: +ymd[2], d: +ymd[3] } : { y: null, m: null, d: null };
+ if (!cur.y || !cur.m || !cur.d) return;
+
+ // selectedGroupNo가 있으면 초기 연/월은 #recordMonthStr(value: "yyyyMM")에서 취득
+ let baseY = cur.y, baseM = cur.m;
+ if (selectedGroupNo) {
+ const rmSel = document.getElementById('recordMonthStr');
+ const rmVal = rmSel?.value || '';
+ const rm = /^(\d{4})(\d{2})$/.exec(rmVal);
+ if (rm) { baseY = +rm[1]; baseM = +rm[2]; }
+ }
+
+ // 연/월 셀렉트 요소
+ const yearSel = form.targetYear;
+ const monthSel = form.targetMonth;
+ const daySel = form.targetDayGroup;
+
+ // 일자 그룹 정의(1~17)
+ const DAY_GROUPS = [
+ { groupNo: 1, startDay: 1, endDay: 2 },
+ { groupNo: 2, startDay: 3, endDay: 4 },
+ { groupNo: 3, startDay: 5, endDay: 6 },
+ { groupNo: 4, startDay: 7, endDay: 7 },
+ { groupNo: 5, startDay: 8, endDay: 9 },
+ { groupNo: 6, startDay: 10, endDay: 11 },
+ { groupNo: 7, startDay: 12, endDay: 13 },
+ { groupNo: 8, startDay: 14, endDay: 14 },
+ { groupNo: 9, startDay: 15, endDay: 16 },
+ { groupNo: 10, startDay: 17, endDay: 18 },
+ { groupNo: 11, startDay: 19, endDay: 20 },
+ { groupNo: 12, startDay: 21, endDay: 21 },
+ { groupNo: 13, startDay: 22, endDay: 23 },
+ { groupNo: 14, startDay: 24, endDay: 25 },
+ { groupNo: 15, startDay: 26, endDay: 27 },
+ { groupNo: 16, startDay: 28, endDay: 29 },
+ { groupNo: 17, startDay: 30, endDay: 31 },
+ ];
+ const daysInMonth = (y, m) => new Date(y, m, 0).getDate();
+ const findGroupNoByDay = (day) => {
+ const g = DAY_GROUPS.find(g => day >= g.startDay && day <= g.endDay);
+ return g ? g.groupNo : null;
+ };
+
+ // 연도 옵션: startYear ~ currentDate.year
+ function fillYears(preselectYear) {
+ if (!yearSel) return;
+ yearSel.innerHTML = '';
+ for (let y = startYear; y <= cur.y; y++) {
+ const opt = document.createElement('option');
+ opt.value = String(y);
+ opt.textContent = `${y}년`;
+ yearSel.appendChild(opt);
+ }
+ // 선택: selectedGroupNo 있으면 baseY, 없으면 cur.y
+ const pickY = (typeof preselectYear === 'number') ? preselectYear : cur.y;
+ yearSel.value = String(pickY);
+ }
+
+ // 월 옵션: (startYear → startMonth~12), (cur.y → 1~cur.m), (그 외 과거연도 → 1~12)
+ function fillMonths(year, preselectMonth) {
+ if (!monthSel) return;
+ monthSel.innerHTML = '';
+ let from = 1, to = 12;
+ if (year === startYear) from = startMonth;
+ if (year === cur.y) to = cur.m;
+
+ for (let m = from; m <= to; m++) {
+ const opt = document.createElement('option');
+ opt.value = String(m);
+ opt.textContent = `${m}월`;
+ monthSel.appendChild(opt);
+ }
+ // 선택: selectedGroupNo 있으면 baseM, 없으면 cur.m (범위 밖이면 첫 항목)
+ const candidate = (typeof preselectMonth === 'number') ? preselectMonth : cur.m;
+ monthSel.value = (candidate >= from && candidate <= to)
+ ? String(candidate)
+ : (monthSel.options[0]?.value || '');
+ }
+
+ // 일자그룹 옵션: 존재 & 미래 제외
+ function fillDayGroups(year, month, preselectGroupNo) {
+ if (!daySel) return;
+ daySel.innerHTML = '';
+
+ // "선택하세요" 옵션 추가
+ const placeholder = document.createElement('option');
+ placeholder.value = '';
+ placeholder.textContent = '선택하세요';
+ daySel.appendChild(placeholder);
+
+ const dim = daysInMonth(year, month);
+ const isCurYM = (year === cur.y && month === cur.m);
+ const maxDay = isCurYM ? cur.d : dim;
+
+ const candidates = DAY_GROUPS
+ .filter(g => g.endDay <= dim)
+ .filter(g => g.startDay <= maxDay);
+
+ candidates.forEach(g => {
+ const opt = document.createElement('option');
+ opt.value = String(g.groupNo);
+ opt.textContent = (g.startDay === g.endDay) ? `${g.startDay}일` : `${g.startDay}~${g.endDay}일`;
+ daySel.appendChild(opt);
+ });
+
+ // 선택 우선순위: 전달된 groupNo가 리스트에 있으면 → 그것, 아니면 첫 항목
+ let pick = preselectGroupNo ? String(preselectGroupNo) : '';
+ if (pick && ![...daySel.options].some(o => o.value === pick)) pick = '';
+ if (!pick) pick = daySel.options[0]?.value || '';
+ if (pick) daySel.value = pick;
+ }
+
+ // ----- 초기 세팅 -----
+ // 1) 연도/월 옵션은 currentDate 기준으로 생성
+ fillYears(selectedGroupNo ? baseY : undefined);
+ fillMonths(parseInt(yearSel.value, 10), selectedGroupNo ? baseM : undefined);
+
+ // 2) 일자그룹 선택값 계산
+ const initGroupNo = selectedGroupNo
+ ? parseInt(selectedGroupNo, 10)
+ : findGroupNoByDay(cur.d);
+
+ fillDayGroups(parseInt(yearSel.value, 10), parseInt(monthSel.value, 10), initGroupNo);
+
+ // ----- 이벤트 -----
+ yearSel?.addEventListener('change', function () {
+ const y = parseInt(this.value, 10);
+ // selectedGroupNo가 있으면 월 선택은 baseM 유지 시도(범위 밖이면 첫 항목)
+ fillMonths(y, selectedGroupNo ? baseM : undefined);
+ // 일그룹: selectedGroupNo 우선(존재하지 않으면 폴백)
+ fillDayGroups(y, parseInt(monthSel.value, 10), selectedGroupNo ? parseInt(selectedGroupNo, 10) : undefined);
+ });
+
+ monthSel?.addEventListener('change', function () {
+ const y = parseInt(yearSel.value, 10);
+ fillDayGroups(y, parseInt(this.value, 10), selectedGroupNo ? parseInt(selectedGroupNo, 10) : undefined);
+ });
+
document.getElementById('isCredit_N').checked = true;
priceDisabledReset(form.price, form.estimatedValue);
}
@@ -213,6 +383,11 @@
mf.groupNo.value = document.reqForm.groupNo.value;
mf.dailyId.value = document.reqForm.dailyId.value;
mf.id.value = (id === undefined) ? '' : id;
+ // if(id === undefined){
+ // mf.selectedGroupNo.value = null;
+ // } else {
+ mf.selectedGroupNo.value = document.reqForm.groupNo.value;
+ // }
resetDailyIncomeForm();
diff --git a/admin/src/main/resources/templates/households/modal/modal-excel-household.html b/admin/src/main/resources/templates/households/modal/modal-excel-household.html
index 8064e5fe..b9f08d83 100644
--- a/admin/src/main/resources/templates/households/modal/modal-excel-household.html
+++ b/admin/src/main/resources/templates/households/modal/modal-excel-household.html
@@ -6,37 +6,76 @@
|
${item.isCredit ? "Y" : "N"} |
${ifNullHyphen(item.cropText)} |
- ${ifNullHyphen(item.incomeKind)} |
+
+ ${ifNullHyphen(item.incomeKind)}
+ ${item.ocrErrorResult ? ' (확인필요)' : ''}
+ |
${ifNullHyphen(item.sourcePurpose)} |
${formatNumberWithComma(item.quantity)} |
${ifNullHyphen(item.unitText)} |
${formatNumberWithComma(item.price)} |
${formatNumberWithComma(item.estimatedValue)} |
- ${item.fileId ? `다운로드` : '-'}
+ ${item.fileId ? `다운로드` : '-'}
|
${item.updatedBy}
@@ -609,6 +613,8 @@
}
let tmpl = '';
+
+
$(data).each((idx, item) => {
tmpl +=
`
@@ -621,14 +627,16 @@
|
${item.isCredit ? "Y" : "N"} |
- ${ifNullHyphen(item.expenseKind)} |
+ ${ifNullHyphen(item.expenseKind)}
+ ${item.ocrErrorResult ? ' (확인필요)' : ''}
+ |
${ifNullHyphen(item.sourcePurpose)} |
${ifNullHyphen(item.quantity)} |
${ifNullHyphen(item.unitText)} |
${formatNumberWithComma(item.price)} |
${formatNumberWithComma(item.estimatedValue)} |
- ${item.fileId ? `다운로드` : '-'}
+ ${item.fileId ? `다운로드` : '-'}
|
${item.updatedBy}
@@ -853,7 +861,7 @@
const saveDaily = (el) => {
const currentStep = $(el).data('step');
const currentModalId = $(el).data('modalId');
- console.log('saveDaily', currentStep, currentModalId);
+ // console.log('saveDaily', currentStep, currentModalId);
if (currentStep === 'INCOME') {
showDailyIncomeModal();
@@ -874,7 +882,7 @@
const removeDaily = (el) => {
const currentStep = $(el).data('step');
const currentListId = $(el).data('listId');
- console.log('removeDaily', currentStep, currentListId);
+ // console.log('removeDaily', currentStep, currentListId);
if ($('#'+currentListId).find('input[type="checkbox"]:checked').length === 0) {
alert('삭제내용은 최소 1건은 선택해야 합니다.');
@@ -892,7 +900,7 @@
const obj = {};
obj.selectedIds = selectedValues;
obj.currentStep = currentStep;
- console.log(obj)
+ // console.log(obj)
etUI.dialog.confirm({
title: '삭제 안내',
@@ -910,6 +918,22 @@
},
});
}
+
+ const downloadFile = (url,type, title, num) => {
+ const houseHoldNum = document.getElementById("targetHouseHoldNum").innerText;
+ const yearMonth = document.getElementById("recordMonthStr").value;
+ let text = document.querySelector("h3._selectedGroupNo").innerText;
+ let day = text.match(/\d+/)[0].padStart(2, "0");
+ const changeFileName = houseHoldNum+"_"+yearMonth+""+day+"_"+type+"_"+title.replace(/\s+/g, "")+"_"+num.padStart(3, "0");
+
+ const urlReplace = `${url}?rename=${encodeURIComponent(changeFileName)}`;
+
+ const a = document.createElement("a");
+ a.href = urlReplace;
+ document.body.appendChild(a);
+ a.click();
+ a.remove();
+ }
| |