วินัย => แสดงรายการทั้งหมด , ตัวชี้วัดตามแผน => ปรับ tree

2024-04-26 14:23:14 +07:00 · 2024-04-26 14:23:14 +07:00 · 7cce2fd1fb
commit 7cce2fd1fb
parent f7d8256682
13 changed files with 157 additions and 115 deletions
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@ -28,6 +28,7 @@ const filterKeyword = ref<string>("");
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
 const rowsPerPage = ref<number>(10);
+const toptitle = ref<number>(0);
 const statusFilter = ref<string>("NEW");

 async function updatePagingProp(rowPerpage: number, pageCurrent: number) {
@ -50,6 +51,7 @@ async function getList() {
    //
    .then((res) => {
      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      toptitle.value = res.data.result.total;
      const data = res.data.result.data;
      fetchComplainst(data);
    })
@ -166,6 +168,7 @@ onMounted(async () => {
        :page="page"
        :maxPage="maxPage"
        @update:pagination="updatePagingProp"
+        :toptitle="toptitle"
      />
    </div>
  </q-card>
--- a/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue
+++ b/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue
@ -27,6 +27,10 @@ const props = defineProps({
    type: Number,
    require: true,
  },
+  toptitle: {
+    type: Number,
+    require: true,
+  },
 });

 /** หัวข้อที่เเสดงในตาราง */
@ -178,17 +182,6 @@ onMounted(() => {
    v-model:pagination="pagination"
    :rows-per-page-options="[10, 25, 50, 100]"
  >
-    <template v-slot:pagination="scope">
-      <q-pagination
-        v-model="currentPage"
-        active-color="primary"
-        color="dark"
-        :max="Number(props.maxPage)"
-        size="sm"
-        boundary-links
-        direction-links
-      ></q-pagination>
-    </template>
    <template v-slot:header="props">
      <q-tr :props="props">
        <q-th v-for="col in props.cols" :key="col.name" :props="props">
@ -220,6 +213,18 @@ onMounted(() => {
        </q-td>
      </q-tr>
    </template>
+    <template v-slot:pagination="scope">
+      ทั้งหมด {{ props.toptitle }}รายการ
+      <q-pagination
+        v-model="currentPage"
+        active-color="primary"
+        color="dark"
+        :max="Number(props.maxPage)"
+        size="sm"
+        boundary-links
+        direction-links
+      ></q-pagination>
+    </template>
  </d-table>
 </template>

--- a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@ -30,6 +30,7 @@ const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
 const rowsPerPage = ref<number>(10);
+const toptitle = ref<number>(0);

 /**
 *pagination ของตาราง
@ -70,6 +71,8 @@ async function getList() {
    )
    .then((res) => {
      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      toptitle.value = res.data.result.total;
+
      const data = res.data.result.data;
      dataInvestigate.fecthList(data);
    })
@ -181,17 +184,6 @@ onMounted(async () => {
        v-model:pagination="pagination"
        :rows-per-page-options="[10, 25, 50, 100]"
      >
-        <template v-slot:pagination="scope">
-          <q-pagination
-            v-model="currentPage"
-            active-color="primary"
-            color="dark"
-            :max="Number(maxPage)"
-            size="sm"
-            boundary-links
-            direction-links
-          ></q-pagination>
-        </template>
        <template v-slot:header="props">
          <q-tr :props="props">
            <q-th
@ -236,6 +228,18 @@ onMounted(async () => {
            </q-td>
          </q-tr>
        </template>
+        <template v-slot:pagination="scope">
+          ทั้งหมด {{ toptitle }}รายการ
+          <q-pagination
+            v-model="currentPage"
+            active-color="primary"
+            color="dark"
+            :max="Number(maxPage)"
+            size="sm"
+            boundary-links
+            direction-links
+          ></q-pagination>
+        </template>
      </d-table>
    </div>
  </q-card>
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@ -22,6 +22,8 @@ const router = useRouter();
 const filter = ref<string>(""); //search data table
 const page = ref<number>(1);
 const maxPage = ref<number>(1);
+const totalList = ref<number>();
+
 const status = ref<string>("NEW");
 async function fetchListDisciplinary() {
  showLoader();
@ -33,6 +35,7 @@ async function fetchListDisciplinary() {
    .then((res) => {
      const data = res.data.result.data;
      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      totalList.value = res.data.result.total;
      fetchList(data);
    })
    .catch((err) => {})
@ -57,7 +60,7 @@ async function updatePagingProp(rowPerpage: number, pageCurrent: number) {

 function filterStatus(statusReturn: string) {
  status.value = statusReturn;
-  fetchListDisciplinary()
+  fetchListDisciplinary();
 }

 /**เมื่อเริ่มโหลดหน้า
@ -88,6 +91,7 @@ onMounted(async () => {
        :rowsPerPage="rowsPerPage"
        :page="page"
        :maxPage="maxPage"
+        :totalList="totalList"
        :fetchListDisciplinary="fetchListDisciplinary"
        @update:pagination="updatePagingProp"
        v-model:open-edit="openEdit"
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
@ -61,6 +61,10 @@ const props = defineProps({
    type: Number,
    require: true,
  },
+  totalList: {
+    type: Number,
+    require: true,
+  },
 });

 const emit = defineEmits([
@ -195,6 +199,7 @@ function filterFn() {
    :rows-per-page-options="[10, 25, 50, 100]"
  >
    <template v-slot:pagination="scope">
+      ทั้งหมด {{ props.totalList }} รายการ
      <q-pagination
        v-model="currentPage"
        active-color="primary"
--- a/src/modules/11_discipline/components/4_Result/MainPage.vue
+++ b/src/modules/11_discipline/components/4_Result/MainPage.vue
@ -25,6 +25,7 @@ const initialPagination = ref<Pagination>({
 const page = ref<number>(1);
 const pageSize = ref<number>(10);
 const maxPage = ref<number>(1);
+const totalList = ref<number>(0);
 const filter = ref<string>("");
 const status = ref<string>("DONE");
 /** function เรียกรายการสรุปผลการพิจารณาทางวินัย*/
@ -38,6 +39,7 @@ async function fetchListResult() {
    .then(async (res) => {
      const data = res.data.result.data;
      maxPage.value = Math.ceil(res.data.result.total / pageSize.value);
+      totalList.value = res.data.result.total;
      await fetchList(data);
    })
    .catch((err) => {
@ -97,6 +99,7 @@ onMounted(async () => {
        :fetchListResult="fetchListResult"
        :pageSize="pageSize"
        :maxPage="maxPage"
+        :totalList="totalList"
        @update:queryString="updateQueryString"
        v-model:open-edit="openEdit"
        :filterStatus="filterStatus"
--- a/src/modules/11_discipline/components/4_Result/Table.vue
+++ b/src/modules/11_discipline/components/4_Result/Table.vue
@ -51,6 +51,9 @@ const props = defineProps({
  maxPage: {
    type: Number,
  },
+  totalList: {
+    type: Number,
+  },
 });

 const currentPage = ref<number>(1);
@ -208,6 +211,7 @@ function filterFn() {
      </q-tr>
    </template>
    <template v-slot:pagination="scope">
+      ทั้งหมด {{ props.totalList }} รายการ
      <q-pagination
        v-model="currentPage"
        active-color="primary"
--- a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
@ -38,10 +38,10 @@ const pagination = ref({
 /**
 * clickไปหน้าเพิ่มchanel
 */
-function clickAdd(){
-  dataStore.getType('')
+function clickAdd() {
+  dataStore.getType("");
  router.push(`/discipline/channel/add`);
-};
+}

 /** get data */
 async function getComplaintChanal() {
@ -91,9 +91,9 @@ async function deleteData(id: string) {
 * ไปหน้า แก้ไข
 * @param id type
 */
-function editPage(data:typeItem){
-  dataStore.getType(data.name)
-  router.push(`/discipline/channel/${data.id}`)
+function editPage(data: typeItem) {
+  dataStore.getType(data.name);
+  router.push(`/discipline/channel/${data.id}`);
 }
 /**เมื่อเริ่มโหลดหน้า เรียกใช้ฟังชั่น*/
 onMounted(() => {
@ -188,7 +188,7 @@ onMounted(() => {
                {{ props.rowIndex + 1 }}
              </div>
              <div v-else>
-                {{ col.value}}
+                {{ col.value ?? "-" }}
              </div>
            </q-td>
            <q-td>
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
@ -18,9 +18,11 @@ const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
 const rowsPerPage = ref<number>(10);
+const totalList = ref<number>(0);
+
 const modalDetail = ref<boolean>(false);
-const type = ref<string>('')
-const dataPopUp = ref<DirectorRowsResponse>()
+const type = ref<string>("");
+const dataPopUp = ref<DirectorRowsResponse>();
 /**
 * ค้นหาในตาราง
 */
@ -64,6 +66,7 @@ async function getList() {
    )
    .then((res) => {
      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      totalList.value = res.data.result.total;
      const data = res.data.result.data;
      dataStore.fetchData(data);
    })
@ -120,9 +123,9 @@ function openDetail(data: DirectorRowsResponse, typeChange: string) {
  } else if (typeChange == "disciplinary") {
    titleInvestigate.value = `รายการสอบสวนความผิดทางวินัยของ ${data.fullName}`;
  }
-  dataPopUp.value = data
+  dataPopUp.value = data;
  modalDetail.value = true;
-  type.value = typeChange
+  type.value = typeChange;
 }

 function closeDetail() {
@ -207,6 +210,7 @@ onMounted(() => {
        :visible-columns="dataStore.visibleColumns"
      >
        <template v-slot:pagination="scope">
+          ทั้งหมด {{ totalList }} รายการ
          <q-pagination
            v-model="currentPage"
            active-color="primary"
@ -258,7 +262,7 @@ onMounted(() => {
                v-else
                @click="$router.push(`/discipline/director/${props.row.id}`)"
              >
-                {{ col.value }}
+                {{ col.value ?? "-" }}
              </div>
            </q-td>
            <q-td auto-width>
--- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
@ -139,7 +139,9 @@ function resetFilter() {
 const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
+
 const rowsPerPage = ref<number>(10);
+const totalList = ref<number>(0);

 /**
 *pagination ของตาราง
@ -180,6 +182,7 @@ async function getList() {
    .then((res) => {
      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
      const data = res.data.result.data;
+      totalList.value = res.data.result.total;
      dataStore.getData(data);
    })
    .catch((e) => {
@ -311,6 +314,7 @@ onMounted(() => {
            :rows-per-page-options="[10, 25, 50, 100]"
          >
            <template v-slot:pagination="scope">
+              ทั้งหมด {{ totalList }} รายการ
              <q-pagination
                v-model="currentPage"
                active-color="primary"
@ -345,16 +349,16 @@ onMounted(() => {
                    }}
                  </div>
                  <div v-else-if="col.name === 'title'" class="table_ellipsis">
-                    {{ props.row.title }}
+                    {{ props.row.title ? props.row.title : "-" }}
                  </div>
                  <div
                    v-else-if="col.name === 'organization'"
                    class="table_ellipsis"
                  >
-                    {{ props.row.organization }}
+                    {{ props.row.organization ? props.row.organization : "-" }}
                  </div>
                  <div v-else>
-                    {{ col.value }}
+                    {{ col.value ?? "-" }}
                  </div>
                </q-td>
              </q-tr>
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@ -34,6 +34,8 @@ const dataRow = ref<RowList[]>([]);
 const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
+const totalList = ref<number>(0);
+
 const rowsPerPage = ref<number>(10);

 /**
@ -236,6 +238,7 @@ async function getData() {
    )
    .then((res) => {
      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      totalList.value = res.data.result.total;
      fetchAppealComplain(res.data.result.data);
    })
    .catch((e) => {
@ -277,57 +280,57 @@ onMounted(async () => {
  </div>
  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
    <div class="row q-mb-sm q-col-gutter-sm">
-        <div>
-          <q-btn
-            id="addComplaints"
-            for="addComplaints"
-            size="12px"
-            flat
-            round
-            color="primary"
-            icon="mdi-plus"
-            @click="redirectToPageadd()"
-            ><q-tooltip>เพิ่มการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
-          >
-        </div>
-        <q-space />
-        <q-input
-          for="#search"
-          class="col-xs-12 col-sm-3 col-md-2"
-          standout
-          dense
-          v-model="filterKeyword"
-          ref="filterRef"
-          outlined
-          placeholder="ค้นหา"
-          @keydown.enter.prevent="filterFn"
+      <div>
+        <q-btn
+          id="addComplaints"
+          for="addComplaints"
+          size="12px"
+          flat
+          round
+          color="primary"
+          icon="mdi-plus"
+          @click="redirectToPageadd()"
+          ><q-tooltip>เพิ่มการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
        >
-          <template v-slot:append>
-            <q-icon
-              v-if="filterKeyword !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
-          </template>
-        </q-input>
+      </div>
+      <q-space />
+      <q-input
+        for="#search"
+        class="col-xs-12 col-sm-3 col-md-2"
+        standout
+        dense
+        v-model="filterKeyword"
+        ref="filterRef"
+        outlined
+        placeholder="ค้นหา"
+        @keydown.enter.prevent="filterFn"
+      >
+        <template v-slot:append>
+          <q-icon
+            v-if="filterKeyword !== ''"
+            name="clear"
+            class="cursor-pointer"
+            @click="resetFilter"
+          />
+        </template>
+      </q-input>

-        <q-select
-          id="visibleColumns"
-          for="visibleColumns"
-          v-model="dataStore.visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="dataStore.columns"
-          option-value="name"
-          options-cover
-          class="col-xs-12 col-sm-3 col-md-2"
-        />
+      <q-select
+        id="visibleColumns"
+        for="visibleColumns"
+        v-model="dataStore.visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="dataStore.columns"
+        option-value="name"
+        options-cover
+        class="col-xs-12 col-sm-3 col-md-2"
+      />
    </div>
    <div class="col-12 row q-mb-sm">
      <q-card bordered class="col-12 filter-card q-pa-sm">
@ -404,7 +407,6 @@ onMounted(async () => {
              @update:model-value="dataUpdate"
            />
          </div>
-          
        </div>
      </q-card>
    </div>
@ -425,6 +427,7 @@ onMounted(async () => {
        :rows-per-page-options="[10, 25, 50, 100]"
      >
        <template v-slot:pagination="scope">
+          ทั้งหมด {{ totalList }} รายการ
          <q-pagination
            v-model="currentPage"
            active-color="primary"
@ -469,10 +472,10 @@ onMounted(async () => {
                v-else-if="col.name === 'description'"
                class="table_ellipsis"
              >
-                {{ props.row.description }}
+                {{ props.row.description ? props.row.description : "-" }}
              </div>
              <div v-else>
-                {{ col.value }}
+                {{ col.value ?? "-" }}
              </div>
            </q-td>
          </q-tr>
--- a/src/modules/11_discipline/components/9_Order/TableOrder.vue
+++ b/src/modules/11_discipline/components/9_Order/TableOrder.vue
@ -186,7 +186,7 @@ const pagination = ref({
 });

 /**
- * ฟังชั่น redirect 
+ * ฟังชั่น redirect
 * @param id id ออกคำสั่ง
 * @param status status
 */
@ -249,8 +249,8 @@ onMounted(() => {
          <div v-if="col.name === 'no'">
            {{ props.rowIndex + 1 }}
          </div>
-          <div>
-            {{ col.value }}
+          <div v-else>
+            {{ col.value ?? "-" }}
          </div>
        </q-td>
      </q-tr>