diff --git a/src/modules/13_salary/components/Command/step01.vue b/src/modules/13_salary/components/Command/step01.vue
index 7318e1700..6f6de2c01 100644
--- a/src/modules/13_salary/components/Command/step01.vue
+++ b/src/modules/13_salary/components/Command/step01.vue
@@ -406,7 +406,7 @@ function fetchSalaryRound() {
 </script>
 
 <template>
-  <q-form greedy @submit.prevent @validation-success="submit" class="q-pa-md">
+  <q-form greedy @submit.prevent @validation-success="submit">
     <div class="q-pa-md">
       <!-- Main -->
       <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
diff --git a/src/modules/13_salary/components/Command/step02.vue b/src/modules/13_salary/components/Command/step02.vue
index 5157c420d..13be342b3 100644
--- a/src/modules/13_salary/components/Command/step02.vue
+++ b/src/modules/13_salary/components/Command/step02.vue
@@ -762,7 +762,6 @@ const pagination = ref({
         <q-separator color="grey-4" />
         <q-card-actions align="right">
           <q-btn
-            dense
             unelevated
             label="บันทึก"
             color="public"
diff --git a/src/modules/13_salary/components/Command/step03.vue b/src/modules/13_salary/components/Command/step03.vue
index 1feca371a..27f8f535a 100644
--- a/src/modules/13_salary/components/Command/step03.vue
+++ b/src/modules/13_salary/components/Command/step03.vue
@@ -652,7 +652,6 @@ const updateData = (row: DataCopyOrder) => {
       <q-separator />
       <q-card-actions align="right">
         <q-btn
-          dense
           unelevated
           label="บันทึก"
           color="public"
diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
index e3ed63a09..8d21b76ae 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
@@ -434,11 +434,11 @@ function checkEndDate() {
         </q-card-section>
 
         <q-separator />
-        <div class="text-right q-ma-sm">
-          <q-btn label="บันทึก" type="submit" color="secondary">
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </div>
+        <q-card-actions align="right">
+          <q-btn label="บันทึก" color="secondary" type="submit"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
       </q-form>
     </q-card>
   </q-dialog>
diff --git a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue
index 3cf367eaa..1da37e79e 100644
--- a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue
+++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue
@@ -341,16 +341,15 @@ watch(
           </div>
         </q-card-section>
         <q-separator />
-        <div class="text-right q-ma-sm">
+        <q-card-actions align="right">
           <q-btn
             label="บันทึก"
-            type="submit"
             color="secondary"
+            type="submit"
             :disable="isReadonly"
+            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
           >
-            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          </q-btn>
-        </div>
+        </q-card-actions>
       </q-form>
     </q-card>
   </q-dialog>
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index b50291648..34ad06b95 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -263,15 +263,15 @@ function getOrgOp() {
       const data = res.data.result;
       evaluatorIdMainOp.value = data.caregiver.map((i: any) => ({
         id: i.id,
-        name: `${i.prefix}${i.firstName} ${i.lastName}`,
+        name: `${i.prefix ? i.prefix :''}${i.firstName ? i.firstName : ''} ${i.lastName ? i.lastName:''}`,
       }));
       commanderIdMainOp.value = data.commander.map((i: any) => ({
         id: i.id,
-        name: `${i.prefix}${i.firstName} ${i.lastName}`,
+        name: `${i.prefix ? i.prefix :''}${i.firstName ? i.firstName : ''} ${i.lastName ? i.lastName:''}`,
       }));
       commanderHighMainOp.value = data.chairman.map((i: any) => ({
         id: i.id,
-        name: `${i.prefix}${i.firstName} ${i.lastName}`,
+        name: `${i.prefix ? i.prefix :''}${i.firstName ? i.firstName : ''} ${i.lastName ? i.lastName:''}`,
       }));
     })
     .catch((e) => {