From 4b2940e2d4a70442f7b075f3bf8b3143baa64e61 Mon Sep 17 00:00:00 2001
From: Net <93821485+somnetsak123@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:13:09 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B9=83=E0=B8=99=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_personnel-management/MainPage.vue      | 24 ++++++++++---------
 src/pages/03_customer-management/MainPage.vue | 18 +++++++++++---
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index dcaa7da0..3cbe0cbd 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -13,7 +13,7 @@ import {
 } from 'src/stores/user/types';
 import { BranchUserStats } from 'src/stores/branch/types';
 import useAddressStore from 'src/stores/address';
-
+import ButtonAddComponent from 'src/components/ButtonAddCompoent.vue';
 import PersonCard from 'components/home/PersonCard.vue';
 import AppBox from 'components/app/AppBox.vue';
 import StatCardComponent from 'components/StatCardComponent.vue';
@@ -539,6 +539,18 @@ watch(
 </script>
 
 <template>
+  <ButtonAddComponent style="z-index: 999">
+    <q-fab-action
+      :label="$t('personnelAdd')"
+      external-label
+      label-position="left"
+      @click="openDialog('FORM')"
+      color="primary"
+      padding="xs"
+      icon="mdi-account-plus"
+    ></q-fab-action>
+  </ButtonAddComponent>
+
   <div class="column q-pb-lg">
     <div class="text-h6 text-weight-bold q-mb-md">
       {{ $t('personnelManagement') }}
@@ -559,16 +571,6 @@ watch(
             {{ $t('personnelStatTitle') }}
             {{ selectorLabel === '' ? '' : $t(selectorLabel) }}
           </div>
-          <q-btn
-            id="btn-add-personnel"
-            dense
-            unelevated
-            icon="mdi-plus"
-            :label="$t('personnelAdd')"
-            padding="4px 16px"
-            @click="openDialog('FORM')"
-            style="background-color: var(--cyan-6); color: white"
-          />
         </div>
         <div class="row full-width" style="overflow-x: auto">
           <StatCardComponent
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index aa9c72fc..ae84d5b0 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -1124,7 +1124,7 @@ watch(
 </script>
 
 <template>
-  <ButtonAddComponent style="z-index: 999">
+  <ButtonAddComponent style="z-index: 999" v-if="selectorLabel !== 'EMPLOYER'">
     <q-fab-action
       style="color: white; background-color: hsla(var(--purple-11-hsl))"
       @click="triggerCreate('CORP')"
@@ -1134,8 +1134,8 @@ watch(
       external-label
       label-position="left"
     />
-
     <q-fab-action
+      v-if="selectorLabel === 'EMPLOYER'"
       :label="$t('add') + ' ' + $t('customerNaturalPerson')"
       external-label
       label-position="left"
@@ -1146,6 +1146,18 @@ watch(
     ></q-fab-action>
   </ButtonAddComponent>
 
+  <ButtonAddComponent style="z-index: 999" v-if="selectorLabel === 'EMPLOYER'">
+    <q-fab-action
+      :label="$t('add') + ' ' + $t('EMPLOYEE')"
+      external-label
+      label-position="left"
+      @click="openDialogCustomerType()"
+      color="primary"
+      padding="xs"
+      icon="mdi-account-plus"
+    ></q-fab-action>
+  </ButtonAddComponent>
+
   <div class="column q-pb-lg">
     <div class="text-h6 text-weight-bold q-mb-md">
       {{ $t('customerManagement') }}
@@ -1317,7 +1329,7 @@ watch(
         >
           <div
             class="row full-width customer-row"
-            :style="`grid-template-columns: repeat(${$q.screen.lt.sm ? '2' : $q.screen.lt.md ? '3' : $q.screen.lt.lg ? '6' : '7'}, 180px)`"
+            :style="`grid-template-columns: repeat(${$q.screen.lt.sm ? '2' : $q.screen.lt.md ? '3' : $q.screen.lt.lg ? '5' : '6'}, 1fr)`"
             style="min-height: 250px"
           >
             <UsersDetailCardComponent