From df2dd3aa25924cdd2001ecfc3d6f493d58664a5b Mon Sep 17 00:00:00 2001
From: Tanyalak <tanyalak@frappet.com>
Date: Wed, 16 Aug 2023 17:01:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20css=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            |  4 +-
 .../04_registry/components/TableProfile.vue   | 44 ++++---------------
 .../components/ListRetirement/AddList.vue     |  5 +--
 src/modules/08_registryEmployee/router.ts     | 14 +++---
 .../08_registryEmployee/views/EditDetail.vue  |  4 +-
 .../08_registryEmployee/views/Main.vue        |  4 +-
 .../08_registryEmployee/views/information.vue |  9 ++--
 7 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index fe7b5080c..e7f521186 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -364,11 +364,11 @@ const menuList = readonly<any[]>([
     ],
   },
   {
-    key: 10,
+    key: 11,
     icon: "o_contact_page",
     activeIcon: "contact_page",
     label: "ทะเบียนประวัติลูกจ้าง",
-    path: "registryEmployee",
+    path: "employee",
     role: "registryEmployee",
   },
 ]);
diff --git a/src/modules/04_registry/components/TableProfile.vue b/src/modules/04_registry/components/TableProfile.vue
index 0e722ed28..a946465f2 100644
--- a/src/modules/04_registry/components/TableProfile.vue
+++ b/src/modules/04_registry/components/TableProfile.vue
@@ -117,17 +117,10 @@
             </div>
             <q-separator color="blue-1" />
             <div class="dialog-card-contain">
-              <q-card-section class="q-pa-md">
-                <div class="row col-12 q-col-gutter-sm">
-                  <div
-                    :class="
-                      $q.screen.lt.md
-                        ? ' row col-12 q-col-gutter-xs'
-                        : 'no-wrap row col-12 q-col-gutter-xs'
-                    "
-                  >
+              <q-card-section class="q-pa-sm">
+                  <div class="row col-12 q-col-gutter-xs">
                     <selector
-                      class="col-3"
+                      class="col-4"
                       hide-bottom-space
                       :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภท'}`]"
                       outlined
@@ -160,7 +153,7 @@
                       type="number"
                     />
                     <q-input
-                      class="col-2"
+                      class="col-3"
                       clearable
                       dense
                       outlined
@@ -187,7 +180,7 @@
                       }}</template>
                       <template #trigger>
                         <q-input
-                          class="inputgreen cursor-pointer q-mb-sm"
+                          class="inputgreen cursor-pointer"
                           hide-bottom-space
                           outlined
                           dense
@@ -223,15 +216,6 @@
                       type="number"
                       @update:model-value="updateGovAge"
                     />
-                  </div>
-
-                  <div
-                    :class="
-                      $q.screen.lt.md
-                        ? ' row col-12 q-col-gutter-xs'
-                        : 'no-wrap row col-12 q-col-gutter-xs'
-                    "
-                  >
                     <q-input
                       v-if="employeeClass == 'officer'"
                       clearable
@@ -266,7 +250,7 @@
                       hide-bottom-space
                       label="ตำแหน่งทางการบริหาร"
                       @update:model-value="updatePositionExecutive"
-                      class="col-3"
+                      class="col-4"
                     />
                     <q-input
                       v-if="employeeClass != 'officer'"
@@ -290,7 +274,7 @@
                       hide-bottom-space
                       label="ระดับชั้นงาน"
                       @update:model-value="updateEmployeeLevel"
-                      class="col-3"
+                      class="col-4"
                     />
                     <q-input
                       clearable
@@ -303,14 +287,6 @@
                       @update:model-value="updatePosNo"
                       class="col-3"
                     />
-                  </div>
-                  <div
-                    :class="
-                      $q.screen.lt.md
-                        ? ' row col-12 q-col-gutter-xs'
-                        : 'no-wrap row col-12 q-col-gutter-xs'
-                    "
-                  >
                     <datepicker
                       class="col-2"
                       menu-class-name="modalfix"
@@ -372,10 +348,9 @@
                       hide-bottom-space
                       label="ประเภทคำสั่ง"
                       @update:model-value="updateReportType"
-                      class="col-3"
+                      class="col-4"
                     />
-                  </div>
-                  <div class="col-12 row items-center">
+                  
                     <q-toggle
                       dense
                       :model-value="isShowRetire"
@@ -437,7 +412,6 @@
                       />
                     </div>
                   </div> -->
-                </div>
               </q-card-section>
             </div>
           </div>
diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index 98126b058..8adc0cdc5 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -239,10 +239,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
   >
 
   <q-dialog v-model="modal">
