From b4e0280ca9880b306a80f9cd221794a922c8cfd9 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 20 Feb 2024 15:53:24 +0700 Subject: [PATCH] =?UTF-8?q?get=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=20revisionId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_organizationalNew/components/TreeView.vue | 3 +++ .../02_organizationalNew/interface/request/organizational.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/src/modules/02_organizationalNew/components/TreeView.vue b/src/modules/02_organizationalNew/components/TreeView.vue index 59c3b5c93..d388d5d00 100644 --- a/src/modules/02_organizationalNew/components/TreeView.vue +++ b/src/modules/02_organizationalNew/components/TreeView.vue @@ -46,6 +46,7 @@ const reqMaster = reactive({ page: 1, pageSize: 10, keyword: "", + revisionId: "", }); const totalPage = ref(1); const action1 = ref(false); @@ -96,6 +97,8 @@ async function fetchDataTable(id: string, level: number, action: boolean) { reqMaster.page = 1; reqMaster.pageSize = 10; reqMaster.keyword = ""; + reqMaster.revisionId = + store.typeOrganizational == "draft" ? store.draftId : store.activeId; } if (action === true) { diff --git a/src/modules/02_organizationalNew/interface/request/organizational.ts b/src/modules/02_organizationalNew/interface/request/organizational.ts index 829572810..074095c3d 100644 --- a/src/modules/02_organizationalNew/interface/request/organizational.ts +++ b/src/modules/02_organizationalNew/interface/request/organizational.ts @@ -5,6 +5,7 @@ interface FilterMaster { page: number; //*หน้า pageSize: number; //*จำนวนแถวต่อหน้า keyword: string; //ข้อความที่ต้องการค้นหา + revisionId?: string } interface MovePos { id: string;