From be5a4bcd535b04a3750ba616ef5f8067419d266d Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 30 Oct 2024 15:20:47 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/18_command/interface/request/Main.ts | 16 ++++++++++++++++ src/modules/18_command/views/detail.vue | 13 +++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/modules/18_command/interface/request/Main.ts b/src/modules/18_command/interface/request/Main.ts index 1caba8670..0848446eb 100644 --- a/src/modules/18_command/interface/request/Main.ts +++ b/src/modules/18_command/interface/request/Main.ts @@ -23,6 +23,21 @@ interface FormDataDetail { isBangkok: string | null; //คำสั่งสำนักปลัดกรุงเทพมหานคร } +interface FormCommandList { + id: string; + status: string; + commandTypeName: string; + commandNo: string; + commandYear: Date | null; + detailHeader: string; + detailBody: string; + detailFooter: string; + issue: string | null; + commandAffectDate: Date | null; + commandExcecuteDate: Date | null; + commandSysId: string; + isAttachment: boolean; +} interface ListCommandSalaryType { id: string; createdAt: Date | null; @@ -54,4 +69,5 @@ export type { FormDataDetail, ListCommandSalaryType, PersonInfo, + FormCommandList }; diff --git a/src/modules/18_command/views/detail.vue b/src/modules/18_command/views/detail.vue index 62408616b..e1f421f75 100644 --- a/src/modules/18_command/views/detail.vue +++ b/src/modules/18_command/views/detail.vue @@ -9,7 +9,7 @@ import { useCommandDetail } from "@/modules/18_command/store/DetailStore"; import { useCounterMixin } from "@/stores/mixin"; import type { ItemTabs } from "@/modules/18_command/interface/index/Main"; -import type { FormDataDetail } from "@/modules/18_command/interface/request/Main"; +import type { FormCommandList } from "@/modules/18_command/interface/request/Main"; import Main from "@/modules/18_command/components/Step/0_Main.vue"; //ประมวลผลคำสั่ง import Detail from "@/modules/18_command/components/Step/1_Detail.vue"; //รายละเอียดคำสั่ง @@ -41,7 +41,8 @@ const tabsManu = ref([ { label: "พรีวิวคำสั่ง", name: "Attached" }, ]); -let formCommandList = reactive({ +const statusCheck = ref(false) +let formCommandList = reactive({ id: "", status: "", commandTypeName: "", @@ -78,6 +79,7 @@ async function fetchDataCommandList() { .then(async (res) => { const data = await res.data.result; formCommandList = data; + statusCheck.value = data.commandSysId == 'PROBATION'? true:false; store.dataCommand = data; isChangeData.value = false; //จำลอง }) @@ -130,13 +132,13 @@ onMounted(async () => { > - @@ -157,8 +159,7 @@ onMounted(async () => { /> - - +