Merge branch 'develop' into dev

* develop:
  fix popup เลือกผู้บังคับบัญชา

src/components/Workflow/DialogSelectPerson.vue

@@ -37,15 +37,6 @@ const rejectName = computed(() =>
 const selected = ref<DataCommander[]>([]);
 const rows = ref<DataCommander[]>([]);
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "posNo",
-    align: "left",
-    label: "เลขที่ตำแหน่ง",
-    sortable: true,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "fullName",
     align: "left",
@@ -59,11 +50,20 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "posExecutiveName",
+    name: "posNo",
     align: "left",
-    label: "ตำแหน่งทางการบริหาร",
+    label: "เลขที่ตำแหน่ง",
     sortable: true,
-    field: "posExecutiveName",
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionSign",
+    align: "left",
+    label: "ตำแหน่งใต้ลายเซ็น",
+    sortable: true,
+    field: "positionSign",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },

src/modules/05_leave/components/FormLeave/Form.vue

@@ -43,15 +43,6 @@ const search = ref<string>("");
 const isLoading = ref<boolean>(false);
 const rows = ref<DataCommander[]>([]);
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "posNo",
-    align: "left",
-    label: "เลขที่ตำแหน่ง",
-    sortable: true,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "firstName",
     align: "left",
@@ -65,11 +56,20 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "posExecutiveNameOrg",
+    name: "posNo",
     align: "left",
-    label: "ตำแหน่งทางการบริหาร",
+    label: "เลขที่ตำแหน่ง",
     sortable: true,
-    field: "posExecutiveNameOrg",
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionSign",
+    align: "left",
+    label: "ตำแหน่งใต้ลายเซ็น",
+    sortable: true,
+    field: "positionSign",
     format(val) {
       return removeDuplicateWords(val || "");
     },
@@ -149,7 +149,7 @@ function onSubmit() {
     : "";
 
   dataStore.commanderPosition = removeDuplicateWords(
-    selected.value[0].posExecutiveNameOrg || ""
+    selected.value[0].positionSign || "",
   );
 }
 
@@ -402,7 +402,9 @@ function getSearch() {
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{ getColumnLabel(col, isAct) }}</span>
+                      <span class="text-weight-medium">{{
+                        getColumnLabel(col, isAct)
+                      }}</span>
                     </q-th>
                   </q-tr>
                 </template>

src/modules/05_leave/interface/response/main.ts

@@ -29,6 +29,7 @@ interface DataCommander {
   posType: string;
   position: string;
   prefix: string;
+  positionSign?: string;
 }
 
 export type { DataCommander };