From 736bd7eb6a610a7785955174b2d30cf9d57c754b Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 10 Oct 2023 11:16:52 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A=20=E0=B8=AA?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=96=E0=B8=B2=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leave/api.leave.ts | 2 + .../03_retire/interface/request/Main.ts | 29 + src/modules/03_retire/views/result.vue | 882 +++++++++++------- src/modules/04_checkin/views/Checkin.vue | 417 ++++++--- 4 files changed, 861 insertions(+), 469 deletions(-) create mode 100644 src/modules/03_retire/interface/request/Main.ts diff --git a/src/api/leave/api.leave.ts b/src/api/leave/api.leave.ts index 821955e..ce6edbf 100644 --- a/src/api/leave/api.leave.ts +++ b/src/api/leave/api.leave.ts @@ -8,4 +8,6 @@ export default { resingByid: (id: string) => `${retirementResign}/resign/${id}`, questionnaireByid: (id: string) => `${retirementResign}/resign/questionnaire/${id}`, listquestionnaire: () => `${retirementResign}/resign/questionnaire`, + // คำถาม + questionList: () => `${retirementResign}/resign/questionnaire/question` } diff --git a/src/modules/03_retire/interface/request/Main.ts b/src/modules/03_retire/interface/request/Main.ts new file mode 100644 index 0000000..5af4623 --- /dev/null +++ b/src/modules/03_retire/interface/request/Main.ts @@ -0,0 +1,29 @@ +interface QuestionDescription { + question1Desc: string; + question2Desc: string; + question3Desc: string; + question4Desc: string; + question5Desc: string; + question6Desc: string; + question7Desc: string; + question8Desc: string; + question9Desc: string; + question10Desc: string; + [key: string]: string; +} + +interface OptionQuestions { + label: string; + value: number; +} +interface OptionQuestions2 { + label: string; + value: boolean; +} + + +export type { + QuestionDescription, + OptionQuestions, + OptionQuestions2 +}; diff --git a/src/modules/03_retire/views/result.vue b/src/modules/03_retire/views/result.vue index 6c51a94..b169ea3 100644 --- a/src/modules/03_retire/views/result.vue +++ b/src/modules/03_retire/views/result.vue @@ -1,339 +1,581 @@ diff --git a/src/modules/04_checkin/views/Checkin.vue b/src/modules/04_checkin/views/Checkin.vue index 8652ee2..12138b7 100644 --- a/src/modules/04_checkin/views/Checkin.vue +++ b/src/modules/04_checkin/views/Checkin.vue @@ -1,158 +1,221 @@