Merge branch 'develop' into devTee

src/modules/04_registryPerson/views/edit/components/Table.vue

@@ -82,15 +82,13 @@ const baseColumns = ref<QTableColumn[]>([
     field: "posNumCodeSit",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-  },
-  {
-    name: "posNumCodeSitAbb",
-    align: "left",
-    label: "ตัวย่อหน่วยงานที่ออกคำสั่ง",
-    sortable: false,
-    field: "posNumCodeSitAbb",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
+    format(val, row) {
+      return row.posNumCodeSitAbb && row.posNumCodeSit
+        ? `${row.posNumCodeSit} (${row.posNumCodeSitAbb})`
+        : row.posNumCodeSit
+        ? row.posNumCodeSit
+        : "-";
+    },
   },
   {
     name: "posNo",
@@ -250,7 +248,6 @@ const visibleColumns = ref<string[]>([
   "no",
   "commandDateAffect",
   "posNumCodeSit",
-  "posNumCodeSitAbb",
   "posNo",
   "positionName",
   "positionType",