refactor: handle status

src/pages/01_branch-management/MainPage.vue

@@ -1811,7 +1811,7 @@ watch(currentHq, () => {
           style="position: absolute; z-index: 99999; top: 0; right: 0"
         >
           <div
-            v-if="formData.status !== 'INACTIVE'"
+            v-if="formData.status !== 'INACTIVE' || !currentId"
             class="surface-1 row rounded"
           >
             <UndoButton

src/pages/02_personnel-management/MainPage.vue

@@ -318,6 +318,7 @@ function onClose(excludeDialog?: boolean) {
     infoDrawer.value = excludeDialog || false;
     return;
   }
+  modal.value = false;
   hqId.value = '';
   brId.value = '';
   userCode.value = '';
@@ -325,7 +326,6 @@ function onClose(excludeDialog?: boolean) {
   profileFileImg.value = null;
   infoDrawerEdit.value = false;
   agencyFile.value = [];
-  modal.value = false;
   isEdit.value = false;
   statusToggle.value = true;
   isImageEdit.value = false;
@@ -443,12 +443,6 @@ async function onSubmit(excludeDialog?: boolean) {
   } else {
     if (!hqId.value) return;
 
-    if (statusToggle.value) {
-      formData.value.status = 'CREATED';
-    } else {
-      formData.value.status = 'INACTIVE';
-    }
-
     formData.value.branchId = brId.value
       ? brId.value
       : hqId.value
@@ -1798,10 +1792,7 @@ watch(
             'q-py-sm q-px-lg': !$q.screen.gt.sm,
           }"
         >
-          <div
-            v-if="formData.status !== 'INACTIVE'"
-            class="surface-1 row rounded"
-          >
+          <div class="surface-1 row rounded">
             <SaveButton id="btn-info-basic-save" icon-only type="submit" />
           </div>
         </div>

src/pages/04_product-service/MainPage.vue

@@ -1118,6 +1118,7 @@ async function submitService(notClose = false) {
     const res = await createService(
       {
         ...formDataProductService.value,
+
         workflowId: currWorkflow.value?.id || '',
       },
       onCreateImageList.value,
@@ -1197,7 +1198,11 @@ async function submitGroup() {
       await editProductGroup(currentIdGroupTree.value, formDataGroup.value);
     else await editProductGroup(currentIdGroup.value, formDataGroup.value);
   } else {
-    const res = await createProductGroup(formDataGroup.value);
+    const res = await createProductGroup({
+      ...formDataGroup.value,
+      status:
+        currentStatusGroupType.value === 'CREATED' ? undefined : 'INACTIVE',
+    });
 
     if (res) {
       allStat.value[0].count = allStat.value[0].count + 1;