แก้แบบมอบหมายงานฯ ไม่เเสดง

src/api/probation/api.probation.ts

@@ -21,6 +21,7 @@ export default {
     `${probation}/data-options/knowledge?personal_id=${personalId}`,
   probationsGetAssign: (assignId: string) =>
     `${probation}/assign/probation-assign?assign_id=${assignId}`,
+  probationsGetAssignNew: (assignId: string) => `${probation}/assign?assign_id=${assignId}`,
   summarySurveyDetail: (id: string) => `${probation}/survey?assign_id=${id}`,
   summaryDetail: () => `${probation}/survey`,
   saveEditAssign: (personalId: string) =>

src/modules/15_probationReport/components/03_AssignPage.vue

@@ -763,7 +763,7 @@ async function DataSave(id: string) {
 /** get ข้อมูลรายการมอบหมาย */
 async function getAssign() {
   await http
-    .get(config.API.probationsGetAssign(probationStore.assignId))
+    .get(config.API.probationsGetAssignNew(probationStore.assignId))
     .then((res) => {
       isEdit.value = false;
       const data = res.data.result;

src/modules/15_probationReport/interface/Main.ts

@@ -71,6 +71,13 @@ interface ProbationReportType {
   pass_result: number;
   evaluate_date: Date;
 }
+
+interface FileType{
+  path:string
+  pathname:string
+  fileName:string
+  title:string
+}
 export type {
   ListDataText,
   DataSurvey,
@@ -78,4 +85,5 @@ export type {
   AppointTopicMain,
   AppointTopic,
   ProbationReportType,
+  FileType
 };

src/modules/15_probationReport/views/main.vue

@@ -11,6 +11,7 @@ import { useProbationReport } from "@/modules/15_probationReport/store";
 import type {
   DataSurvey,
   ProbationReportType,
+  FileType
 } from "@/modules/15_probationReport/interface/Main";
 
 import SurveyPage from "@/modules/15_probationReport/components/01_SurveyPage.vue";
@@ -25,9 +26,12 @@ const { showLoader, hideLoader, messageError } = mixin;
 
 const dataSurvey = ref<any>(null);
 const isData = ref<boolean>(true);
-const dataProbation = ref<string>("");
-const dataResult1 = ref<string>("");
-const dataResult2 = ref<string>("");
+const dataProbation = ref<FileType[]>([]);
+const dataResult1 = ref<FileType[]>([]);
+const dataResult2 = ref<FileType[]>([]);
+// const dataProbation = ref<string>("");
+// const dataResult1 = ref<string>("");
+// const dataResult2 = ref<string>("");
 
 const formDataResult = ref<ProbationReportType>({
   develop_orientation_score: 0,
@@ -115,15 +119,15 @@ async function getSalary(
   id: string,
   name: string,
   group: string,
-  val: Ref<string>
+  val: Ref<FileType[]>
 ) {
   await http
     .get(config.API.developmentSalaryFile(name, group, id))
     .then((res) => {
-      val.value = res.data.fileName;
+      val.value = res.data;
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     });
 }
 
@@ -170,16 +174,16 @@ onMounted(async () => {
           >
             <q-tab name="SURVEY" label="แบบสํารวจความคิดเห็น" />
             <q-tab
-              v-if="dataResult1"
+              v-if="dataResult1.length > 0"
               name="RESULT1"
               label="ผลการประเมินการฯ ครั้งที่ 1"
             />
             <q-tab
-              v-if="dataResult2"
+              v-if="dataResult2.length > 0"
               name="RESULT2"
               label="ผลการประเมินการฯ ครั้งที่ 2"
             />
-            <q-tab v-if="dataProbation" name="ASSIGN" label="แบบมอบหมายงานฯ" />
+            <q-tab v-if="dataProbation.length > 0" name="ASSIGN" label="แบบมอบหมายงานฯ" />
           </q-tabs>
 
           <q-separator />