Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

# Conflicts:
#	src/api/05_placement/api.placement.ts
#	src/api/index.ts
#	src/modules/05_placement/components/pass/Table.vue

src/modules/05_placement/interface/index/Main.ts

@@ -1,10 +1,14 @@
 import type { zipCodeOption } from "../../components/PersonalDetail/profileType";
 interface DataOption {
-  id: number | string;
-  name: string;
+  id: number|null;
+  name:string|null;
+  disable?: boolean;
+}
+interface DataOption1 {
+  id: string|null;
+  name:string|null;
   disable?: boolean;
 }
-
 interface DataOptionInsignia {
   id: string;
   name: string;
@@ -137,6 +141,7 @@ export type {
   AddressOps,
   Pagination,
   EduOps,
+  DataOption1,
   InsigniaOps,
   CheckboxItem,
   Property,

src/modules/05_placement/interface/request/Main.ts

@@ -4,8 +4,10 @@ interface FormPlacementMainData {
   examRound: string;
   examOrder: number;
   fiscalYear: number;
-  numberofCandidates: number;
-  examType: number;
+  numberOfCandidates: number;
+  examTypeValue:string;
+  examTypeName: string;
+  accountStartDate: string;
   accountExpirationDate: string;
   isExpired?: boolean;
 }

src/modules/05_placement/interface/request/placement.ts

@@ -1,5 +1,5 @@
 interface TableName {
-  profileID: string;
+  personalId: string;
   position: number;
   fullName: string;
   dateOfBirth: string;
@@ -7,14 +7,20 @@ interface TableName {
   ExamOrder: number;
   unitId: string;
   UnitGroup: string;
+  positionNumber:string;
+  positionPath:string;
   Unit: string;
-  ReportingDate: string; //วันที่รายงานตัว
-  BMAOfficer: string;
-  Status: string;
+  reportingDate: string; //วันที่รายงานตัว
+  bmaOfficer: string;
+  statusId: string;
   checkList: any;
   address: string;
   university: string;
   degree: string;
+  disclaim: string;
+  profilePhoto:string;
+  organizationName:string;
+  organizationShortName:string;
   major: string;
   remark: string;
   number: number;
@@ -31,5 +37,19 @@ interface TableName {
     examResult: string;
   };
 } 
-
-export type { TableName };
+interface PartialTableName {
+  personalId: string;
+  fullName: string;
+  idCard: string;
+  profilePhoto: string;
+  organizationName: string;
+  organizationShortName: string;
+  positionNumber: string;
+  positionPath: string;
+  reportingDate: string;
+  bmaOfficer: string;
+  number: number;
+  statusId: string;
+  deferment: string;
+}
+export type { TableName ,PartialTableName};