diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index df0d1422..ebf2cb2f 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -420,6 +420,8 @@ async function assignFormDataProductService(id: string) {
 function assignFormDataProduct(data: ProductList) {
   console.log(data.detail);
 
+  statusToggle.value = data.status === 'INACTIVE' ? false : true;
+
   formDataProduct.value = {
     productTypeId: data.productTypeId,
     remark: data.remark,
@@ -500,7 +502,10 @@ async function submitProduct() {
   }
 
   if (dialogProductEdit.value) {
-    await editProduct(currentIdProduct.value, formDataProduct.value);
+    await editProduct(currentIdProduct.value, {
+      ...formDataProduct.value,
+      status: statusToggle.value ? 'ACTIVE' : 'INACTIVE',
+    });
   }
 
   clearFormProduct();
@@ -1033,6 +1038,7 @@ watch(currentStatus, async () => {
               :price="i.price"
               :process="i.process"
               :id="i.id"
+              :status="i.status === 'INACTIVE' ? true : false"
               @menuViewDetail="
                 () => {
                   currentIdProduct = i.id;
@@ -1200,6 +1206,7 @@ watch(currentStatus, async () => {
         v-model:status-toggle="statusToggle"
         v-model:profile-submit="profileSubmit"
         @input-file="inputFile.click()"
+        :hide-toggle="false"
       />
     </template>
 
@@ -1255,7 +1262,23 @@ watch(currentStatus, async () => {
         v-model:status-toggle="statusToggle"
         v-model:profile-submit="profileSubmit"
         @input-file="inputFile.click()"
+        :label-status-toggle="'formDialogTitleProductStatus'"
+        :hide-toggle="false"
       />
+
+      <div class="text-left q-pt-md" v-if="infoProductEdit">
+        <q-toggle
+          id="toggle-status"
+          dense
+          size="md"
+          v-model="statusToggle"
+          padding="none"
+          class="q-pr-md"
+        />
+        <span>
+          {{ statusToggle ? $t('switchOnLabel') : $t('switchOffLabel') }}
+        </span>
+      </div>
     </template>
 
     <AppBox class="col-10" bordered>