Merge branch 'kangsun' into 'dev'

[BO] 임가현황 리스트, 상세 작업 중 (2)

See merge request korea-research/korea-research!5
This commit is contained in:
이강선 매니저/ST
2025-06-13 10:16:42 +00:00
42 changed files with 644 additions and 86 deletions

View File

@@ -9,6 +9,9 @@
<input name="page" th:field="*{page}" type="hidden"/>
<input name="size" th:field="*{size}" type="hidden"/>
<input name="userRole" th:value="${userRole}" type="hidden"/>
<input name="userRegionMainCode" th:value="${userRegionMainCode}" type="hidden"/>
<div>
<label>입력월</label>
<select name="recordMonth" th:field="*{recordMonth}">
@@ -98,13 +101,15 @@
<option value="false">미전달</option>
</select>
<label>조사원</label>
<select name="researcherField" th:field="*{researcherField}">
<option value="">전체</option>
<option value="name">이름</option>
<option value="phone">전화번호</option>
</select>
<input type="text" name="researcherValue" placeholder="" th:field="*{researcherValue}">
<span class="hide-role-researcher">
<label>조사원</label>
<select name="researcherField" th:field="*{researcherField}">
<option value="">전체</option>
<option value="name">이름</option>
<option value="phone">전화번호</option>
</select>
<input type="text" name="researcherValue" placeholder="" th:field="*{researcherValue}">
</span>
<label>패널 유지 여부</label>
<select name="isPanel" th:field="*{isPanel}">
@@ -137,8 +142,8 @@
<th style="width: 100px;">1차 방문일</th>
<th style="width: 100px;">2차 방문일</th>
<th style="width: 100px;">답례품 전달</th>
<th style="width: 80px;">조사원</th>
<th style="width: 120px;">조사원 휴대전화</th>
<th style="width: 80px;" class="hide-role-researcher">조사원</th>
<th style="width: 120px;" class="hide-role-researcher">조사원 휴대전화</th>
</tr>
</thead>
<tbody id="listTBody">
@@ -195,8 +200,8 @@
<td>${isEmpty(ct.firstVisitDate)}</td> <!-- 1차방문날짜 -->
<td>${isEmpty(ct.secondVisitDate)}</td> <!-- 2차방문날짜 -->
<td>${ct.isGiftSent ? "전달" : "미전달"}</td> <!-- 답례품 -->
<td>${isEmpty(ct.researcherName)}</td> <!-- 조사원이름 -->
<td>${isEmpty(ct.researcherPhone)}</td> <!-- 조사원번호 -->
<td class="hide-role-researcher">${isEmpty(ct.researcherName)}</td> <!-- 조사원이름 -->
<td class="hide-role-researcher">${isEmpty(ct.researcherPhone)}</td> <!-- 조사원번호 -->
</tr>
`
);
@@ -210,6 +215,13 @@
`);
}
// 조사원일 경우 조사원이름, 번호 hide
if (f.userRole.value === 'ROLE_RESEARCHER') {
$('.hide-role-researcher').hide();
} else {
$('.hide-role-researcher').show();
}
// Pagination 구성하기
const paging = $('.paging');
paging.empty();
@@ -237,6 +249,7 @@
</script>
<script>
// TODO : 이거 공통으로 뺄지 ?
function isEmpty(value, fallback = '-') {
return value !== null && value !== undefined && value !== '' ? value : fallback;
}

View File

@@ -3,7 +3,121 @@
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<h1>/household/households/{seq}</h1>
<!-- 1. 상단 정보 -->
<form autocomplete="off" method="get" name="reqForm">
<div>
<table>
<tr>
<th>임가번호</th>
<td th:text="${householdInfo.householdNum}">16750</td>
<th>경영주</th>
<td th:text="${householdInfo.householdName}">홍길동</td>
<th>연령</th>
<td th:text="${householdInfo.householdAge}">75</td>
</tr>
<tr>
<th>가구 연락처</th>
<td th:text="${householdInfo.householdTel}">031-0000-0000</td>
<th>휴대전화</th>
<td th:text="${householdInfo.householdPhone}">010-0000-0000</td>
<th>실사</th>
<td th:text="${householdInfo.regionMainName}">서울</td>
</tr>
<tr>
<th>지역</th>
<td th:text="${householdInfo.regionSubName}">31. 경기도</td>
<th>세부지역</th>
<td th:text="${householdInfo.regionDetailName}">9. 경기</td>
<th>주소</th>
<td th:text="${householdInfo.address}">경기 성남시 분당구 삼평대로...</td>
</tr>
<tr>
<th>업종 대분류</th>
<td th:text="${householdInfo.industryLargeName}">40. 수실류재배업</td>
<th>업종 중분류1</th>
<td th:text="${householdInfo.industryMiddleName}">42. 대추재배업</td>
<th>업종 중분류2</th>
<td th:text="${householdInfo.industrySubMiddleName != null ? householdInfo.industrySubMiddleName : ''}">42. 대추재배업</td>
<th>규모/세부품목</th>
<td th:text="${householdInfo.industryDetailName != null ? householdInfo.industryDetailName : ''}">52_1. 조경수</td>
</tr>
<tr>
<th>조사원</th>
<td th:text="${householdInfo.researcherName}">김조사</td>
<th>조사원 연락처</th>
<td th:text="${householdInfo.researcherPhone}">010-1111-1111</td>
<th>유지여부</th>
<td th:text="${householdInfo.isPanel ? '1. 유지' : '2. 탈락'}">1. 유지</td>
</tr>
<tr>
<th>비고</th>
<td colspan="5" th:text="${householdInfo.memo}">비고 텍스트</td>
</tr>
</table>
</div>
</form>
<!-- 2. 버튼 -->
<div style="">
<button>수정</button>
<button>조사원 매핑</button>
</div>
<!-- 3. 탭 -->
<div style="margin-top: 50px;">
<button class="tab daily-record">일계부 등록 현황</button>
<button class="tab forest-product">임산물 현황</button>
<button class="tab bank-auto-transfer">은행자동이체 내역</button>
<button class="tab household-visit">임가방문정보</button>
<select name="recordMonth">
<option
th:each="m : ${monthList}" th:value="${m.value}" th:text="${m.label}">2025년 5월</option>
</select>
</div>
<!-- 4. 테이블 -->
<div class="table daily-record">
<span>
<span>작성완료: <span>0</span></span>
<span>미작성: <span>0</span></span>
<span>미완료: <span>0</span></span>
<span>대기: <span>0</span></span>
<span> 현황: <span>0</span>%</span>
</span>
<table border="1" style="margin-top: 50px;">
<thead>
<tr>
<th>입력날짜</th>
<th>완료상태</th>
<th>수입</th>
<th>노동투입</th>
<th>지출</th>
<th>동력사용시간</th>
<th>입업자가소비량</th>
<!-- <th>농업자가소비량</th>-->
</tr>
</thead>
<tbody>
<tr>
<td>1-2</td>
<td>작성완료</td>
<td>4건</td>
<td>등록없음</td>
<td>등록없음</td>
<td>2건</td>
<td>2건</td>
<!-- <td>대상아님</td>-->
</tr>
</tbody>
</table>
</div>
</section>
<section layout:fragment="script">
<script th:inline="javascript">
</script>
</section>
</html>