fix การแสดง เลขที่คำสั่ง

src/modules/10_registry/02_Government/07_Position.vue

@@ -176,6 +176,11 @@ const baseColumns = ref<QTableColumn[]>([
     label: "ตำแหน่งทางการบริหาร",
     sortable: true,
     field: "positionExecutive",
+    format(val, row) {
+      return !row.positionExecutiveField
+        ? val
+        : `${val} (${row.positionExecutiveField})`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -189,7 +194,9 @@ const baseColumns = ref<QTableColumn[]>([
     field: "commandNo",
     format(val, row) {
       return row.commandNo && row.commandYear
-        ? `${row.commandNo}/${Number(row.commandYear) + 543}`
+        ? row.commandType !== "C-PM-47"
+          ? `${row.commandNo}/${Number(row.commandYear) + 543}`
+          : `${row.commandNo}`
         : "";
     },
     headerStyle: "font-size: 14px",

src/modules/10_registry/03_Salary/01_Salary.vue

@@ -160,6 +160,11 @@ const baseColumns = ref<QTableColumn[]>([
     label: "ตำแหน่งทางการบริหาร",
     sortable: true,
     field: "positionExecutive",
+    format(val, row) {
+      return !row.positionExecutiveField
+        ? val
+        : `${val} (${row.positionExecutiveField})`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -173,7 +178,9 @@ const baseColumns = ref<QTableColumn[]>([
     field: "commandNo",
     format(val, row) {
       return row.commandNo && row.commandYear
-        ? `${row.commandNo}/${Number(row.commandYear) + 543}`
+        ? row.commandType !== "C-PM-47"
+          ? `${row.commandNo}/${Number(row.commandYear) + 543}`
+          : `${row.commandNo}`
         : "";
     },
     headerStyle: "font-size: 14px",

src/modules/10_registry/interface/index/Main.ts

@@ -196,6 +196,7 @@ interface SalaryFormType {
   refCommandNo: string | null;
   templateDoc: string;
   order: number;
+  commandType: string;
 }
 
 interface NopaidFormType {