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/api/02_organizational/api.treelist.ts

@@ -10,6 +10,7 @@ import env from "../index";
 const organizationPath = `${env.API_URI_ORG_SERVICE}/Organization/`;
 const postionMasterPath = `${env.API_URI_ORG_SERVICE}/PositionMaster`;
 const organizationPosition = `${env.API_URI_ORG_SERVICE}/OrganizationPosition/`;
+const organizationEmployeePosition = `${env.API_URI_ORG_EMPLOYEE_SERVICE}/organization-employee/`;
 
 const report = `${env.API_URI}/report/organization/`;
 
@@ -83,8 +84,7 @@ export default {
   getPositionNumberIdByOcId: (OcId: string) =>
     `${postionMasterPath}/position-number/Oc/${OcId}`,
 
-
-  /**
-   * api ประวัติการ publish
-   */
+  organizationEmployeePosition: `${organizationEmployeePosition}`,
+  organizationEmployeePositionId: (id: string) =>
+    `${organizationEmployeePosition}${id}`,
 };

src/api/05_placement/api.placement.ts

@@ -1,11 +1,21 @@
-/**
- * api บรรจุ แต่งตั้ง ย้าย โอน
- */
 import env from "../index";
-
-const placement = `${env.API_PLACEMENT_URI}/Placement/placement/`;
+const placement = `${env.API_URI}/Placement/placement`;
+const orgTree = `${env.API_URI_ORG_TREE}`;
 
 export default {
+  MainDetail: (year: number) => `${placement}/exam/${year}`,
+  yearOptions: () => `${placement}/fiscal`,
+  redirectToPage: (examId: string) => `${placement}/pass/${examId}`,
+  disclaimF: () => `${placement}/pass/disclaim`,
+  deferment: () => `${placement}/pass/deferment`,
+  getStatCard: (examId: string) => `${placement}/pass/stat/${examId}`,
+  getDatapersonal: (id: string) => `${placement}/personal/${id}`,
+  putProperty: (id: string) => `${placement}/property/${id}`,
+  orgTree: orgTree,
+  placementPass: () => `${placement}/pass`,
+  placementDefermentInfo: (id: string) => `${placement}/pass/deferment/${id}`,
+  placementDisclaimInfo: (id: string) => `${placement}/pass/disclaim/${id}`,
+
   //personal
   placementPersonalId: (personalId: string) =>
     `${placement}personal/${personalId}`,

src/api/index.ts

@@ -8,10 +8,12 @@ const env = ref<string>(process.env.NODE_ENV || "development");
 
 const config = ref<any>({
   development: {
-    // API_URI: "https://localhost:7006/api/v1",
+    // API_URI: "https://localhost:7260/api",
     API_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     // API_URI_ORG_SERVICE: "https://localhost:7056/api/v1", //ใช้ชั่วคราว
     API_URI_ORG_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
+    API_URI_ORG_EMPLOYEE_SERVICE: "https://localhost:7208/api/v1", //ใช้ชั่วคราว
+    // API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
     // API_URI_PROFILE_SERVICE: "https://localhost:7159/api/v1",
     API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
     // API_CANDIDATE_URI: "https://localhost:7007/api/v1",
@@ -19,6 +21,8 @@ const config = ref<any>({
     // API_REPORT_URI: "https://localhost:7187/api/v1",
     API_REPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     API_PLACEMENT_URI: "https://localhost:7260/api",
+    API_URI_ORG_TREE:
+      "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json",
     MEET_URI: "meet.frappet.com",
   },
   test: {
@@ -31,9 +35,12 @@ const config = ref<any>({
     // API_URI: "https://localhost:5010",
     API_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
     API_URI_ORG_SERVICE: `${window.location.protocol}//${window.location.host}/api/v1`, //ใช้ชั่วคราว
+    API_URI_ORG_EMPLOYEE_SERVICE: `${window.location.protocol}//${window.location.host}/api/v1`, //ใช้ชั่วคราว
     API_URI_PROFILE_SERVICE: `${window.location.protocol}//${window.location.host}/api/v1`,
     API_CANDIDATE_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
     API_REPORT_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
+    API_URI_ORG_TREE:
+      "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230707_115124.json",
     MEET_URI: "meet.frappet.com",
   },
 });
@@ -46,6 +53,9 @@ const API_REPORT_URI = ref<string>(config.value[env.value].API_REPORT_URI);
 const API_URI_ORG_SERVICE = ref<string>(
   config.value[env.value].API_URI_ORG_SERVICE
 );
+const API_URI_ORG_EMPLOYEE_SERVICE = ref<string>(
+  config.value[env.value].API_URI_ORG_EMPLOYEE_SERVICE
+);
 const MEET_URI = ref<string>(config.value[env.value].MEET_URI);
 const API_URI_PROFILE_SERVICE = ref<string>(
   config.value[env.value].API_URI_PROFILE_SERVICE
@@ -53,6 +63,7 @@ const API_URI_PROFILE_SERVICE = ref<string>(
 const API_PLACEMENT_URI = ref<string>(
   config.value[env.value].API_PLACEMENT_URI
 );
+const API_URI_ORG_TREE = ref<string>(config.value[env.value].API_URI_ORG_TREE);
 
 export default {
   env: env.value,
@@ -61,7 +72,9 @@ export default {
   API_CANDIDATE_URI: API_CANDIDATE_URI.value,
   API_REPORT_URI: API_REPORT_URI.value,
   API_URI_ORG_SERVICE: API_URI_ORG_SERVICE.value,
+  API_URI_ORG_EMPLOYEE_SERVICE: API_URI_ORG_EMPLOYEE_SERVICE.value,
   API_URI_PROFILE_SERVICE: API_URI_PROFILE_SERVICE.value,
   API_PLACEMENT_URI: API_PLACEMENT_URI.value,
+  API_URI_ORG_TREE: API_URI_ORG_TREE.value,
   MEET_URI: MEET_URI.value,
 };

src/api/manage/api.organization.ts

@@ -3,6 +3,7 @@
  *  เมนูย่อย: ข้อมูลโครงสร้างหน่วยงาน
  */
 import env from "../index";
+const organizationMain = `${env.API_URI}/metadata/main/`;
 const organization = `${env.API_URI}/metadata/organization/`;
 const organizationOrganization = `${env.API_URI}/metadata/organization-organization/`;
 const organizationShortName = `${env.API_URI}/metadata/organization-shortname/`;
@@ -21,6 +22,7 @@ export default {
   /**
    * api จำนวนข้อมูลใน ระบบจัดการข้อมูลหลัก tab ย่อยแต่ละ tab
    */
+  organizationMain: `${organizationMain}organization`,
   organization,
   countDashbordSubHistory: (type: number) => `${dashbord}${type}`,
   countDashbordHistory: `${dashbord}`,

src/api/manage/api.positionEmployee.ts

@@ -3,6 +3,7 @@
  *  เมนูย่อย: ข้อมูลตำแหน่งของลูกจ้างกรุงเทพมหานคร
  */
 import env from "../index";
+const positionEmployee = `${env.API_URI}/metadata/main/`;
 const positionEmployeePosition = `${env.API_URI}/metadata/position-employee-position/`;
 const positionEmployeePositionSide = `${env.API_URI}/metadata/position-employee-position-side/`;
 const positionEmployeeGroup = `${env.API_URI}/metadata/position-employee-group/`;
@@ -11,6 +12,7 @@ const positionEmployeeLevel = `${env.API_URI}/metadata/position-employee-level/`
 const positionEmployeeStatus = `${env.API_URI}/metadata/position-employee-status/`;
 
 export default {
+  positionEmployee: `${positionEmployee}positionEmployee`,
   /**
    * api ตำแหน่ง
    */