-
+
@@ -78,61 +65,77 @@
@@ -140,32 +143,15 @@
+
+
diff --git a/src/main/resources/templates/budget/assignEditModal.html b/src/main/resources/templates/budget/assignEditModal.html
new file mode 100644
index 00000000..6e16dcd9
--- /dev/null
+++ b/src/main/resources/templates/budget/assignEditModal.html
@@ -0,0 +1,159 @@
+
+
+
+
-
+
@@ -25,49 +24,30 @@
-
+
@@ -25,40 +24,32 @@
| 세부내역 | 예산총액 | 예산총배정액 (누적) |
- 본청 | -중부청 | -서해청 | -남해청 | -동해청 | -제주청 | ++ | ||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 기간배정액 | -누적액 | -기간배정액 | -누적액 | -기간배정액 | -누적액 | -기간배정액 | -누적액 | -기간배정액 | -누적액 | -기간배정액 | -누적액 | +기간배정액 | +누적액 | ++ | + | + | + | + | + | + | + |
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/budget/budgeting.html b/src/main/resources/templates/budget/budgeting.html
index 382550e0..673a7695 100644
--- a/src/main/resources/templates/budget/budgeting.html
+++ b/src/main/resources/templates/budget/budgeting.html
@@ -3,8 +3,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/layout}">
-
+
@@ -81,71 +61,51 @@
-
+
diff --git a/src/main/resources/templates/budget/budgetingEditModal.html b/src/main/resources/templates/budget/budgetingEditModal.html
new file mode 100644
index 00000000..0e64011a
--- /dev/null
+++ b/src/main/resources/templates/budget/budgetingEditModal.html
@@ -0,0 +1,63 @@
+
+
+
+| + | + | + | + | + |
| 합계 | ++ | |||
-
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/budget/budgetingOrgModal.html b/src/main/resources/templates/budget/budgetingOrgModal.html
new file mode 100644
index 00000000..c2141ae7
--- /dev/null
+++ b/src/main/resources/templates/budget/budgetingOrgModal.html
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/budget/expense.html b/src/main/resources/templates/budget/expense.html
index 7f43e339..a4eb3e0d 100644
--- a/src/main/resources/templates/budget/expense.html
+++ b/src/main/resources/templates/budget/expense.html
@@ -3,8 +3,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/layout}">
-
+
-
+
@@ -155,29 +189,6 @@
| 예산총액 | 예산총배정액 (누적) |
집행액(총계) | -본청 | -중부청 | -서해청 | -남해청 | -동해청 | -제주청 | +|||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 지출총액 | 보유잔액 | -배정액 | -지출총액 | -잔액 | -집행률 | -배정액 | -지출총액 | -잔액 | -집행률 | -배정액 | -지출총액 | -잔액 | -집행률 | -배정액 | -지출총액 | -잔액 | -집행률 | -배정액 | -지출총액 | -잔액 | -집행률 | -배정액 | -지출총액 | -잔액 | -집행률 | +배정액 | +지출총액 | +잔액 | +집행률 | ++ | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + |
-
diff --git a/src/main/resources/templates/budget/expenseEditModal.html b/src/main/resources/templates/budget/expenseEditModal.html
new file mode 100644
index 00000000..f7b7db70
--- /dev/null
+++ b/src/main/resources/templates/budget/expenseEditModal.html
@@ -0,0 +1,142 @@
+
+
+
+
-
+
@@ -25,40 +24,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/budget/stats.html b/src/main/resources/templates/budget/stats.html
index ca0ad72b..1838d31e 100644
--- a/src/main/resources/templates/budget/stats.html
+++ b/src/main/resources/templates/budget/stats.html
@@ -3,8 +3,7 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/layout}">
-
+
@@ -82,38 +93,8 @@
-
+
@@ -121,29 +102,6 @@
-
diff --git a/src/main/resources/templates/budget/statsDetail.html b/src/main/resources/templates/budget/statsDetail.html
new file mode 100644
index 00000000..94677aa1
--- /dev/null
+++ b/src/main/resources/templates/budget/statsDetail.html
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/budget/statsOrg.html b/src/main/resources/templates/budget/statsOrg.html
new file mode 100644
index 00000000..991b143e
--- /dev/null
+++ b/src/main/resources/templates/budget/statsOrg.html
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
예산통계
+
+
+ 정보예산관리 > 예산통계
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 재무관서 | +예산총액 | +예산배정액 (누적) |
+ 집행액(총계) | +||
|---|---|---|---|---|---|
| 지출액 | +보유잔액 | +집행비율 | +|||
| + | + | + | + | + | + |
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
+
+
+
+
+
+
+
+
예산통계
+
+
+ 정보예산관리 > 예산통계
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 사업명 | +구분 | +세부내역 | +예산총액 | +예산총배정액 (누적) |
+ 집행액(총계) | ++ | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 지출총액 | +보유잔액 | +진행률 | +배정액 | +지출총액 | +잔액 | +집행률 | +||||||||||||||||||||||||||||||||
| + | + | + + | + | + | + | + | + | + | 11 | ++ | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + |
+
+
+
+
+
+
+
+