Merge branch 'develop' into dev

src/modules/02_organization/components/DialogFormDateTime.vue

@@ -167,9 +167,9 @@ watch(
           </q-card-section>
           <q-separator />
           <q-card-actions align="right">
-            <q-btn flat color="blue-7" icon="public" @click="onClickPublish()">
+            <!-- <q-btn flat color="blue-7" icon="public" @click="onClickPublish()">
               <q-tooltip>เผยแพร่ข้อมูลทันที</q-tooltip>
-            </q-btn>
+            </q-btn> -->
             <q-space />
             <q-btn type="submit" :label="`บันทึก`" color="public" />
           </q-card-actions>

src/modules/09_leave/components/05_Leave/TableList.vue

@@ -42,14 +42,14 @@ const columnsLeave = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
+  // {
-    name: "citizenId",
+  //   name: "citizenId",
-    align: "left",
+  //   align: "left",
-    label: "เลขประจำตัวประชาชน",
+  //   label: "เลขประจำตัวประชาชน",
-    field: "citizenId",
+  //   field: "citizenId",
-    headerStyle: "font-size: 14px",
+  //   headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
+  //   style: "font-size: 14px",
-  },
+  // },
   {
     name: "fullName",
     align: "left",
@@ -113,6 +113,15 @@ const columnsLeave = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "leaveTotal",
+    align: "left",
+    label: "จำนวนวันที่ลา",
+    sortable: true,
+    field: "leaveTotal",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "status",
     align: "left",
@@ -134,6 +143,7 @@ const visibleColumnsLeave = ref<string[]>([
   "org",
   "position",
   "level",
+  "leaveTotal",
   "status",
 ]);
 

src/modules/09_leave/interface/response/leave.ts

@@ -25,6 +25,7 @@ interface ListLeave {
   position?: string;
   level?: string;
   hajjDayStatus?: boolean;
+  leaveTotal: number; //จำนวนวันที่ลา
 }
 interface FormData {
   id: string;

src/modules/09_leave/stores/LeaveStore.ts

@@ -88,6 +88,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
           : "-",
       status: e.status && convertSatatus(e.status),
       statusText: e.status,
+      leaveTotal: e.leaveTotal,
     }));
     mainData.value = datalist;
     rows.value = mainData.value;