From a3787f976a8d92b2ab7f7c5232931dc2ab79edd5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 20 Dec 2023 14:23:27 +0700 Subject: [PATCH] =?UTF-8?q?=20ui=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9C=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/06_evaluate/components/Tab1.vue | 46 +++- .../components/directorandmeet/Table.vue | 18 +- .../06_evaluate/components/step/step1.vue | 16 +- .../06_evaluate/components/step/step2.vue | 37 +-- .../06_evaluate/components/step/step3.vue | 9 +- .../06_evaluate/components/step/step5.vue | 70 +++++- .../06_evaluate/components/step/step6.vue | 141 ++++++++++- .../06_evaluate/components/step/step8.vue | 229 +++++++++++++++++- .../06_evaluate/components/step/step9.vue | 12 +- .../components/viewstep/popupHistory.vue | 149 ++++++++++++ src/modules/06_evaluate/store.ts | 2 +- .../06_evaluate/stores/evaluationFunction.ts | 77 +++--- .../06_evaluate/views/EvaluateMain.vue | 4 +- 13 files changed, 717 insertions(+), 93 deletions(-) create mode 100644 src/modules/06_evaluate/components/viewstep/popupHistory.vue diff --git a/src/modules/06_evaluate/components/Tab1.vue b/src/modules/06_evaluate/components/Tab1.vue index 19c9289..3e56065 100644 --- a/src/modules/06_evaluate/components/Tab1.vue +++ b/src/modules/06_evaluate/components/Tab1.vue @@ -25,6 +25,7 @@ import ViewStep3 from "@/modules/06_evaluate/components/viewstep/viewStep3.vue"; import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue"; import DialogMain from "@/modules/06_evaluate/components/directorandmeet/DialogMain.vue"; +import PopupHistory from "@/modules/06_evaluate/components/viewstep/popupHistory.vue"; import { useEvaluateStore } from "@/modules/06_evaluate/store"; import { useCounterMixin } from "@/stores/mixin"; @@ -87,8 +88,6 @@ async function onCilckNextStep() { ? await saveStep5 : store.step === 5 ? await saveStep5 - : store.step === 6 - ? await saveStep6 : store.step === 7 ? await saveStep7 : store.step === 8 @@ -96,7 +95,7 @@ async function onCilckNextStep() { : store.step === 9 ? await saveStep9 : null; - store.step === 2 + store.step === 2 || store.step === 6 ? validateStep2() : store.step < 9 && dialogConfirm( @@ -215,9 +214,14 @@ function fetchDirector() { function fetchMeeting() { console.log("ประเมินชำนาญการ:meeting"); } +const modalHistory = ref(false); +function onClickPopupHistory() { + modalHistory.value = !modalHistory.value; + + console.log(modalHistory.value); +} onMounted(async () => { - store.step = 1; await fetchCheckStatus(); }); @@ -225,10 +229,22 @@ onMounted(async () => { diff --git a/src/modules/06_evaluate/components/step/step9.vue b/src/modules/06_evaluate/components/step/step9.vue index cb2c3f3..47d3944 100644 --- a/src/modules/06_evaluate/components/step/step9.vue +++ b/src/modules/06_evaluate/components/step/step9.vue @@ -7,14 +7,22 @@ const status = ref("DONE"); diff --git a/src/modules/06_evaluate/components/viewstep/popupHistory.vue b/src/modules/06_evaluate/components/viewstep/popupHistory.vue new file mode 100644 index 0000000..3fc819f --- /dev/null +++ b/src/modules/06_evaluate/components/viewstep/popupHistory.vue @@ -0,0 +1,149 @@ + + + + diff --git a/src/modules/06_evaluate/store.ts b/src/modules/06_evaluate/store.ts index 11efe15..fac1525 100644 --- a/src/modules/06_evaluate/store.ts +++ b/src/modules/06_evaluate/store.ts @@ -4,7 +4,7 @@ import { ref } from "vue"; export const useEvaluateStore = defineStore("evaluateStore", () => { const tabMenu = ref("1"); const showLoadStatus = ref(false); - const step = ref(1); + const step = ref(0); const currentStep = ref(1); const title = ref([ "ตรวจสอบคุณสมบัติ", diff --git a/src/modules/06_evaluate/stores/evaluationFunction.ts b/src/modules/06_evaluate/stores/evaluationFunction.ts index e7fe232..bbd9b1f 100644 --- a/src/modules/06_evaluate/stores/evaluationFunction.ts +++ b/src/modules/06_evaluate/stores/evaluationFunction.ts @@ -23,9 +23,7 @@ async function fetchCheckStatus() { store.tabMenu === "1" ? (store.evaluateId = data.expertId) : (store.evaluateId = data.specialExpertId); - store.evaluateId && fetchCheckStep(); - - store.showLoadStatus = true; + fetchCheckStep(store?.evaluateId); }) .catch((err) => { messageError($q, err); @@ -35,38 +33,43 @@ async function fetchCheckStatus() { }); } -async function fetchCheckStep() { - await http - .get(config.API.evaluationCheckStep(store.evaluateId)) - .then((res) => { - const data = res.data.result; - let step = - data.Step === "CHECK_SPEC" - ? 1 - : data.Step === "PREPARE_DOC_V1" - ? 2 - : data.Step === "CHECK_DOC_V1" - ? 3 - : data.Step === "WAIT_CHECK_DOC_V1" - ? 4 - : data.Step === "ANNOUNCE_WEB" - ? 5 - : data.Step === "PREPARE_DOC_V2" - ? 6 - : data.Step === "CHECK_DOC_V2" - ? 7 - : data.Step === "WAIT_CHECK_DOC_V2" - ? 8 - : data.Step === "DONE" - ? 9 - : 0; +async function fetchCheckStep(id: string) { + if (id) { + await http + .get(config.API.evaluationCheckStep(id)) + .then((res) => { + const data = res.data.result; - store.currentStep = step; - store.step = step; - }) - .catch((err) => { - messageError($q, err); - }); + let step = + data.Step === "CHECK_SPEC" + ? 1 + : data.Step === "PREPARE_DOC_V1" + ? 2 + : data.Step === "CHECK_DOC_V1" + ? 3 + : data.Step === "WAIT_CHECK_DOC_V1" + ? 4 + : data.Step === "ANNOUNCE_WEB" + ? 5 + : data.Step === "PREPARE_DOC_V2" + ? 6 + : data.Step === "CHECK_DOC_V2" + ? 7 + : data.Step === "WAIT_CHECK_DOC_V2" + ? 8 + : data.Step === "DONE" + ? 9 + : 1; + store.currentStep = step; + store.step = step; + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + store.showLoadStatus = true; + }); + } else (store.step = 1), (store.showLoadStatus = true); } async function saveEvaluation(body: any) { @@ -176,7 +179,7 @@ async function saveEvaluation(body: any) { }) .finally(() => { hideLoader(); - fetchCheckStep(); + fetchCheckStep(store?.evaluateId); }); } @@ -192,7 +195,7 @@ async function nextPrapare(type: string, body: any) { }) .finally(() => { hideLoader(); - fetchCheckStep(); + fetchCheckStep(store?.evaluateId); }); } @@ -223,7 +226,7 @@ async function nextCheckDoc(type: string) { }) .finally(() => { hideLoader(); - fetchCheckStep(); + fetchCheckStep(store?.evaluateId); }); } diff --git a/src/modules/06_evaluate/views/EvaluateMain.vue b/src/modules/06_evaluate/views/EvaluateMain.vue index 4ac14c1..2bd359d 100644 --- a/src/modules/06_evaluate/views/EvaluateMain.vue +++ b/src/modules/06_evaluate/views/EvaluateMain.vue @@ -24,7 +24,7 @@ onMounted(async () => {});
- {}); color="primary" class="q-mr-sm" @click="router.go(-1)" - /> + /> -->
ประเมินผล