[FO] 일계부 숫자+도트 키보드 적용, 기타 공통 수정

This commit is contained in:
김현주
2025-06-19 09:44:15 +09:00
parent df76ae0623
commit 829069d296
15 changed files with 33 additions and 45 deletions

View File

@@ -5,7 +5,7 @@
<th:block>
<div class="modal-content-inner">
<div class="component-btns type-tab"
th:if="${not detail.updated}">
th:if="not ${detail.updated}">
<div class="btns-row">
<button type="button" class="btn active">수기 등록</button>
<!--/* TODO : 2차 오픈 */-->
@@ -13,7 +13,7 @@
</div>
</div>
<p class="form-desc">필지출력</p>
<p class="form-desc">필수입력</p>
<form name="reqModalForm">
<input type="hidden" name="inputType" th:value="${#strings.defaultString(detail.inputType, 'SELF')}">
<input type="hidden" name="id" th:value="${detail.id}">
@@ -79,7 +79,7 @@
</label>
</div>
<div class="input-field">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="quantity" name="quantity" th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -157,7 +157,6 @@
</ul>
</div>
</section>
</form>
<div class="component-btns">
<div class="btns-row">
@@ -166,6 +165,7 @@
</button>
</div>
</div>
</form>
</div>
</th:block>

View File

@@ -11,7 +11,7 @@
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]], <br>
</th:block>
<th:block th:if="not ${dailyRecord.startDay eq dailyRecord.endDay}">
[[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
</th:block>
<strong>지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록</strong> <br>
되었습니다.

View File

@@ -5,7 +5,7 @@
<th:block>
<div class="modal-content-inner">
<div class="component-btns type-tab"
th:if="${not detail.updated}">
th:if="not ${detail.updated}">
<div class="btns-row">
<button type="button" class="btn active">수기 등록</button>
<!--/* TODO : 2차 오픈 */-->
@@ -109,7 +109,7 @@
</label>
</div>
<div class="input-field">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="quantity" name="quantity" th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
</div>
<ul class="guide-info">
<li>예 : 2, 2.5</li>
@@ -187,7 +187,6 @@
</ul>
</div>
</section>
</form>
<div class="component-btns">
<div class="btns-row">
@@ -196,6 +195,7 @@
</button>
</div>
</div>
</form>
</div>
</th:block>

View File

@@ -11,7 +11,7 @@
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]], <br>
</th:block>
<th:block th:if="not ${dailyRecord.startDay eq dailyRecord.endDay}">
[[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
</th:block>
<strong>수입 내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록</strong> <br>
되었습니다.

View File

@@ -45,7 +45,7 @@
</label>
</div>
<div class="input-field type-hour">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="ownedHours" name="ownedHours" th:value="${detail.ownedHours}" maxlength="10" placeholder="자가에서 사용한 동력 사용시간을 입력해 주세요">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours" th:value="${detail.ownedHours}" maxlength="10" placeholder="자가에서 사용한 동력 사용시간을 입력해 주세요">
<span class="input-field-txt">시간</span>
</div>
</div>
@@ -57,12 +57,11 @@
</label>
</div>
<div class="input-field type-hour">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="leasedHours" name="ownedHours" th:value="${detail.ownedHours}" maxlength="10" placeholder="임차해서 사용한 동력 사용시간을 입력해 주세요">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="ownedHours" th:value="${detail.ownedHours}" maxlength="10" placeholder="임차해서 사용한 동력 사용시간을 입력해 주세요">
<span class="input-field-txt">시간</span>
</div>
</div>
</section>
</form>
<div class="component-btns">
<div class="btns-row">
@@ -71,6 +70,7 @@
</button>
</div>
</div>
</form>
</div>
</th:block>

View File

@@ -11,7 +11,7 @@
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]], <br>
</th:block>
<th:block th:if="not ${dailyRecord.startDay eq dailyRecord.endDay}">
[[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
</th:block>
<strong>동력 사용내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록</strong> <br>
되었습니다.
@@ -59,29 +59,16 @@
</div>
</div>
<ul class="detail-list">
<li th:if="${item.credit != null}">
<p>외상판매</p>
<span th:text="${item.credit ? '예' : '아니오'}">아니오</span>
equipmentName
<li th:if="${not #strings.isEmpty(item.ownedHours)}">
<p>자가 사용시간</p>
<span th:text="|${item.ownedHours}시간|">0시간</span>
</li>
<li th:if="${not #strings.isEmpty(item.cropLabel)}">
<p>재배형태</p>
<span th:text="${item.cropLabel}">재배형태</span>
</li>
<li th:if="${not #strings.isEmpty(item.sourcePurpose)}">
<p>수입원</p>
<span th:text="${item.sourcePurpose}">소비자</span>
</li>
<li th:if="${not #strings.isEmpty(item.quantity)}">
<p>수량</p>
<span th:text="|${item.quantity}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
</li>
<li th:if="${not #strings.isEmpty(item.price)}">
<p>현금 </p>
<span th:text="|${#numbers.formatInteger(item.price, 1, 'COMMA')}원|">302,000원</span>
</li>
<li th:if="${not #strings.isEmpty(item.estimatedValue)}">
<p>현물평가액</p>
<span th:text="|${#numbers.formatInteger(item.estimatedValue, 1, 'COMMA')}원|">302,000원</span>
<li th:if="${not #strings.isEmpty(item.leasedHours)}">
<p>임차 사용시간</p>
<span th:text="|${item.leasedHours}시간|">0시간</span>
</li>
</ul>
</div>