diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index 1b3def41..6d14d322 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -673,6 +673,7 @@ async function triggerSelectEmployeeDialog() {
 }
 
 function triggerProductServiceDialog() {
+  covertToNode();
   pageState.productServiceModal = true;
 }
 
@@ -1067,11 +1068,7 @@ const productServiceNodes = ref<ProductTree>([]);
 watch(
   () => productServiceList.value,
   () => {
-    productServiceNodes.value = quotationProductTree(
-      productServiceList.value,
-      agentPrice.value,
-      config.value?.vat,
-    );
+    covertToNode();
   },
 );
 
@@ -1302,6 +1299,14 @@ async function formDownload() {
   a.click();
   a.remove();
 }
+
+function covertToNode() {
+  productServiceNodes.value = quotationProductTree(
+    productServiceList.value,
+    agentPrice.value,
+    config.value?.vat,
+  );
+}
 </script>
 
 <template>
diff --git a/src/pages/12_debit-note/FormPage.vue b/src/pages/12_debit-note/FormPage.vue
index b9fab96e..9224cc4c 100644
--- a/src/pages/12_debit-note/FormPage.vue
+++ b/src/pages/12_debit-note/FormPage.vue
@@ -255,14 +255,18 @@ const QUOTATION_STATUS = [
   'ProcessComplete',
 ];
 
+function covertToNode() {
+  productServiceNodes.value = quotationProductTree(
+    productServiceList.value,
+    agentPrice.value,
+    config.value?.vat,
+  );
+}
+
 watch(
   () => productServiceList.value,
   () => {
-    productServiceNodes.value = quotationProductTree(
-      productServiceList.value,
-      agentPrice.value,
-      config.value?.vat,
-    );
+    covertToNode();
   },
 );
 
@@ -1102,7 +1106,12 @@ async function submitAccepted() {
             :agent-price="agentPrice"
             :employee-rows="selectedWorkerItem"
             :rows="productService"
-            @add-product="() => (pageState.productServiceModal = true)"
+            @add-product="
+              () => {
+                pageState.productServiceModal = true;
+                covertToNode();
+              }
+            "
             @update-rows="
               (v) => {
                 view === null && (productServiceList = v);