diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue index 1556460..c4c8690 100644 --- a/src/modules/06_evaluate/components/EvaluateStepMain.vue +++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue @@ -133,24 +133,24 @@ async function updateFilePDF(url: any, urlDownload: string) { urlDownloadFile.value = urlDownload; } -/** function เช็คการยื่นข้อประเมิน*/ -async function fetchCheckStatus() { - showLoader(); - await http - .get(config.API.evaluationCheckStatus()) - .then((res) => { - const data = res.data.result; - const id = - route.params.type === "expert" ? data.expertId : data.specialExpertId; - router.push(`/evaluate/detail/${route.params.type}/${id}`); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }); -} +// /** function เช็คการยื่นข้อประเมิน*/ +// async function fetchCheckStatus() { +// showLoader(); +// await http +// .get(config.API.evaluationCheckStatus()) +// .then((res) => { +// const data = res.data.result; +// const id = +// route.params.type === "expert" ? data.expertId : data.specialExpertId; +// router.push(`/evaluate/detail/${route.params.type}/${id}`); +// }) +// .catch((err) => { +// messageError($q, err); +// }) +// .finally(() => { +// hideLoader(); +// }); +// } async function fetchCheckStep(id: string) { showLoadStatus.value = false; @@ -302,8 +302,9 @@ async function saveStep1() { await http .post(config.API.evaluationCheckspec(), form) - .then(() => { - fetchCheckStatus(); + .then((res) => { + const id = res.data.result.id; + router.push(`/evaluate/detail/${route.params.type}/${id}`); }) .catch((err) => { messageError($q, err); diff --git a/src/modules/06_evaluate/components/TableListEvaluate.vue b/src/modules/06_evaluate/components/TableListEvaluate.vue index c5bb0c2..7cb9ca6 100644 --- a/src/modules/06_evaluate/components/TableListEvaluate.vue +++ b/src/modules/06_evaluate/components/TableListEvaluate.vue @@ -66,8 +66,8 @@ const columns = ref([ }, ]); const pagination = ref({ - sortBy: "", - descending: true, + // sortBy: "", + descending: false, page: props.page, rowsPerPage: props.pageSize, });