แก้ไขขอโอน รับโอน รายการช่วยราชการ รายการส่งตัวกลับ รายการลาออก

src/modules/05_placement/components/helpgovernment/mainHelp.vue

@@ -39,20 +39,28 @@ const modal = ref<boolean>(false);
 const visibleColumns = ref<string[]>([
   "no",
   "fullname",
+  "posNo",
   "position",
   "positionLevel",
   "organizationPositionOld",
-  // "organization",
+  "organization",
+  "dateStart",
+  "dateEnd",
+  "createdAt",
   "statusText",
   "btn",
 ]);
 const visibleColumns2 = ref<string[]>([
   "no",
   "fullname",
+  "posNo",
   "position",
   "positionLevel",
   "organizationPositionOld",
-  // "organization",
+  "organization",
+  "dateStart",
+  "dateEnd",
+  "createdAt",
   "statusText",
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
@@ -134,6 +142,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "position",
     align: "left",
@@ -170,6 +187,40 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "dateStart",
+    align: "left",
+    label: "วันเริ่มช่วยราชการ",
+    sortable: true,
+    field: "dateStart",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "dateEnd",
+    align: "left",
+    label: "วันสิ้นสุดการช่วยราชการ",
+    sortable: true,
+    field: "dateEnd",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    sortOrder: "da",
+  },
   {
     name: "statusText",
     align: "left",
@@ -208,6 +259,15 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "position",
     align: "left",
@@ -244,6 +304,40 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "dateStart",
+    align: "left",
+    label: "วันเริ่มช่วยราชการ",
+    sortable: true,
+    field: "dateStart",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "dateEnd",
+    align: "left",
+    label: "วันสิ้นสุดการช่วยราชการ",
+    sortable: true,
+    field: "dateEnd",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    sortOrder: "da",
+  },
   {
     name: "statusText",
     align: "left",
@@ -278,7 +372,7 @@ const getData = async () => {
     .get(config.API.officerMain())
     .then((res: any) => {
       const data = res.data.result;
-      console.log("data==>", data);
+      //   console.log("data==>", data);
       rows.value = data.map((item: officerType) => ({
         id: item.id,
         fullname: `${item.prefix}${item.firstName} ${item.lastName}`,
@@ -297,8 +391,11 @@ const getData = async () => {
         positionNumberOld: item.positionNumberOld,
         organizationPositionOld: item.organizationPositionOld,
         isActive: item.isActive,
+        dateEnd: item.dateEnd == null ? "-" : date2Thai(new Date(item.dateEnd)),
+        dateStart:
+          item.dateStart == null ? "-" : date2Thai(new Date(item.dateStart)),
       }));
-      console.log(rows.value);
+      //   console.log(rows.value);
     })
     .catch((e) => {
       // messageError($q, e);
@@ -436,6 +533,13 @@ onMounted(async () => {
                 >
                   {{ props.row.fullname }}
                 </q-td>
+                <q-td
+                  key="posNo"
+                  :props="props"
+                  @click="openDetail(props.row.id)"
+                >
+                  {{ props.row.posNo }}
+                </q-td>
                 <q-td
                   key="position"
                   :props="props"
@@ -468,6 +572,27 @@ onMounted(async () => {
                     {{ props.row.organization }}
                   </div>
                 </q-td>
+                <q-td
+                  key="dateStart"
+                  :props="props"
+                  @click="openDetail(props.row.id)"
+                >
+                  {{ props.row.dateStart }}
+                </q-td>
+                <q-td
+                  key="dateEnd"
+                  :props="props"
+                  @click="openDetail(props.row.id)"
+                >
+                  {{ props.row.dateEnd }}
+                </q-td>
+                <q-td
+                  key="createdAt"
+                  :props="props"
+                  @click="openDetail(props.row.id)"
+                >
+                  {{ props.row.createdAt }}
+                </q-td>
                 <q-td
                   key="statusText"
                   :props="props"
@@ -479,11 +604,18 @@ onMounted(async () => {
                   <q-btn
                     icon="delete"
                     size="14px"
-                    color="red-7"
+                    :color="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                        ? 'grey'
+                        : 'red-7'
+                    "
                     flat
                     round
                     dense
                     @click="clickDelete(props.row.fullname, props.row.id)"
+                    :disable="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                    "
                   >
                     <q-tooltip>ลบข้อมูล</q-tooltip>
                   </q-btn>
@@ -584,6 +716,9 @@ onMounted(async () => {
               <q-td key="fullname" :props="props">
                 {{ props.row.fullname }}
               </q-td>
+              <q-td key="posNo" :props="props">
+                {{ props.row.posNo }}
+              </q-td>
               <q-td key="position" :props="props">
                 {{ props.row.position }}
               </q-td>
@@ -600,6 +735,15 @@ onMounted(async () => {
                   {{ props.row.organization }}
                 </div>
               </q-td>
+              <q-td key="dateStart" :props="props">
+                {{ props.row.dateStart }}
+              </q-td>
+              <q-td key="dateEnd" :props="props">
+                {{ props.row.dateEnd }}
+              </q-td>
+              <q-td key="createdAt" :props="props">
+                {{ props.row.createdAt }}
+              </q-td>
               <q-td key="statusText" :props="props">
                 {{ props.row.statusText }}
               </q-td>