From d3984182e803f6e2fe11809a7efb322c931981ac Mon Sep 17 00:00:00 2001
From: leonard <dungtv44@fpt.com>
Date: Mon, 28 Jul 2025 08:44:51 +0700
Subject: [PATCH 1/2] update screen 8, 10

---
 assets/scss/common.scss                              | 12 ++++++------
 assets/scss/common/input.scss                        |  6 ++++++
 components/common/select/SelectBoxMulti.vue          |  2 +-
 .../pages/ems/DataSetInfo/DataSetTagRelTab.vue       |  2 +-
 pages/ems/effc/DataSetMngPage.vue                    |  2 +-
 pages/ems/effc/EnrgReptMngPage.vue                   |  4 ++--
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index 33adc3d..6bdd6ad 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -1255,9 +1255,9 @@ a {
           opacity: 0;
         }
 
-        .v-list-item__content {
-          background-color: currentColor;
-        }
+        // .v-list-item__content {
+        //   background-color: currentColor;
+        // }
 
         .v-list-item__title {
           color: map-deep-get($config,
@@ -1265,9 +1265,9 @@ a {
             "tui-datepicker-calendar-color"
           );
 
-          @if $theme ==light {
-            color: #fff !important;
-          }
+          // @if $theme ==light {
+          //   color: #fff !important;
+          // }
         }
       }
     }
diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss
index e4de7be..ba40d9a 100644
--- a/assets/scss/common/input.scss
+++ b/assets/scss/common/input.scss
@@ -1,4 +1,6 @@
 .v-select__custom {
+  padding: 0.125rem;
+  
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;
   }
@@ -42,6 +44,10 @@
   legend {
     width: 0;
   }
+
+  .v-select-list {
+    padding: 0 1rem;
+  }
 }
 
 .v-input__custom {
diff --git a/components/common/select/SelectBoxMulti.vue b/components/common/select/SelectBoxMulti.vue
index a4835b6..35550da 100644
--- a/components/common/select/SelectBoxMulti.vue
+++ b/components/common/select/SelectBoxMulti.vue
@@ -20,10 +20,10 @@
 				outlined
 				:multiple="multiple"
 				:hide-details="true"
-				append-icon=""
 				:class="['v-select__custom', customClass]"
 				:disabled="disabled"
 				:readonly="readonly"
+				append-icon=""
 				><template v-slot:append>
 					<v-icon>$icoChevronDown</v-icon>
 				</template></v-select>
diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
index 097d262..bb9b80d 100644
--- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
+++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
@@ -7,7 +7,7 @@
     </div>
     <div ref="gridParent">
       <Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-        @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
+        @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
     </div>
     <div ref="formParent" class="mt-4">
       <component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
diff --git a/pages/ems/effc/DataSetMngPage.vue b/pages/ems/effc/DataSetMngPage.vue
index 96f0ac2..4fa7940 100644
--- a/pages/ems/effc/DataSetMngPage.vue
+++ b/pages/ems/effc/DataSetMngPage.vue
@@ -44,7 +44,7 @@
             <div class="px-5" style="min-height:calc(100% - 76px)">
               <div ref="gridParent" class="w100 h100">
                 <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-                  @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo" :dataPath="dataPathMock"
+                  @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
                   :selectedRowDataWatchFlag="true" />
               </div>
             </div>
diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue
index 4aa0080..f168e6e 100644
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@@ -266,8 +266,8 @@ export default {
 	},
 	created() { },
 	async mounted() {
-		console.log('----DEBUG---');
-		await this.initTest();
+		// console.log('----DEBUG---');
+		// await this.initTest();
 		// End Debug Test---
 		await this.init();
 		this.initedFlag = true;

From 402b09440fb703cb965d3c1a57921adafa2f24d3 Mon Sep 17 00:00:00 2001
From: leonard <dungtv44@fpt.com>
Date: Mon, 28 Jul 2025 08:59:17 +0700
Subject: [PATCH 2/2] fix code comment

---
 assets/scss/common.scss | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index b2a1baa..bac9445 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -1259,19 +1259,11 @@ a {
           opacity: 0;
         }
 
-        // .v-list-item__content {
-        //   background-color: currentColor;
-        // }
-
         .v-list-item__title {
           color: map-deep-get($config,
             #{$theme},
             "tui-datepicker-calendar-color"
           );
-
-          // @if $theme ==light {
-          //   color: #fff !important;
-          // }
         }
       }
     }