Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-04 14:07:09 +09:00
11 changed files with 79 additions and 5 deletions

View File

@@ -78,9 +78,6 @@
<h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn small">
<span class="btn-txt">
<label class="radio-inner">
@@ -112,6 +109,7 @@
<th>단위</th>
<th>현금(원)</th>
<th>현물평가액</th>
<th>영수증</th>
<th>최종 수정자</th>
</tr>
</thead>
@@ -219,6 +217,7 @@
<th>단위</th>
<th>현금(원)</th>
<th>현물평가액</th>
<th>영수증</th>
<th>최종 수정자</th>
</tr>
</thead>
@@ -514,6 +513,9 @@
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td class="align-center">
${item.fileId ? `<a href="${item.attachmentURL}" download>다운로드</a>` : '-'}
</td>
<td>
${item.updatedBy}<br>
(${item.updatedAt})
@@ -605,6 +607,9 @@
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td class="align-center">
${item.fileId ? `<a href="${item.attachmentURL}" download>다운로드</a>` : '-'}
</td>
<td>
${item.updatedBy}<br>
(${item.updatedAt})