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

This commit is contained in:
김현주
2025-06-23 14:10:20 +09:00
149 changed files with 2422 additions and 298 deletions

View File

@@ -521,30 +521,29 @@
const buttonGroupHtml = isEdit
? `
<div class="btn-group">
<button type="button" class="delete" onclick="formControl.deleteItemById(${product.id})">
<span class="hide-txt">삭제</span>
</button>
<button type="button" class="edit" onclick="formControl.editItemById(${product.id})">
<span class="hide-txt">수정</span>
</button>
</div>
`
<div class="btn-group">
<button type="button" class="delete" onclick="formControl.deleteItemById(${product.id})">
<span class="hide-txt">삭제</span>
</button>
<button type="button" class="edit" onclick="formControl.editItemById(${product.id})">
<span class="hide-txt">수정</span>
</button>
</div>
`
: '';
const itemHtml = `
<div class="item-tit-group">
<p class="item-name">${tagTitle}</p>
${buttonGroupHtml}
</div>
<ul class="detail-list">
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
${tagCount}
<li><p>현금</p><span>${format(product.price)}원</span></li>
</ul>
`;
<div class="item-tit-group">
<p class="item-name">${tagTitle}</p>
${buttonGroupHtml}
</div>
<ul class="detail-list">
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
${tagCount}
<li><p>현금</p><span>${format(product.price)}원</span></li>
</ul>
`;
const item = document.createElement('div');
item.className = 'list-item';

View File

@@ -49,8 +49,8 @@
<th:block th:each="item : ${transferCategoryList}">
<div class="component-input " th:data-option="${item.codeText}">
<div class="input-field">
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="수입 대상을 입력해 주세요." maxlength="30">
<div class="input-field" th:if="${item.id == 'code.bank.output.self'}">
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="지출의 종류를 입력해 주세요." maxlength="30">
</div>
<ul class="guide-info" th:if="${item.msgCode}">
<li class="txt-blue" th:text="${item.msgCode}"></li>