diff --git a/src/pages/05_quotation/QuotationFormInfo.vue b/src/pages/05_quotation/QuotationFormInfo.vue
index fe774254..061220e6 100644
--- a/src/pages/05_quotation/QuotationFormInfo.vue
+++ b/src/pages/05_quotation/QuotationFormInfo.vue
@@ -20,7 +20,7 @@ defineEmits<{
   (e: 'changePayType', type: PayCondition): void;
 }>();
 
-const props = defineProps<{
+defineProps<{
   readonly?: boolean;
   quotationNo?: string;
   installmentNo?: number[];
@@ -111,42 +111,42 @@ function calculateInstallments(param: {
   if (param.newCount !== null && param.oldCount !== null) {
     const totalAmount = summaryPrice.value.finalPrice;
 
-    if (param.newCount > param.oldCount) {
-      const installmentAmount = +(totalAmount / param.newCount).toFixed(2);
+    // if (param.newCount > param.oldCount) {
+    //   const installmentAmount = +(totalAmount / param.newCount).toFixed(2);
 
-      // Update existing
-      paySplit.value.forEach((payment, i) => {
-        if (i !== param.customIndex) {
-          payment.amount = installmentAmount;
-          amount4Show.value[i] = installmentAmount.toString();
-        }
-      });
+    //   // Update existing
+    //   paySplit.value.forEach((payment, i) => {
+    //     if (i !== param.customIndex) {
+    //       payment.amount = installmentAmount;
+    //       amount4Show.value[i] = installmentAmount.toString();
+    //     }
+    //   });
 
-      // Add
-      for (let i = param.oldCount; i < param.newCount; i++) {
-        paySplit.value.push({
-          no: i + 1,
-          amount: installmentAmount,
-        });
-        amount4Show.value.push(installmentAmount.toString());
-      }
-    } else if (param.newCount < param.oldCount) {
-      // Remove extra
-      paySplit.value.splice(param.newCount, param.oldCount - param.newCount);
-      amount4Show.value.splice(param.newCount, param.oldCount - param.newCount);
+    //   // Add
+    //   for (let i = param.oldCount; i < param.newCount; i++) {
+    //     paySplit.value.push({
+    //       no: i + 1,
+    //       amount: installmentAmount,
+    //     });
+    //     amount4Show.value.push(installmentAmount.toString());
+    //   }
+    // } else if (param.newCount < param.oldCount) {
+    //   // Remove extra
+    //   paySplit.value.splice(param.newCount, param.oldCount - param.newCount);
+    //   amount4Show.value.splice(param.newCount, param.oldCount - param.newCount);
 
-      // Recalculate
-      const installmentAmount = +(totalAmount / param.newCount).toFixed(2);
-      paySplit.value.forEach((payment, i) => {
-        if (i !== param.customIndex) {
-          payment.amount = installmentAmount;
-          amount4Show.value[i] = installmentAmount.toString();
-        }
-      });
-    } else if (param.newCount === param.oldCount) {
+    //   // Recalculate
+    //   const installmentAmount = +(totalAmount / param.newCount).toFixed(2);
+    //   paySplit.value.forEach((payment, i) => {
+    //     if (i !== param.customIndex) {
+    //       payment.amount = installmentAmount;
+    //       amount4Show.value[i] = installmentAmount.toString();
+    //     }
+    //   });
+    if (param.newCount === param.oldCount) {
       if (param.customIndex !== undefined && param.customAmount !== undefined) {
         paySplit.value[param.customIndex].amount = param.customAmount;
-        amount4Show.value[param.customIndex] = param.customAmount.toString();
+        // amount4Show.value[param.customIndex] = param.customAmount.toString();
       }
     }
 
@@ -159,8 +159,11 @@ function calculateInstallments(param: {
       const remainingAmount = totalAmount - totalPreviousPayments;
       paySplit.value[paySplit.value.length - 1].amount =
         +remainingAmount.toFixed(2);
-      amount4Show.value[amount4Show.value.length - 1] =
-        (+remainingAmount.toFixed(2)).toString();
+      amount4Show.value[amount4Show.value.length - 1] = commaInput(
+        paySplit.value[paySplit.value.length - 1].amount.toString(),
+      );
+      // amount4Show.value[amount4Show.value.length - 1] =
+      //   (+remainingAmount.toFixed(2)).toString();
     }
   }
 }
@@ -180,6 +183,15 @@ function calculateInstallments(param: {
 //   },
 //   { deep: true },
 // );
+
+watch(
+  () => paySplit.value,
+  () => {
+    amount4Show.value = paySplit.value.map((payment) =>
+      commaInput(payment.amount.toString()),
+    );
+  },
+);
 </script>
 
 <template>
@@ -296,28 +308,36 @@ function calculateInstallments(param: {
                   :readonly="readonly || payType === 'Split'"
                   class="col q-mx-sm"
                   :label="$t('quotation.amount')"
-                  :model-value="commaInput(period.amount.toString())"
+                  :model-value="
+                    amount4Show[i] || commaInput(period.amount.toString())
+                  "
                   dense
                   outlined
-                  debounce="500"
-                  @focus="(e) => (e.target as HTMLInputElement).select()"
+                  @blur="
+                    () => {
+                      period.amount = Number(amount4Show[i]?.replace(/,/g, ''));
+                      if (period.amount % 1 === 0) {
+                        const [, dec] = amount4Show[i].split('.');
+                        if (!dec) {
+                          amount4Show[i] += '.00';
+                        }
+                      }
+                    }
+                  "
                   @update:model-value="
                     (v) => {
                       if (readonly) return;
 
-                      if (typeof v === 'string') amount4Show[i] = commaInput(v);
-                      const x = parseFloat(
-                        amount4Show[i] && typeof amount4Show[i] === 'string'
-                          ? amount4Show[i].replace(/,/g, '')
-                          : '',
+                      amount4Show[i] = commaInput(
+                        v?.toString() || '0',
+                        'string',
                       );
 
-                      period.amount = precisionRound(x);
-                      commaInput(period.amount.toString());
-
                       calculateInstallments({
                         customIndex: i,
-                        customAmount: x,
+                        customAmount: parseFloat(
+                          amount4Show[i].replace(/,/g, ''),
+                        ),
                         newCount: paySplit.length,
                         oldCount: paySplit.length,
                       });