diff --git a/src/modules/01_metadata/components/insignia/Insignia.vue b/src/modules/01_metadata/components/insignia/Insignia.vue index ecc746a5b..c5db8f96f 100644 --- a/src/modules/01_metadata/components/insignia/Insignia.vue +++ b/src/modules/01_metadata/components/insignia/Insignia.vue @@ -579,14 +579,15 @@ const fetchData = async (load: boolean = false) => { const result = await getInsignia(false, load); version.value = result.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่ idVersion.value = result.idversion; //เลข id ใน mongodb + + updateData.value = false; + rows.value = result.data; rows.value.sort( ( firstItem: RequestItemsHistoryObject, secondItem: RequestItemsHistoryObject ) => firstItem.level - secondItem.level ); - updateData.value = false; - rows.value = result.data; const data = rows.value; let option: DataOption[] = []; data.map((r: RequestItemsHistoryObject) => { diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue index 8e8109ccd..4e3678709 100644 --- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue @@ -504,7 +504,7 @@ const OriginalDataFetch = async () => { // ดูรายการหน้าต่อไป const redirectToPage = (id?: number) => { // router.push({ name: 'placementDetail'}); - router.push(`/placement/order/detail`); + // router.push(`/placement/order/detail`); }; const clickDelete = (id: string) => { diff --git a/src/modules/05_placement/components/OrderPlacement/step/step02.vue b/src/modules/05_placement/components/OrderPlacement/step/step02.vue index d55587ca6..de1fab70a 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step02.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step02.vue @@ -59,6 +59,7 @@ v-model:selected="selected" class="custom-header-table" :pagination-label="paginationLabel" + v-model:pagination="pagination" >