Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-07-11 14:47:25 +09:00
4 changed files with 60 additions and 84 deletions

View File

@@ -128,10 +128,10 @@
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button class="btn" onclick="showAdminExcelUploadModal();" type="button">
<button class="btn" onclick="showAdminExcelUploadModal();" type="button" th:unless="${activeProfile != 'local'}">
<span class="btn-txt">엑셀 업로드</span>
</button>
<button class="btn" onclick="goExcel();" type="button"><span class="btn-txt">엑셀 다운로드</span></button>
<button class="btn" onclick="goExcel();" type="button"><span class="btn-txt" th:unless="${activeProfile != 'local'}">엑셀 다운로드</span></button>
<button class="btn" onclick="location.href='/settings/admins/create';" type="button"><span class="btn-txt">등록</span></button>
<button class="btn" onclick="goRemove();" type="button"><span class="btn-txt">삭제</span></button>
</div>

View File

@@ -4,7 +4,7 @@
xmlns:sec="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<section layout:fragment="content">
<section layout:fragment="content" th:unless="${activeProfile != 'local'}">
<div class="d-flex-tit">
<hgroup class="page-tit-group">
<h2 class="page-tit" id="recordMonthText">
@@ -402,10 +402,12 @@
null
);
}
const activeProfile = '[[${activeProfile}]]';
// 페이지 로드 시 호출
$(document).ready(function() {
getTotalPercentage();
if(activeProfile === 'local'){
getTotalPercentage();
}
$('#usageType').change(function() {
getTotalPercentage();
});

View File

@@ -137,47 +137,46 @@
</select>
</div>
</div>
<!-- TODO : 2차 오픈 -->
<!-- <div class="input-group">-->
<!-- <div class="d-flex">-->
<!-- <div class="component-select">-->
<!-- <div class="input-label">-->
<!-- <p class="label-txt">-->
<!-- 당일 1차 방문-->
<!-- </p>-->
<!-- </div>-->
<!-- <select class="select-list" name="isFirstVisited" th:field="*{isFirstVisited}">-->
<!-- <option value="">전체</option>-->
<!-- <option value="true">방문</option>-->
<!-- <option value="false">미방문</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="component-select">-->
<!-- <div class="input-label">-->
<!-- <p class="label-txt">-->
<!-- 당월 2차 방문-->
<!-- </p>-->
<!-- </div>-->
<!-- <select class="select-list" name="isSecondVisited" th:field="*{isSecondVisited}">-->
<!-- <option value="">전체</option>-->
<!-- <option value="true">방문</option>-->
<!-- <option value="false">미방문</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="component-select">-->
<!-- <div class="input-label">-->
<!-- <p class="label-txt">-->
<!-- 답례품 방문-->
<!-- </p>-->
<!-- </div>-->
<!-- <select class="select-list" name="isGiftSent" th:field="*{isGiftSent}">-->
<!-- <option value="">전체</option>-->
<!-- <option value="true">전달</option>-->
<!-- <option value="false">미전달</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="input-group">
<div class="d-flex">
<div class="component-select">
<div class="input-label">
<p class="label-txt">
당일 1차 방문
</p>
</div>
<select class="select-list" name="isFirstVisited" th:field="*{isFirstVisited}">
<option value="">전체</option>
<option value="true">방문</option>
<option value="false">미방문</option>
</select>
</div>
<div class="component-select">
<div class="input-label">
<p class="label-txt">
당월 2차 방문
</p>
</div>
<select class="select-list" name="isSecondVisited" th:field="*{isSecondVisited}">
<option value="">전체</option>
<option value="true">방문</option>
<option value="false">미방문</option>
</select>
</div>
<div class="component-select">
<div class="input-label">
<p class="label-txt">
답례품 방문
</p>
</div>
<select class="select-list" name="isGiftSent" th:field="*{isGiftSent}">
<option value="">전체</option>
<option value="true">전달</option>
<option value="false">미전달</option>
</select>
</div>
</div>
</div>
<div class="input-group">
<div class="input-label">
@@ -253,10 +252,9 @@
<th>업종(대분류)</th>
<th>업종(중분류)</th>
<th>당월 일계부 현황</th>
<!-- TODO : 2차 오픈 -->
<!-- <th>당월 1차 임가방문</th>-->
<!-- <th>당월 2차 임가방문</th>-->
<!-- <th>답례품 전달</th>-->
<th>당월 1차 임가방문</th>
<th>당월 2차 임가방문</th>
<th>답례품 전달</th>
<th class="hide-role-researcher">조사원</th>
<th class="hide-role-researcher">조사원 휴대전화</th>
</tr>
@@ -270,12 +268,12 @@
<!-- 페이지네이션 -->
<div class="row paging"></div>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn" onclick="showExcelHouseholdModal();">
<button type="button" class="btn" onclick="showExcelHouseholdModal();" th:unless="${activeProfile != 'local'}">
<span class="btn-txt">엑셀 업로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn" onclick="showExcelDownloadModal();">
<button type="button" class="btn" onclick="showExcelDownloadModal();" th:unless="${activeProfile != 'local'}">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
</button>
<!-- 관리자만 노출 -->
@@ -366,6 +364,9 @@
<td>${ct.regionDetailName}</td><!-- 세부지역 -->
<td>${ifNullHyphen(ct.industryLargeName)}</td><!-- 업종 대분류 -->
<td>${ifNullHyphen(ct.industryMiddleName)}</td><!-- 업종 중분류1 -->
<td>${ifNullHyphen(ct.firstVisitDate)}</td><!-- 1차방문날짜 -->
<td>${ifNullHyphen(ct.secondVisitDate)}</td><!-- 2차방문날짜 -->
<td>${ct.isGiftSent ? "전달" : "미전달"}</td> <!-- 답례품 -->
<td>${ct.progressPercent}%</td><!-- 임가 진행 상황 -->
<td class="hide-role-researcher">${ifNullHyphen(ct.researcherName)}</td> <!-- 조사원이름 -->
<td class="hide-role-researcher">${ifNullHyphen(ct.researcherPhone)}</td> <!-- 조사원번호 -->
@@ -374,37 +375,10 @@
);
});
<!-- TODO : 2차 오픈 -->
// `
// <tr>
// <td>
// <div class="component-input">
// <label class="checkbox-inner">
// <input type="checkbox" id="chkBox_${ct.householdSeq}" name="chkBox" value="${ct.householdSeq}">
// </label>
// </div>
// </td>
// <td class="underline"><a href="/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdNum}</a></td><!-- 임가번호 -->
// <td class="underline"><a href="/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdName}</a></td><!-- 경영주 이름 -->
// <td>${ct.householdPhone}</td><!-- 경영주 번호 -->
// <td>${ct.regionMainName}</td><!-- 실사 -->
// <td>${ct.regionSubName}</td><!-- 지역 -->
// <td>${ct.regionDetailName}</td><!-- 세부지역 -->
// <td>${ifNullHyphen(ct.industryLargeName)}</td><!-- 업종 대분류 -->
// <td>${ifNullHyphen(ct.industryMiddleName)}</td><!-- 업종 중분류1 -->
// <td>${ct.progressPercent}%</td><!-- 임가 진행 상황 -->
// <td>${ifNullHyphen(ct.firstVisitDate)}</td><!-- 1차방문날짜 -->
// <td>${ifNullHyphen(ct.secondVisitDate)}</td><!-- 2차방문날짜 -->
// <td>${ct.isGiftSent ? "전달" : "미전달"}</td> <!-- 답례품 -->
// <td class="hide-role-researcher">${ifNullHyphen(ct.researcherName)}</td> <!-- 조사원이름 -->
// <td class="hide-role-researcher">${ifNullHyphen(ct.researcherPhone)}</td> <!-- 조사원번호 -->
// </tr>
// `
// 현재 로그인한 유저의 역할
const isResearcher = f.userRole.value === 'ROLE_RESEARCHER';
// const colspanLength = isResearcher ? 13 : 15; <!-- TODO : 2차 오픈 -->
const colspanLength = isResearcher ? 10 : 12;
const colspanLength = isResearcher ? 13 : 15;
// 조사원일 경우 조사원이름, 번호 칼럼 hide
$('.hide-role-researcher').toggle(!isResearcher);

View File

@@ -56,7 +56,7 @@
<div class="component-tab" data-active="tab1">
<div class="tab-head">
<button type="button" class="tab-label" data-tab-value="tab1">담당 임가 목록</button>
<button type="button" class="tab-label" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">임가방문정보</button>
<button type="button" class="tab-label" data-tab-value="tab2">임가방문정보</button>
<div class="component-select select-date" id="monthTab2" style="display: none;">
<select name="searchMonth" class="select-list search-month-container" onchange="getHouseholdVisitList();">
<option th:each="month : ${monthList}"
@@ -78,7 +78,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>총 <strong id="household-totalElements"></strong>건</h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn small" th:data-researcher-seq="${researcherDto.seq}" th:data-region-main-code="${researcherDto.regionMainCode}" th:data-researcher-name="${researcherDto.name}" onclick="showHouseholdModal(this)">
<span class="btn-txt">임가 매핑</span>
@@ -107,7 +107,7 @@
<div class="row paging"></div>
</div>
</div>
<div class="tab-content" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">
<div class="tab-content" data-tab-value="tab2">
<div class="content-inner">
<article class="summary-area">
<ul>