diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
index 7f89d01d1..cd7bf8b3f 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
@@ -596,17 +596,15 @@ const clickBack = () => {
             </div>
           </div>
           <q-separator />
-          <q-separator />
           <div class="row col-12 q-pa-sm">
             <q-space />
             <q-btn
-              id="onSubmit"
-              type="submit"
-              flat
-              round
+              for="ButtonOnSubmit"
+              id="formSubmit"
               color="secondary"
-              icon="mdi-content-save-outline"
-              ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+              label="บันทึก"
+              type="submit"
+              ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
             >
           </div>
         </q-card>
diff --git a/src/modules/11_discipline/components/4_Order/Step01.vue b/src/modules/11_discipline/components/4_Order/Step01.vue
index d0c8942a8..105c4b9c8 100644
--- a/src/modules/11_discipline/components/4_Order/Step01.vue
+++ b/src/modules/11_discipline/components/4_Order/Step01.vue
@@ -111,8 +111,8 @@ function onSubmit() {
 
 <template>
   <form @submit.prevent.stop="validateForm">
-    <div class="col-12 row q-pa-lg">
-      <div class="col-xs-12 col-sm-12 q-col-gutter-x-lg row q-col-gutter-y-xs">
+    <div class="row col-12 q-pa-sm">
+      <div class="row col-xs-12 col-sm-12 q-col-gutter-x-sm">
         <div class="col-xs-12 col-sm-6">
           ประเภทคำสั่ง
           <q-select
@@ -313,17 +313,19 @@ function onSubmit() {
         </div>
       </div>
     </div>
-    <q-card-actions align="right">
+
+    <q-separator />
+    <div class="row col-12 q-pa-sm">
+      <q-space />
       <q-btn
-        for="submit"
-        flat
-        round
-        unelevated
+        for="ButtonOnSubmit"
+        id="formSubmit"
         color="secondary"
-        icon="mdi-content-save-outline"
+        label="บันทึก"
         type="submit"
-      />
-    </q-card-actions>
+        ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
+      >
+    </div>
   </form>
 </template>
 
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 9479201cb..ac2e3b1e5 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -82,118 +82,116 @@ function onValidate() {
 </script>
 <template>
   <form @submit.prevent.stop="onValidate" class="q-gutter-md">
-    <div class="col-12">
-      <q-card bordered>
-        <div class="row q-pa-md q-col-gutter-sm">
-          <div class="col-3 row q-pa-md text-bold">
-            <label>ค้นหาบุคคลากรที่อยู่ในระบบ</label>
-          </div>
-          <div class="col-6">
-            <q-input
-              dense
-              outlined
-              v-model="idCard"
-              label="รหัสบัตรประชาชน"
-              ref="idCardRef"
-              for="idCardRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกรหัสบัตรประชาชน'}`]"
-            />
-          </div>
-          <div class="col-2">
-            <q-btn
-              unelevated
-              dense
-              color="primary"
-              class="q-px-md q-py-sm"
-              @click="addEmployee"
-              label="เพิ่มบุคลากร"
-              id="addCustomer"
-            />
-          </div>
+    <q-card bordered class="q-pa-md">
+      <div v-if="data === null" class="row q-col-gutter-sm">
+        <div class="col-3 row q-pa-md text-bold">
+          <label>ค้นหาบุคคลากรที่อยู่ในระบบ</label>
         </div>
-
-        <div class="row q-px-md q-col-gutter-sm">
-          <div class="col-3">
-            <q-input
-              dense
-              outlined
-              v-model="formData.prefix"
-              label="คำนำหน้า"
-              ref="prefixRef"
-              for="prefixRef"
-              :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกคำนำหน้า'}`]"
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              dense
-              outlined
-              v-model="formData.firstname"
-              label="ชื่อ"
-              ref="firstnameRef"
-              for="firstnameRef"
-              :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกชื่อ'}`]"
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              dense
-              outlined
-              v-model="formData.lastname"
-              label="นามสกุล"
-              ref="lastnameRef"
-              for="lastnameRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกนามสกุล'}`]"
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              dense
-              outlined
-              v-model="formData.position"
-              label="ตำแหน่ง"
-              ref="positionRef"
-              for="positionRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              dense
-              outlined
-              v-model="formData.phone"
-              label="เบอร์โทร"
-              ref="phoneRef"
-              for="phoneRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกเบอร์โทร'}`]"
-            />
-          </div>
-          <div class="col-3">
-            <q-input
-              dense
-              outlined
-              v-model="formData.email"
-              label="อีเมล"
-              ref="emailRef"
-              for="emailRef"
-              :rules="[(val: string) => !!val || `${'กรุณากรอกอีเมล'}`]"
-            />
-          </div>
+        <div class="col-6">
+          <q-input
+            dense
+            outlined
+            v-model="idCard"
+            label="รหัสบัตรประชาชน"
+            ref="idCardRef"
+            for="idCardRef"
+            :rules="[(val: string) => !!val || `${'กรุณากรอกรหัสบัตรประชาชน'}`]"
+          />
         </div>
-
-        <q-separator />
-        <div class="row col-12 q-pa-sm">
-          <q-space />
+        <div class="col-2">
           <q-btn
-            for="ButtonOnSubmit"
-            id="formSubmit"
-            color="secondary"
-            label="บันทึก"
-            type="submit"
-            ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
-          >
+            unelevated
+            dense
+            color="primary"
+            class="q-px-md q-py-sm"
+            @click="addEmployee"
+            label="เพิ่มบุคลากร"
+            id="addCustomer"
+          />
         </div>
-      </q-card>
-    </div>
+      </div>
+
+      <div class="row q-px-md q-col-gutter-sm">
+        <div class="col-3">
+          <q-input
+            dense
+            outlined
+            v-model="formData.prefix"
+            label="คำนำหน้า"
+            ref="prefixRef"
+            for="prefixRef"
+            :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกคำนำหน้า'}`]"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            dense
+            outlined
+            v-model="formData.firstname"
+            label="ชื่อ"
+            ref="firstnameRef"
+            for="firstnameRef"
+            :rules="[(val: string) => val !== null && val !== '' || `${'กรุณากรอกชื่อ'}`]"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            dense
+            outlined
+            v-model="formData.lastname"
+            label="นามสกุล"
+            ref="lastnameRef"
+            for="lastnameRef"
+            :rules="[(val: string) => !!val || `${'กรุณากรอกนามสกุล'}`]"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            dense
+            outlined
+            v-model="formData.position"
+            label="ตำแหน่ง"
+            ref="positionRef"
+            for="positionRef"
+            :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            dense
+            outlined
+            v-model="formData.phone"
+            label="เบอร์โทร"
+            ref="phoneRef"
+            for="phoneRef"
+            :rules="[(val: string) => !!val || `${'กรุณากรอกเบอร์โทร'}`]"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            dense
+            outlined
+            v-model="formData.email"
+            label="อีเมล"
+            ref="emailRef"
+            for="emailRef"
+            :rules="[(val: string) => !!val || `${'กรุณากรอกอีเมล'}`]"
+          />
+        </div>
+      </div>
+
+      <q-separator />
+      <div class="row col-12 q-pa-sm">
+        <q-space />
+        <q-btn
+          for="ButtonOnSubmit"
+          id="formSubmit"
+          color="secondary"
+          label="บันทึก"
+          type="submit"
+          ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
+        >
+      </div>
+    </q-card>
   </form>
 </template>