From d3b9cb9cc4bf1617109a10af247a48dcd4ed3efe Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 26 Sep 2024 17:25:06 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=3D>=20Tab=20=E0=B8=9E?= =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A7=E0=B8=B4=E0=B8=A7=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=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 --- .../components/Step/3_ReceivedCopy.vue | 4 +- .../18_command/components/Step/4_Attached.vue | 211 +++++++++--------- .../18_command/interface/response/Main.ts | 18 ++ 3 files changed, 127 insertions(+), 106 deletions(-) diff --git a/src/modules/18_command/components/Step/3_ReceivedCopy.vue b/src/modules/18_command/components/Step/3_ReceivedCopy.vue index 5825b94ed..ba43820a6 100644 --- a/src/modules/18_command/components/Step/3_ReceivedCopy.vue +++ b/src/modules/18_command/components/Step/3_ReceivedCopy.vue @@ -302,8 +302,8 @@ defineExpose({ dense v-model="props.row.sendCC" :rules="[ - (val) => !!val || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`, - (val) => + (val:string) => !!val || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`, + (val:string) => val.length > 0 || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`, ]" :label="`${'เลือกช่องทางการส่งสำเนา'}`" diff --git a/src/modules/18_command/components/Step/4_Attached.vue b/src/modules/18_command/components/Step/4_Attached.vue index e8df6a0b3..36fc7af0f 100644 --- a/src/modules/18_command/components/Step/4_Attached.vue +++ b/src/modules/18_command/components/Step/4_Attached.vue @@ -1,33 +1,28 @@ @@ -209,14 +186,24 @@ onMounted(async () => { - + /> + +
@@ -242,9 +229,25 @@ onMounted(async () => {
-
+
+
+
+ +
+
+
diff --git a/src/modules/18_command/interface/response/Main.ts b/src/modules/18_command/interface/response/Main.ts index 2e743f79c..40c60bc25 100644 --- a/src/modules/18_command/interface/response/Main.ts +++ b/src/modules/18_command/interface/response/Main.ts @@ -53,9 +53,27 @@ interface DataFileDownload { upload: boolean; } +interface DataFileOrder { + reportName: string; + template: string; + data: { + commandDate: string; + commandExcecuteDate: string; + commandNo: string; + commandTitle: string; + commandYear: 2024; + detailBody: string; + detailFooter: string; + detailHeader: string; + name: string; + position: string; + }; +} + export type { ResListCommand, DataListCommand, DataCommandType, DataFileDownload, + DataFileOrder, };