Merge branch 'nice_dev' into develop

src/modules/07_insignia/components/2_Manage/listManage.vue

@@ -95,10 +95,11 @@ const fecthAgency = async () => {
   await http
     .get(config.API.insigniaAgency())
     .then(async (res) => {
-      DataStore.agency = res.data.result;
       loadview.value = true;
+      DataStore.agency = res.data.result;
       if (roleDataStore.adminRole) {
         await fecthType(); // ถ้าไม่มีหนวยงานจะเรียกหน่วยงานทั้งหมด
+      } else {
       }
     })
     .catch((err) => {
@@ -323,9 +324,9 @@ const backToEditinsignia2Role = async (reason: string) => {
 };
 // ล็อกข้อมูลรอบการเสนอขอ
 const requestSendNote = async () => {
-  var organization = await (DataStore.agency != null
-    ? DataStore.agency
-    : DataStore.typeOc);
+  // var organization = await (DataStore.agency != null
+  //   ? DataStore.agency
+  //   : DataStore.typeOc);
   dialogConfirm($q, async () => {
     showLoader();
     await http
@@ -336,7 +337,7 @@ const requestSendNote = async () => {
         success($q, "บันทึกสำเร็จ");
         await fecthInsigniaByOc(
           round.value,
-          organization,
+          DataStore.typeOc,
           "officer",
           tab.value
         );
@@ -399,6 +400,7 @@ const uploadFile = async (event: any) => {
 
       <q-space />
       <!-- สกจ. Freez ข้อมูล -->
+
       <q-btn
         v-if="
           roleDataStore.adminRole && DataStore.isLock !== true && hideBottom