diff --git a/src/components/01_branch-management/FormBranchContact.vue b/src/components/01_branch-management/FormBranchContact.vue
index be253b86..a2f21564 100644
--- a/src/components/01_branch-management/FormBranchContact.vue
+++ b/src/components/01_branch-management/FormBranchContact.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import { ref } from 'vue';
-
 const telephoneNo = defineModel<string>('telephoneNo');
 const contact = defineModel<string>('contact');
 const email = defineModel<string>('email');
 const contactName = defineModel<string>('contactName');
-const operatingHours = defineModel<string>('operatingHours');
+// const operatingHours = defineModel<string>('operatingHours');
 const lineId = defineModel<string>('lineId');
 
 defineProps<{
diff --git a/src/components/01_branch-management/FormImage.vue b/src/components/01_branch-management/FormImage.vue
index 5a8b500c..e7e35df7 100644
--- a/src/components/01_branch-management/FormImage.vue
+++ b/src/components/01_branch-management/FormImage.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { Icon } from '@iconify/vue';
-
 const image = defineModel<string | null>('image');
 
 defineProps<{
diff --git a/src/components/02_personnel-management/FormByType.vue b/src/components/02_personnel-management/FormByType.vue
index d05d7682..24d70153 100644
--- a/src/components/02_personnel-management/FormByType.vue
+++ b/src/components/02_personnel-management/FormByType.vue
@@ -3,7 +3,6 @@ import useUserStore from 'src/stores/user';
 import { UserAttachmentDelete } from 'src/stores/user/types';
 import { dialog } from 'src/stores/utils';
 import { dateFormat } from 'src/utils/datetime';
-import { watch } from 'vue';
 
 const userStore = useUserStore();
 
diff --git a/src/components/02_personnel-management/FormInformation.vue b/src/components/02_personnel-management/FormInformation.vue
index 5985437a..9fecafec 100644
--- a/src/components/02_personnel-management/FormInformation.vue
+++ b/src/components/02_personnel-management/FormInformation.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { storeToRefs } from 'pinia';
 import useUserStore from 'src/stores/user';
 
 const userStore = useUserStore();
diff --git a/src/components/DrawerInfo.vue b/src/components/DrawerInfo.vue
index e914cfe0..07e2eb69 100644
--- a/src/components/DrawerInfo.vue
+++ b/src/components/DrawerInfo.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 
 defineProps<{
   title: string;
@@ -25,15 +25,6 @@ function reset() {
     myForm.value.resetValidation();
   }
 }
-
-// watch(
-//   () => window.screen.width,
-//   (v) => {
-//     console.log(v);
-
-//     drawerWidth.value = v;
-//   },
-// );
 </script>
 <template>
   <q-drawer
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 5e3e7879..34c241d9 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -349,7 +349,6 @@ function triggerDelete(id: string) {
 async function onSubmit() {
   if (formType.value === 'edit') {
     if (modalDrawer.value) {
-      const { status, ...payload } = formData.value;
       dialog({
         color: 'primary',
         icon: 'mdi-pencil-outline',
@@ -358,11 +357,11 @@ async function onSubmit() {
         persistent: true,
         message: 'คุณต้องการแก้ไขข้อมูล ใช่หรือไม่',
         action: async () => {
-          const { status, ...payload } = formData.value;
           await branchStore.editById(
             codeHq.value.id,
             {
-              ...payload,
+              ...formData.value,
+              status: undefined,
             },
             profileFile.value,
             profileFileImg.value,
@@ -373,12 +372,11 @@ async function onSubmit() {
         cancel: () => {},
       });
     } else {
-      const { status, ...payload } = formData.value;
-
       await branchStore.editById(
         codeHq.value.id,
         {
-          ...payload,
+          ...formData.value,
+          status: undefined,
         },
         profileFile.value,
         profileFileImg.value,
@@ -463,7 +461,12 @@ watch(locale, () => {
       <StatCard :branch="stats" :dark="$q.dark.isActive" />
     </AppBox>
 
-    <AppBox class="column" no-padding bordered style="min-height: 70vh">
+    <AppBox
+      class="column"
+      :no-padding="!!branchData.total"
+      bordered
+      style="min-height: 70vh"
+    >
       <template v-if="!branchData.total">
         <TooltipComponent
           class="self-end"