From a97656e94389710d48e2218a516d9a7da07b0396 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Thu, 24 Oct 2024 13:33:06 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B8=AD=20API=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B1=E0=B8=81=E0=B8=A9=E0=B8=B2=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/02_organizational/api.organization.ts | 1 + src/modules/17_acting/views/main.vue | 1 + src/modules/18_command/components/DialogCreateCommandORG.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts index 4c7c93594..fc5a086ed 100644 --- a/src/api/02_organizational/api.organization.ts +++ b/src/api/02_organizational/api.organization.ts @@ -138,6 +138,7 @@ export default { checkIsDeputys: (id: string) => `${organization}/check/root/${id}`, orgPosReport:`${orgPos}/report/draft`, + orgPosReportAct:`${orgPos}/act/report/draft`, /** * workflow */ diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue index 8922505ed..20f9458fa 100644 --- a/src/modules/17_acting/views/main.vue +++ b/src/modules/17_acting/views/main.vue @@ -69,6 +69,7 @@ const isLaod = ref(false); */ async function updateSelected(data: PosMaster) { posmasterId.value = data.posmasterId; + storeActing.rootId = data.orgTreeId; isLaod.value = true; // เรียกใช้ function fetch รายชื่อ ,fetch รายชื่อรักษาการ await Promise.all([fetchPosMaster(), fetchListAct()]).finally(() => { diff --git a/src/modules/18_command/components/DialogCreateCommandORG.vue b/src/modules/18_command/components/DialogCreateCommandORG.vue index 78ea9c5b6..ef2aba8f6 100644 --- a/src/modules/18_command/components/DialogCreateCommandORG.vue +++ b/src/modules/18_command/components/DialogCreateCommandORG.vue @@ -237,7 +237,7 @@ function getPerson() { ? config.API.orgPosSalaryReport + `${commandCode.value}/${props.salaryPeriodId}` : props.systemName === "ACTING" - ? config.API.orgPosReport + ? config.API.orgPosReportAct : ""; showLoader();