diff --git a/src/modules/01_metadata/components/insignia/Insignia.vue b/src/modules/01_metadata/components/insignia/Insignia.vue index fa149da94..a6f3ac6eb 100644 --- a/src/modules/01_metadata/components/insignia/Insignia.vue +++ b/src/modules/01_metadata/components/insignia/Insignia.vue @@ -585,12 +585,13 @@ const fetchData = async (load: boolean = false) => { secondItem: RequestItemsHistoryObject ) => firstItem.level - secondItem.level ); - const data = rows.value; - let option: DataOption[] = []; - data.map((r: RequestItemsHistoryObject) => { - option.push({ id: r.id.toString(), name: r.name.toString() }); - }); - insigniaTypeOption.value = option; + // const data = rows.value; + // let option: DataOption[] = []; + // data.map((r: RequestItemsHistoryObject) => { + // option.push({ id: r.id.toString(), name: r.name.toString() }); + // }); + // insigniaTypeOption.value = option; + fetchinsigniaType(); updateData.value = true; // rows.value.splice(0); // showLoader(); @@ -635,26 +636,26 @@ const fetchData = async (load: boolean = false) => { /** * รายการลำดับเครื่องราชฯ */ -// const fetchinsigniaType = async () => { -// showLoader(); -// await http -// .get(config.API.insigniaType) -// .then((res) => { -// const data = res.data.result; -// let option: DataOption[] = []; -// data.map((r: RequestItemsHistoryObject) => { -// option.push({ id: r.id.toString(), name: r.name.toString() }); -// }); -// insigniaTypeOption.value = option; -// }) -// .catch((e) => { -// messageError($q, e); -// }) -// .finally(() => { -// updateData.value = false; -// hideLoader(); -// }); -// }; +const fetchinsigniaType = async () => { + showLoader(); + await http + .get(config.API.insigniaType) + .then((res) => { + const data = res.data.result; + let option: DataOption[] = []; + data.map((r: RequestItemsHistoryObject) => { + option.push({ id: r.id.toString(), name: r.name.toString() }); + }); + insigniaTypeOption.value = option; + }) + .catch((e) => { + messageError($q, e); + }) + .finally(() => { + updateData.value = false; + hideLoader(); + }); +}; /** * ฟังชั้นดูข้อมูลประวัติแก้ไขข้อมูลทั้งหมด diff --git a/src/modules/01_metadata/components/insignia/InsigniaType.vue b/src/modules/01_metadata/components/insignia/InsigniaType.vue index 7e4105f79..d9110690f 100644 --- a/src/modules/01_metadata/components/insignia/InsigniaType.vue +++ b/src/modules/01_metadata/components/insignia/InsigniaType.vue @@ -366,6 +366,7 @@ const fetchData = async (load: boolean = false) => { const result = await getInsigniaType(false, load); version.value = result.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ idVersion.value = result.idversion; //เลข id ใน mongodb + rows.value = result.data; updateData.value = false; // rows.value.splice(0); diff --git a/src/modules/01_metadata/store.ts b/src/modules/01_metadata/store.ts index f5f2dbee2..eb9b09b71 100644 --- a/src/modules/01_metadata/store.ts +++ b/src/modules/01_metadata/store.ts @@ -831,6 +831,7 @@ export const useManageDataStore = defineStore("manage", () => { JSON.stringify(dataInsigniaType.value.data) == JSON.stringify(draftInsigniaType.value.data) ) { + draftInsigniaType.value && await fetchInsigniaType(false, selector); return draftInsigniaType.value; } else { await fetchInsigniaType(false, selector);