diff --git a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
index 3b5a0f634..04b6a8e98 100644
--- a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
@@ -232,7 +232,7 @@ watch(
           />
         </q-toolbar>
         <div v-if="props.editCheck === 'edit'">
-          <q-separator color="grey-4" />
+          <q-separator />
           <q-card-section style="max-height: 50vh" class="scroll q-pa-none">
             <div class="q-pa-md">
               <div class="row">
@@ -270,10 +270,12 @@ watch(
                     :borderless="true"
                     outlined
                     style="width: 23.5rem"
+                    class="inputgreen"
                   />
                 </div>
                 <div class="col-6">
                   <datepicker
+                    class="inputgreen"
                     menu-class-name="modalfix"
                     v-model="formData.effectiveDate"
                     :locale="'th'"
@@ -326,6 +328,7 @@ watch(
 
                 <div class="col-12">
                   <q-input
+                    class="inputgreen"
                     outlined
                     stack-label
                     ref="resonRef"
@@ -340,20 +343,18 @@ watch(
             </div>
           </q-card-section>
         </div>
-        <q-separator color="grey-4" />
-        <div class="q-pa-xs">
-          <div class="row justify-end q-mr-sm q-py-sm">
-            <q-btn
-              v-if="props.editCheck === 'edit'"
-              id="onSubmit"
-              type="submit"
-              unelevated
-              label="บันทึก"
-              class="q-px-md items-center"
-              color="secondary"
-            />
-          </div>
-        </div>
+        <q-separator />
+        <q-card-actions align="right">
+          <q-btn
+            v-if="props.editCheck === 'edit'"
+            id="onSubmit"
+            type="submit"
+            unelevated
+            label="บันทึก"
+            class="q-px-md items-center"
+            color="secondary"
+          />
+        </q-card-actions>
       </form>
       <div v-if="props.editCheck === 'history'">
         <div class="q-pa-md">
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 4083c11e4..d76e74a4a 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -127,9 +127,9 @@ export const useChangeRoundDataStore = defineStore(
         showLoader();
         await http
           .post(config.API.leaveSearch(), {
-            citizenId: dataDetail.cardId || "", //เลขประจำตัวประชาชน
-            firstname: dataDetail.firstName || "", //ชื่อจริง
-            lastname: dataDetail.lastName || "", //นามสกุล
+            citizenId: dataDetail.cardId.trim() || "", //เลขประจำตัวประชาชน
+            firstname: dataDetail.firstName.trim() || "", //ชื่อจริง
+            lastname: dataDetail.lastName.trim() || "", //นามสกุล
             page: dataDetail.page, //หน้า
             pageSize: dataDetail.pageSize || 10, //จำนวนแถวต่อหน้า
             keyword: dataDetail.keyword || "", //keyword ค้นหา