diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue index 572ebde..c06916f 100644 --- a/src/modules/06_evaluate/components/EvaluateStepMain.vue +++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue @@ -294,7 +294,9 @@ async function saveStep1() { const evaluateType = route.params.type.toString(); const form = { + root: formDetail.value.root, userId: formDetail.value.id, + orgRootId: formDetail.value.rootId, citizenId: formDetail.value.citizenId, prefix: formDetail.value.prefix, fullName: `${formDetail.value.prefix}${formDetail.value.firstName} ${formDetail.value.lastName}`, diff --git a/src/modules/06_evaluate/components/step/step8.vue b/src/modules/06_evaluate/components/step/step8.vue index b911678..c223835 100644 --- a/src/modules/06_evaluate/components/step/step8.vue +++ b/src/modules/06_evaluate/components/step/step8.vue @@ -27,7 +27,7 @@ const modalView = ref(false); const numOfPages = ref(0); const page = ref(1); const pdfSrc = ref(); - +const evaluationResult = ref(""); /** ไปหน้าต่อไปของรายงาน */ function nextPage() { if (page.value < numOfPages.value) { @@ -149,6 +149,7 @@ async function fetcheSigner(id: string) { author.value = data.authorDoc2; subject.value = data.subjectDoc2; assignedPosition.value = data.assignedPosition; + evaluationResult.value = data.evaluationResult; }) .catch(() => {}) .finally(() => { @@ -243,6 +244,17 @@ onMounted(async () => { +
+ ผลการพิจารณา : {{ evaluationResult == "PASS" ? "ผ่าน" : "ไม่ผ่าน" }} +
diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index d200008..1cd8c0a 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -72,6 +72,8 @@ async function fetchDetail() { .get(config.API.positionBykeycloak()) .then((res) => { const data = res.data.result; + formDetail.root = data.root; + formDetail.rootId = data.rootId; formDetail.userId = data.id; formDetail.citizenId = data.citizenId; formDetail.prefix = data.prefix;