บรรจุ => รายการ อื่นๆ

src/modules/05_placement/components/Other/Dialogbody.vue

@@ -1,14 +1,26 @@
 <script setup lang="ts">
 import { ref, computed, watchEffect } from "vue";
 import { useQuasar } from "quasar";
-import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
 import DialogHeader from "@/modules/05_placement/components/Receive/DialogHeader.vue";
 
+import { useTransferDataStore } from "@/modules/05_placement/store";
+import { useCounterMixin } from "@/stores/mixin";
+
 import http from "@/plugins/http";
 import config from "@/app.config";
+const storeFn = useTransferDataStore();
+
+const { statusText } = storeFn;
 const mixin = useCounterMixin();
-const { showLoader, success, messageError, dialogConfirm } = mixin;
+const {
+  showLoader,
+  success,
+  messageError,
+  dialogConfirm,
+  findOrgName,
+  date2Thai,
+} = mixin;
 
 const $q = useQuasar();
 const selected = ref<any>([]);
@@ -33,8 +45,9 @@ const visibleColumns2 = ref<string[]>([
   "fullname",
   "position",
   "positionLevel",
-  "organizationPositionOld",
-  "statustext",
+  "affiliation",
+  "createdAt",
+  "status",
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -54,6 +67,9 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "fullname",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.prefix}${row.firstName} ${row.lastName}`;
+    },
   },
   {
     name: "position",
@@ -67,29 +83,54 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "positionLevel",
     align: "left",
-    label: "ระดับ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.posTypeName && row.posLevelName) {
+        name = `${row.posTypeName} (${row.posLevelName})`;
+      } else if (row.posTypeName) {
+        name = `${row.posTypeName}`;
+      } else if (row.posLevelName) {
+        name = `(${row.posLevelName})`;
+      } else name = "-";
+      return name;
+    },
   },
   {
-    name: "organizationPositionOld",
+    name: "affiliation",
     align: "left",
     label: "สังกัด",
     sortable: true,
-    field: "organizationPositionOld",
+    field: "affiliation",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return findOrgName(row);
+    },
   },
   {
-    name: "statustext",
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => date2Thai(val),
+  },
+  {
+    name: "status",
     align: "left",
     label: "สถานะ",
     sortable: true,
-    field: "statustext",
+    field: "status",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val) => statusText(val),
   },
 ]);
 const emit = defineEmits([
@@ -126,10 +167,10 @@ const addOther = async () => {
   showLoader();
   await http
     .put(config.API.otherReport(Type), data)
-    .then((res: any) => {
+    .then(() => {
       success($q, "บันทึกสำเร็จ");
     })
-    .catch((e: any) => {
+    .catch((e) => {
       messageError($q, e);
     })
     .finally(() => {
@@ -264,31 +305,18 @@ function filterFnOptionsType(val: string, update: any) {
                   v-model="props.selected"
                 />
               </q-td>
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="fullname" :props="props">
-                {{ props.row.fullname }}
-              </q-td>
-              <q-td key="position" :props="props">
-                {{ props.row.position }}
-              </q-td>
-              <q-td key="positionLevel" :props="props">
-                {{ props.row.positionLevel }}
-              </q-td>
-              <q-td key="organizationPositionOld" :props="props">
-                <div class="table_ellipsis">
-                  {{ props.row.organizationPositionOld }}
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div v-if="col.name === 'no'">
+                  {{ props.rowIndex + 1 }}
                 </div>
-              </q-td>
-              <q-td key="organization" :props="props">
-                <div class="table_ellipsis">
-                  {{ props.row.organization }}
+
+                <div
+                  v-else
+                  :class="col.name === 'affiliation' ? 'table_ellipsis' : ''"
+                >
+                  {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
-              <q-td key="statustext" :props="props">
-                {{ props.row.statustext }}
-              </q-td>
             </q-tr>
           </template>
         </d-table>