From 6246daa6c02863d2a6bc4ac1dea82a8116d3e4a4 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Wed, 21 Aug 2024 10:11:56 +0700
Subject: [PATCH] fix(04): submit on tab 2

---
 .../04_product-service/BasicInformation.vue       |  1 +
 src/pages/04_product-service/MainPage.vue         | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/components/04_product-service/BasicInformation.vue b/src/components/04_product-service/BasicInformation.vue
index 9b2598bf..a2ce2959 100644
--- a/src/components/04_product-service/BasicInformation.vue
+++ b/src/components/04_product-service/BasicInformation.vue
@@ -219,6 +219,7 @@ const serviceCodeFilter = selectFilterOptionRefMod(
         class="col-6"
         :label="$t('serviceName')"
         v-model="serviceName"
+        :rules="[(val: string) => !!val || $t('pleaseInformation')]"
       />
       <q-input
         lazy-rules="ondemand"
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index 9290814e..f1d23f71 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -1069,6 +1069,14 @@ async function submitService() {
       formDataProductService.value.registeredBranchId = null;
     }
 
+    if (
+      formDataProductService.value.code === '' ||
+      formDataProductService.value.name === ''
+    ) {
+      serviceTab.value = 1;
+      return;
+    }
+
     const res = await createService(formDataProductService.value);
     if (res) {
       stat.value[2].count = stat.value[2].count + 1;
@@ -1102,6 +1110,13 @@ async function submitProduct() {
   }
 
   if (dialogProduct.value) {
+    if (
+      formDataProduct.value.name === '' ||
+      formDataProduct.value.code === ''
+    ) {
+      productTab.value = 1;
+      return;
+    }
     const res = await createProduct(formDataProduct.value);
 
     if (res) {