From 24666e438fb0f8b51b850a876cee62992be7b78a Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 6 Dec 2024 17:41:18 +0700 Subject: [PATCH] fix report --- .../07_insignia/views/06_ReportMain.vue | 462 ++++++++++++++++-- src/modules/09_leave/views/06_ReportMain.vue | 220 +++++---- .../09_leave/views/07_ReportCheckin.vue | 11 +- 3 files changed, 550 insertions(+), 143 deletions(-) diff --git a/src/modules/07_insignia/views/06_ReportMain.vue b/src/modules/07_insignia/views/06_ReportMain.vue index 5f02e0595..e2e651ec6 100644 --- a/src/modules/07_insignia/views/06_ReportMain.vue +++ b/src/modules/07_insignia/views/06_ReportMain.vue @@ -1,51 +1,433 @@ @@ -57,4 +439,18 @@ function nextPage(type: string) { .q-item.hover-green { padding: 10px; } + +.tree-container { + overflow: auto; + height: 60vh; + border: 1px solid #e6e6e7; + border-radius: 10px; +} +.my-list-link { + color: rgb(118, 168, 222); + border-radius: 5px; + background: #a3d3fb48 !important; + font-weight: 600; + border: 1px solid rgba(175, 185, 196, 0.217); +} diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue index 7422243b0..c26c5863b 100644 --- a/src/modules/09_leave/views/06_ReportMain.vue +++ b/src/modules/09_leave/views/06_ReportMain.vue @@ -289,6 +289,7 @@ onMounted(() => { {
-
+
{ />
-
-
+
+
{
-
- - - - - - - - - - - - - - - - +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
diff --git a/src/modules/09_leave/views/07_ReportCheckin.vue b/src/modules/09_leave/views/07_ReportCheckin.vue index e19a341ec..8bedf36d6 100644 --- a/src/modules/09_leave/views/07_ReportCheckin.vue +++ b/src/modules/09_leave/views/07_ReportCheckin.vue @@ -287,7 +287,6 @@ onMounted(() => { option-label="name" option-value="id" @update:model-value="updateFilterType(filterType)" - style="width: 230px" >
@@ -318,7 +317,7 @@ onMounted(() => {
-
+
{ />
-
+
{
{
{