diff --git a/src/components/04_product-service/TotalProductCardComponent.vue b/src/components/04_product-service/TotalProductCardComponent.vue
index 78f6a02f..abe8dc6a 100644
--- a/src/components/04_product-service/TotalProductCardComponent.vue
+++ b/src/components/04_product-service/TotalProductCardComponent.vue
@@ -50,8 +50,11 @@ withDefaults(
     @click="$emit('select', data)"
   >
     <div class="row flex justify-between text-bold">
-      <div class="col ellipsis-2-lines" :class="{ inactive: isDisabled }">
+      <div class="col ellipsis" :class="{ inactive: isDisabled }">
         {{ title ?? 'title' }}
+        <q-tooltip anchor="bottom start" self="top left" :delay="300">
+          {{ title ?? 'title' }}
+        </q-tooltip>
       </div>
       <div
         v-if="isSelected === false"
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 70ad28de..efd71c96 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -170,6 +170,9 @@ export default {
       title: 'Service',
       showTotalPrice: 'Show Total Price',
     },
+    product: {
+      allProduct: 'All Product',
+    },
   },
 
   backend: {
diff --git a/src/i18n/th-th/index.ts b/src/i18n/th-th/index.ts
index 5254c33f..82fbd7fd 100644
--- a/src/i18n/th-th/index.ts
+++ b/src/i18n/th-th/index.ts
@@ -174,6 +174,9 @@ export default {
       title: 'บริการ',
       showTotalPrice: 'แสดงราคารวม',
     },
+    product: {
+      allProduct: 'สินค้าทั้งหมด',
+    },
   },
 
   backend: {
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index cfc4051a..198fa08b 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -2450,6 +2450,7 @@ watch(
                           @viewCard="
                             () => {
                               if (productMode === 'type') {
+                                editByTree = 'type';
                                 currentStatusProduct =
                                   props.row.status === 'INACTIVE';
                                 clearFormGroup();
@@ -2459,6 +2460,7 @@ watch(
                                 drawerInfo = true;
                               }
                               if (productMode === 'group') {
+                                editByTree = 'group';
                                 currentStatusProduct =
                                   props.row.status === 'INACTIVE';
                                 clearFormGroup();
@@ -2992,7 +2994,11 @@ watch(
                             <div class="col">
                               <div class="col ellipsis" style="max-width: 20vw">
                                 {{ props.row.name }}
-                                <q-tooltip>
+                                <q-tooltip
+                                  anchor="bottom left"
+                                  self="center left"
+                                  :delay="300"
+                                >
                                   {{ props.row.name }}
                                 </q-tooltip>
                               </div>
@@ -3689,12 +3695,12 @@ watch(
     </template>
   </DialogForm>
 
-  <!-- work product -->
+  <!-- work product, product work -->
   <DialogForm
     v-model:modal="dialogTotalProduct"
     noAddress
     noAppBox
-    title="สินค้าทั้งหมด"
+    :title="$t('productService.product.allProduct')"
     :saveAmount="selectProduct.length"
     :submit="
       () => {
@@ -3727,8 +3733,8 @@ watch(
       }
     "
   >
-    <div class="q-pa-lg full-height scroll column no-wrap">
-      <div class="row items-center justify-between">
+    <div class="full-width q-pa-lg">
+      <div class="row items-center justify-between q-mb-md">
         <q-checkbox
           :label="$t('selectAll')"
           :model-value="
@@ -3794,9 +3800,9 @@ watch(
         class="flex col justify-center items-center"
         v-if="resultSearchProduct?.length === 0"
       >
-        <NoData />
+        <NoData notFound />
       </div>
-      <div v-else class="row q-mt-md q-col-gutter-md">
+      <div v-else class="row q-col-gutter-md">
         <div
           class="col-md-3 col-sm-6 col-12"
           v-for="i in (!!inputSearchProductAndService