Merge branch 'daily' into dev

This commit is contained in:
김현주
2025-06-24 15:50:47 +09:00
32 changed files with 250 additions and 70 deletions

View File

@@ -82,8 +82,7 @@
</div>
<!--/* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 */-->
<div class="component-input"
th:if="${reqVO.groupNo eq 4 or reqVO.groupNo eq 8 or reqVO.groupNo eq 12
or reqVO.groupNo eq 16 or reqVO.groupNo eq 17}">
th:if="${dailyRecord.farmingOpen}">
<label class="switch-inner type-txt">
<span class="switch-label">농업생산물 중 자가소비량</span>
<input type="checkbox" name="farmingStatus" value="TARGET" data-target="farming"

View File

@@ -79,7 +79,7 @@
</div>
<div class="select-scroll">
<ul class="">
<li class="option" th:each="uiCode : ${recordUnit}"
<li class="option" th:each="uiCode : ${recordArea}"
th:data-value="${uiCode.id}"
th:text="${uiCode.codeText}"
th:selected="${uiCode.id eq detail.areaUnitCode ? 'current' : ''}"

View File

@@ -258,6 +258,12 @@
function (rstData, status) {
location.reload();
},
function () {
// 노동투입시간 invalid reset
$('.segment-label .guide-info li').eq(2).addClass('invalid');
$('.type-sub').find('.input-info').remove();
$('.input-flex-group').find('.input-info').remove();
}
);
},
};