-    <q-card style="width: 850px; max-width: 80vw" class="q-px-sm q-pb-md">
+    <q-card style="width: 850px; max-width: 80vw" class="q-pb-md">
       <q-toolbar class="q-py-md">
-        <q-toolbar-title class="header-text text-weight-bolder"
-          >เพิ่มรายชื่อ
+        <q-toolbar-title class="text-h6">เพิ่มรายชื่อ
         </q-toolbar-title>
         <q-btn
           icon="close"
diff --git a/src/modules/08_registryEmployee/router.ts b/src/modules/08_registryEmployee/router.ts
index ce8e0d3c2..3d2d79917 100644
--- a/src/modules/08_registryEmployee/router.ts
+++ b/src/modules/08_registryEmployee/router.ts
@@ -5,7 +5,7 @@ import { defineAsyncComponent } from "vue";
 
 // const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
 // const Detail = () => import("@/modules/08_registryEmployee/views/Detail.vue");
-const Main = defineAsyncComponent(
+const MainEmployee = defineAsyncComponent(
   () => import("@/modules/08_registryEmployee/views/Main.vue")
 );
 const Detail = defineAsyncComponent(
@@ -17,12 +17,12 @@ const EditDetail = defineAsyncComponent(
 
 export default [
   {
-    path: "/registryEmployee",
-    name: "registryEmployee",
-    component: Main,
+    path: "/employee",
+    name: "employee",
+    component: MainEmployee,
     meta: {
       Auth: true,
-      Key: [9],
+      Key: [11],
       Role: "registryEmployee",
     },
   },
@@ -37,7 +37,7 @@ export default [
   //     },
   //   },
   {
-    path: "/registryEmployee/add",
+    path: "/employee/add",
     name: "registryEmployeeAdd",
     component: Detail,
     meta: {
@@ -47,7 +47,7 @@ export default [
     },
   },
   {
-    path: "/registryEmployee/Edit/:Id",
+    path: "/employee/Edit/:Id",
     name: "registryEmployeeEdit",
     component: EditDetail,
     meta: {
diff --git a/src/modules/08_registryEmployee/views/EditDetail.vue b/src/modules/08_registryEmployee/views/EditDetail.vue
index 401ae0b9f..a5175c84a 100644
--- a/src/modules/08_registryEmployee/views/EditDetail.vue
+++ b/src/modules/08_registryEmployee/views/EditDetail.vue
@@ -985,12 +985,12 @@ const Retire = async () => {
 }
 
 .text-name {
-  font-size: 1.5em;
+  font-size: 1.3em;
   overflow: hidden;
 }
 
 .text-sub {
-  font-size: 1.5em;
+  font-size: 1.3em;
   overflow: hidden;
   color: var(--q-primary);
 }
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index c89d46bee..3af511ad1 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -1349,13 +1349,13 @@ const clickClose = async () => {
 const clickAdd = () => {
   //   modal.value = true;
 
-  router.push(`/registryEmployee/add`);
+  router.push(`/employee/add`);
   //   router.push(`/placement/detail`);
 };
 
 // ดูรายการแก้ไขรายชื่อ
 const redirectToPage = (profileId?: string) => {
-  router.push(`/registryEmployee/Edit/${profileId}`);
+  router.push(`/employee/Edit/${profileId}`);
 };
 const editDetail = async (row: any) => {
   await getPosition(row.id);
diff --git a/src/modules/08_registryEmployee/views/information.vue b/src/modules/08_registryEmployee/views/information.vue
index ade1f0cfd..050176b07 100644
--- a/src/modules/08_registryEmployee/views/information.vue
+++ b/src/modules/08_registryEmployee/views/information.vue
@@ -11,8 +11,7 @@
       :historyClick="clickHistory"
       :addEmployee="statusAdd()"
     />
-    <q-separator />
-    <q-form ref="myform" class="col-12">
+    <q-form ref="myform" class="col-12 q-pt-md">
       <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
         <div class="col-xs-6 col-sm-3 col-md-3">
           <q-input
@@ -342,10 +341,9 @@
                         ) "
           />
         </div>
-        <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
       </div>
     </q-form>
-
+    <div class="col-12 q-pt-md q-pb-sm"><q-separator /></div>
     <HistoryTable
       :rows="rowsHistory"
       :columns="columnsHistory"
@@ -372,7 +370,7 @@
         </q-tr>
       </template>
     </HistoryTable>
-    <div class="row col-12 q-pa-sm">
+    <div class="row col-12">
       <q-space />
       <q-btn
         unelevated
@@ -383,7 +381,6 @@
         @click="saveData"
       />
     </div>
-    <q-separator />
   </q-card>
 </template>
 <script setup lang="ts">