diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index a86256448..543e671d2 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -35,6 +35,9 @@ const appointTopic = ref(); const appointOp = ref([]); const appointAll = ref([]); +const reportPersonId = ref([]); +const reportPersonIdOp = ref([]); + const fullname = ref(); const date_start = ref(); const date_finish = ref(); @@ -549,6 +552,7 @@ function putDataEdit(id: string) { }); } const data = { + reportPersonId: reportPersonId.value ? reportPersonId.value : "", appointId: appointTopic.value ? appointTopic.value.id : "", fullname: fullname.value, position: position.value, @@ -682,6 +686,7 @@ function putData(id: string) { }); } const data = { + reportPersonId: reportPersonId.value ? reportPersonId.value : "", appointId: appointTopic.value ? appointTopic.value.id : "", personalId: GUID, fullname: fullname.value, @@ -755,7 +760,7 @@ async function getAssign() { isEdit.value = false; const data = res.data.data; fullname.value = data.profile.name; - appointTopic.value = data.assign.appointId + appointTopic.value = data.assign.appointId; position.value = data.profile.positionName; date_start.value = data.assign.date_start; date_finish.value = data.assign.date_finish; @@ -978,6 +983,16 @@ async function getAppoint(id: string) { function updateAppointMent() { if (appointTopic.value) { const data = appointTopic.value.directors; + const dataPerson = data.map((dataPerson: AppointTopic) => ({ + ...dataPerson, + name: `${dataPerson.name} (${dataPerson.position}${ + dataPerson.positionLevel && dataPerson.positionType + ? ", " + dataPerson.positionType + ": " + dataPerson.positionLevel + : "" + })`, + })); + + reportPersonIdOp.value = dataPerson; const dataFindChairman = data.find( (item: AppointTopic) => item.role === "chairman" @@ -987,10 +1002,10 @@ function updateAppointMent() { ); const dataFindCaretaker1 = data.filter( (item: AppointTopic) => item.role === "caregiver" - )[0]; + )[0]; const dataFindCaretaker2 = data.filter( (item: AppointTopic) => item.role === "caregiver" - )[1]; + )[1]; const createChairmanObject = (dataPerson: AppointTopic) => ({ id: dataPerson.id, @@ -1145,26 +1160,51 @@ onMounted(async () => {
-
-
- +
+
+
+ +
+
+ +
+
1 ผู้ทดลองปฏิบัติหน้าที่ราชการ diff --git a/src/modules/05_placement/components/probation/MainDetail.vue b/src/modules/05_placement/components/probation/MainDetail.vue index a442b8d53..d70daf01c 100644 --- a/src/modules/05_placement/components/probation/MainDetail.vue +++ b/src/modules/05_placement/components/probation/MainDetail.vue @@ -41,9 +41,6 @@ const TabsTemplate3 = defineAsyncComponent( const SummaryScore = defineAsyncComponent( () => import("@/modules/05_placement/components/probation/SummaryScore.vue") ); -const SummarySurvey = defineAsyncComponent( - () => import("@/modules/05_placement/components/probation/SummarySurvey.vue") -); const router = useRouter(); const route = useRoute(); @@ -211,18 +208,6 @@ onMounted(() => { > ผลการประเมินการ ฯ - - - แบบสํารวจ
ความคิดเห็น
-
@@ -261,10 +246,6 @@ onMounted(() => { - - - - diff --git a/src/modules/05_placement/components/probation/SummarySurvey.vue b/src/modules/05_placement/components/probation/SummarySurvey.vue deleted file mode 100644 index 50d4d7704..000000000 --- a/src/modules/05_placement/components/probation/SummarySurvey.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - -