From f3f313a105ae0ee8e4e9964a6199f97994cc2655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=98=84=EC=84=B1=ED=95=84?= Date: Mon, 1 Dec 2025 15:38:28 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=88=98=EB=A3=8C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/sass/pages/_commission.scss | 68 +++++++- .../apps/commission/commissionManage.html | 155 +++++++++--------- 2 files changed, 139 insertions(+), 84 deletions(-) diff --git a/src/main/resources/static/sass/pages/_commission.scss b/src/main/resources/static/sass/pages/_commission.scss index 06a4c65..e2c31df 100644 --- a/src/main/resources/static/sass/pages/_commission.scss +++ b/src/main/resources/static/sass/pages/_commission.scss @@ -6,6 +6,12 @@ // ==================== Commission Management Page ==================== +// Commission Container +.commission-container { + max-width: 1400px; + margin: 0 auto; +} + .wrap { max-width: 1400px; margin: 0 auto; @@ -21,22 +27,24 @@ margin-bottom: $spacing-md; } +// Search Box .searchBox { - background: $gray-bg; - padding: $spacing-lg; + background: #f8f9fa; + padding: 20px; border-radius: $border-radius-md; - margin-bottom: $spacing-lg; + margin-top: 20px; + margin-bottom: 20px; &.row-two { display: flex; align-items: center; - gap: $spacing-lg; + gap: 20px; flex-wrap: wrap; } label { font-weight: $font-weight-medium; - color: $text-gray; + color: $text-dark; min-width: 80px; } @@ -52,23 +60,40 @@ .form-inline { display: flex; align-items: center; - gap: $spacing-sm; + gap: 10px; } .btnBox { margin-left: auto; + + .btn + .btn { + margin-left: 5px; + } +} + +// Print Button (initially hidden) +#printBtn { + display: none; +} + +// Notice Text +.commission-notice { + color: #dc3545; + margin-top: 30px; + line-height: 1.6; } .voffset3 { margin-top: 30px; } +// Color Utilities .color_red { color: $accent-orange; } .color_blue { - color: $primary-blue; + color: #007bff; } .color_darkRed { @@ -78,7 +103,7 @@ // Table Styles .table-responsive { overflow-x: auto; - margin-top: $spacing-3xl; + margin-top: 30px; } .table { @@ -112,9 +137,33 @@ } .border-type { - border: 2px solid $border-gray; + border: 2px solid #dee2e6; } +// Commission Tables +.commission-table-wrapper { + margin-top: 30px; + + .table { + border: 2px solid #dee2e6; + } +} + +// Summary Row +.summary-row { + background-color: #fff3cd !important; + + td { + font-weight: $font-weight-semibold; + } + + .summary-amount { + font-size: 16px; + color: #007bff; + } +} + +// Text Alignment Utilities .text-center { text-align: center; } @@ -127,6 +176,7 @@ text-align: left; } +// Background Utilities .bg-warning { background-color: #fff3cd !important; } diff --git a/src/main/resources/templates/views/apps/commission/commissionManage.html b/src/main/resources/templates/views/apps/commission/commissionManage.html index 6b85a04..698d204 100644 --- a/src/main/resources/templates/views/apps/commission/commissionManage.html +++ b/src/main/resources/templates/views/apps/commission/commissionManage.html @@ -1,73 +1,78 @@ + layout:decorate="~{layout/kjbank_title_layout}"> 수수료 관리 +
+
+ +

기관 수수료 관리

+
+
-
-
-

기관 수수료 관리

+
+ + + + + + + + + + + 년   + 월 + + + + + +
-
- - - - - - - - - - - 년   - 월 - - - - - -
-

+

+
+

이용기관은 매월 1~5일 전월 수수료 조회 가능하며, 10일 확정금액으로 정산됩니다.
금액이상시 담당자 연락 및 조정요청 하시기 바랍니다. (매월 1~5일 수수료 조회, 6~9일 수수료 조정 및 확정, 10일 정산)

-
- +
+
@@ -106,7 +111,7 @@
- +
@@ -153,7 +158,7 @@
- +
@@ -179,14 +184,14 @@ - + - + - +
합계 - --- - ---
@@ -259,11 +264,11 @@ ${formatNumber(item.totalCount || 0)} ${formatNumber(item.value || 0)} ${formatNumber(item.minimumAmount || 0)} - ${formatNumber(item.sum || 0)} - ${formatNumber(item.totalCount2 || 0)} + ${formatNumber(item.sum || 0)} + ${formatNumber(item.totalCount2 || 0)} ${formatNumber(item.value2 || 0)} ${formatNumber(item.minimumAmount2 || 0)} - ${formatNumber(item.sum2 || 0)} + ${formatNumber(item.sum2 || 0)} ${item.changeReason2 || ''} `; @@ -274,11 +279,11 @@ ${formatNumber(item.totalCount || 0)} ${formatNumber(item.value || 0)} ${formatNumber(item.minimumAmount || 0)} - ${formatNumber(item.sum || 0)} - ${formatNumber(item.totalCount2 || 0)} + ${formatNumber(item.sum || 0)} + ${formatNumber(item.totalCount2 || 0)} ${formatNumber(item.value2 || 0)} ${formatNumber(item.minimumAmount2 || 0)} - ${formatNumber(item.sum2 || 0)} + ${formatNumber(item.sum2 || 0)} ${item.changeReason2 || ''} `; @@ -296,11 +301,11 @@ ${formatNumber(apiCount1)} - ${formatNumber(apiTotal1)} + ${formatNumber(apiTotal1)} ${formatNumber(apiCount2)} - ${formatNumber(apiTotal2)} + ${formatNumber(apiTotal2)} `; @@ -329,11 +334,11 @@ ${isPercentageFee ? (parseFloat(item.value || 0) * 100) + '%' : formatNumber(item.value || 0)} ${formatNumber(item.totalCount || 0)} ${formatNumber(item.minimumAmount || 0)} - ${formatNumber(item.sum || 0)} + ${formatNumber(item.sum || 0)} ${isPercentageFee ? (parseFloat(item.value2 || 0) * 100) + '%' : formatNumber(item.value2 || 0)} ${formatNumber(item.totalCount2 || 0)} ${formatNumber(item.minimumAmount2 || 0)} - ${formatNumber(item.sum2 || 0)} + ${formatNumber(item.sum2 || 0)} ${item.changeReason2 || ''} `; @@ -348,11 +353,11 @@ ${isPercentageFee ? (parseFloat(item.value || 0) * 100) + '%' : formatNumber(item.value || 0)} ${formatNumber(item.totalCount || 0)} ${formatNumber(item.minimumAmount || 0)} - ${formatNumber(item.sum || 0)} + ${formatNumber(item.sum || 0)} ${isPercentageFee ? (parseFloat(item.value2 || 0) * 100) + '%' : formatNumber(item.value2 || 0)} ${formatNumber(item.totalCount2 || 0)} ${formatNumber(item.minimumAmount2 || 0)} - ${formatNumber(item.sum2 || 0)} + ${formatNumber(item.sum2 || 0)} ${item.changeReason2 || ''} `; @@ -372,11 +377,11 @@ ${formatNumber(saleCount1)} - ${formatNumber(saleTotal1)} + ${formatNumber(saleTotal1)} ${formatNumber(saleCount2)} - ${formatNumber(saleTotal2)} + ${formatNumber(saleTotal2)} `;