Merge branch 'nice_dev' into develop

src/modules/02_organizationalNew/components/DialogNewStructure.vue

@@ -102,7 +102,7 @@ function onSubmit() {
           store.draftId = res.data.result.id;
           store.statusView = "list";
           success($q, "บันทึกข้อมูลสำเร็จ");
-          // props.fetchActive?.();
+          props.fetchActive?.();
         })
         .catch((err) => {
           messageError($q, err);

src/modules/02_organizationalNew/components/TreeView.vue

@@ -209,6 +209,13 @@ watch(
     }
   }
 );
+
+watch(
+  () => store.draftId,
+  () => {
+    store.draftId && fetchDataTree(store.draftId?.toString());
+  }
+);
 </script>
 
 <template>