แก้ ui วินัย

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"
+              for="ButtonOnSubmit"
-              type="submit"
+              id="formSubmit"
-              flat
-              round
               color="secondary"
-              icon="mdi-content-save-outline"
+              label="บันทึก"
-              ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+              type="submit"
+              ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
             >
           </div>
         </q-card>

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="row col-12 q-pa-sm">
-      <div class="col-xs-12 col-sm-12 q-col-gutter-x-lg row q-col-gutter-y-xs">
+      <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"
+        for="ButtonOnSubmit"
-        flat
+        id="formSubmit"
-        round
-        unelevated
         color="secondary"
-        icon="mdi-content-save-outline"
+        label="บันทึก"
         type="submit"
-      />
+        ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
-    </q-card-actions>
+      >
+    </div>
   </form>
 </template>
 

src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue

@@ -82,9 +82,8 @@ function onValidate() {
 </script>
 <template>
   <form @submit.prevent.stop="onValidate" class="q-gutter-md">
-    <div class="col-12">
+    <q-card bordered class="q-pa-md">
-      <q-card bordered>
+      <div v-if="data === null" class="row q-col-gutter-sm">
-        <div class="row q-pa-md q-col-gutter-sm">
         <div class="col-3 row q-pa-md text-bold">
           <label>ค้นหาบุคคลากรที่อยู่ในระบบ</label>
         </div>
@@ -194,6 +193,5 @@ function onValidate() {
         >
       </div>
     </q-card>
-    </div>
   </form>
 </template>