Merge branch 'develop'

src/api/org/api.org.ts

@@ -52,6 +52,7 @@ export default {
     `${org}/profile${emType}/salary/position/history/${id}`,
 
   dataUserSalary: `${profileOrg}/salary/user`,
+  dataUserSalaryPosition: `${profileOrg}/salary/position/user`,
   dataUserSalaryByType: (type: string) => `${org}/profile${type}/salary/user`,
   dataUserAssessments: `${profileOrg}/assessments/user`,
   dataUserPortfolio: `${env.API_URI}/development/portfolio/user`,

src/modules/06_evaluate/components/step/step2.vue

@@ -272,6 +272,7 @@ function getCommander() {
     .get(config.API.searchCommander)
     .then((res) => {
       const data = res.data.result;
+       formCommand.author = data.fullname;
       formCommand.commanderFullname = data.commanderFullname;
       formCommand.commanderPosition = data.commanderPosition;
       formCommand.commanderAboveFullname = data.commanderAboveFullname;
@@ -314,9 +315,7 @@ watch(
 /**lifecycle Hooks*/
 onMounted(async () => {
   const user = await tokenParsed();
-  if (user) {
-    formCommand.author = user.name;
-  }
+
 
   try {
     showLoader();

src/modules/06_evaluate/components/viewstep/viewStep1.vue

@@ -123,7 +123,7 @@ async function fetchDataAllDetail() {
   });
 
   // ดึงข้อมูลประวัติการรับราชการ
-  http.get(config.API.dataUserSalary).then((res) => {
+  http.get(config.API.dataUserSalaryPosition).then((res) => {
     formDetail.salaries = res.data.result;
   });
 

src/modules/10_registry/01_Information/05_Educations.vue

@@ -78,10 +78,14 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "ตั้งแต่",
     sortable: true,
-    field: "startDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    field: (v) =>
+      v.startDate
+        ? v.isDate
+          ? date2Thai(v.startDate)
+          : new Date(v.startDate).getFullYear() + 543
+        : "-",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -91,7 +95,11 @@ const columns = ref<QTableProps["columns"]>([
     label: "ถึง",
     sortable: true,
     field: (v) =>
-      v.isDate ? date2Thai(v.endDate) : new Date(v.endDate).getFullYear() + 543,
+      v.endDate
+        ? v.isDate
+          ? date2Thai(v.endDate)
+          : new Date(v.endDate).getFullYear() + 543
+        : "-",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -291,9 +299,11 @@ const columnsHistory = ref<QTableProps["columns"]>([
     label: "ตั้งแต่",
     sortable: true,
     field: (v) =>
-      v.isDate
-        ? date2Thai(v.startDate)
-        : new Date(v.startDate).getFullYear() + 543,
+      v.startDate
+        ? v.isDate
+          ? date2Thai(v.startDate)
+          : new Date(v.startDate).getFullYear() + 543
+        : "-",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -305,7 +315,11 @@ const columnsHistory = ref<QTableProps["columns"]>([
     label: "ถึง",
     sortable: true,
     field: (v) =>
-      v.isDate ? date2Thai(v.endDate) : new Date(v.endDate).getFullYear() + 543,
+      v.endDate
+        ? v.isDate
+          ? date2Thai(v.endDate)
+          : new Date(v.endDate).getFullYear() + 543
+        : "-",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>