Merge branch 'develop' into devTee

src/modules/09_leave/components/1_Work/DialogDetail.vue

@@ -171,7 +171,7 @@ watch(
                 <q-item>
                   <q-item-section>
                     <q-item-label class="text-grey-8"
-                      >สถานะเวลาเข้างาน
+                      >สถานะช่วงเช้า
                     </q-item-label>
                     <q-item-label>{{ formData.checkInStatus }}</q-item-label>
                   </q-item-section>
@@ -181,7 +181,7 @@ watch(
                 <q-item>
                   <q-item-section>
                     <q-item-label class="text-grey-8"
-                      >สถานะเวลาออก</q-item-label
+                      >สถานะช่วงบ่าย</q-item-label
                     >
                     <q-item-label>{{ formData.checkOutStatus }}</q-item-label>
                   </q-item-section>

src/modules/09_leave/components/3_WorkTime/DialogForm.vue

@@ -181,7 +181,7 @@ watch(
           :close="close"
         />
         <q-separator color="grey-4" />
-        <q-card-section style="max-height: 50vh" class="scroll q-pa-none">
+        <q-card-section style="max-height: 80vh" class="scroll q-pa-none">
           <div
             class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
           >
@@ -371,19 +371,19 @@ watch(
           </div>
         </q-card-section>
         <q-separator color="grey-4" />
-        <div class="q-pa-xs">
+        <div class="q-pa-sm">
           <div class="row justify-end">
             <q-btn
               id="onSubmit"
               type="submit"
-              flat
-              round
-              color="secondary"
-              icon="mdi-content-save-outline"
-              ><q-tooltip>{{
-                props.editCheck === "add" ? "บันทึกข้อมูล" : "บันทึกแก้ไขข้อมูล"
-              }}</q-tooltip></q-btn
+              dense
+              unelevated
+              label="บันทึก"
+              color="public"
+              class="q-px-md"
             >
+              <q-tooltip>บันทึก</q-tooltip>
+            </q-btn>
           </div>
         </div>
       </form>