updated & fixing

2024-06-26 14:35:19 +07:00 · 2024-06-26 14:35:19 +07:00 · 62af9f6a35
commit 62af9f6a35
parent a39a34b15f
24 changed files with 392 additions and 352 deletions
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";

-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@ -181,9 +181,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
 ]);
-function onHistory(id:string) {
+function onHistory(id: string) {
  modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }

 /** get data */
@ -207,7 +207,7 @@ function getData() {
 function getHistory() {
  showLoader();
  http
-    .get(config.API.dataUserCertificateHistory("certificate",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("certificate", idByRow.value))
    .then((res) => {
      const data = res.data.result;
      rowsHistory.value = data;
@ -357,9 +357,9 @@ onMounted(() => {
      </template>
      <template v-slot:no-data>
        <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
        >
-          <span> ไม่พบข้อมูลใบอนุญาตประกอบวิชาชีพ </span>
+          <span> ไม่พบข้อมูล </span>
        </div>
      </template>
    </d-table>
--- a/src/modules/10_registry/04_Achievement/02_Training.vue
+++ b/src/modules/10_registry/04_Achievement/02_Training.vue
@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";

-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@ -309,9 +309,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
 ]);
-function onHistory(id:string) {
+function onHistory(id: string) {
  modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }

 /** get data */
@ -335,7 +335,7 @@ function getData() {
 function getHistory() {
  showLoader();
  http
-    .get(config.API.dataUserCertificateHistory("training",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("training", idByRow.value))
    .then((res) => {
      const data = res.data.result;
      rowsHistory.value = data;
@ -477,9 +477,9 @@ onMounted(() => {
      </template>
      <template v-slot:no-data>
        <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
        >
-          <span> ไม่พบข้อมูลการฝึกอบรม/ดูงาน </span>
+          <span> ไม่พบข้อมูล </span>
        </div>
      </template>
    </d-table>
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@ -10,7 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";

-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const store = useRegistryInFormationStore();
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
@ -388,9 +388,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
  },
 ]);

-function onHistory(id:string) {
+function onHistory(id: string) {
  modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }

 /** get data */
@ -414,7 +414,7 @@ function getData() {
 function getHistory() {
  showLoader();
  http
-    .get(config.API.dataUserCertificateHistory("insignia",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("insignia", idByRow.value))
    .then((res) => {
      const data = res.data.result;
      rowsHistory.value = data;
@ -577,9 +577,9 @@ onMounted(async () => {
      </template>
      <template v-slot:no-data>
        <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
        >
-          <span> ไม่พบข้อมูลเครื่องราชอิสริยาภรณ์ </span>
+          <span> ไม่พบข้อมูล </span>
        </div>
      </template>
    </d-table>
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@ -10,7 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";

-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const store = useRegistryInFormationStore();
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
@ -183,16 +183,16 @@ const columnsHistory = ref<QTableProps["columns"]>([
  },
 ]);

-function onHistory(id:string) {
+function onHistory(id: string) {
  modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }

 /** get data */
 function getData() {
  showLoader();
  http
-    .get(config.API.dataUserCertificate('honor'))
+    .get(config.API.dataUserCertificate("honor"))
    .then((res) => {
      const data = res.data.result;
      rows.value = data;
@ -207,7 +207,10 @@ function getData() {

 /** get history */
 function getHistory() {
-  const url = store.typeProfile == 'OFFICER' ? config.API.dataUserHonorHistory('honor','',idByRow.value):config.API.dataUserHonorHistory('honor','-employee',idByRow.value)
+  const url =
+    store.typeProfile == "OFFICER"
+      ? config.API.dataUserHonorHistory("honor", "", idByRow.value)
+      : config.API.dataUserHonorHistory("honor", "-employee", idByRow.value);
  showLoader();
  http
    .get(url)
@ -308,7 +311,7 @@ onMounted(() => {
              {{ props.row.status ? props.row.status : "-" }}
            </div>
            <div v-else>
-              {{ col.value?col.value:'-' }}
+              {{ col.value ? col.value : "-" }}
            </div>
          </q-td>
          <q-td auto-width>
@ -343,7 +346,6 @@ onMounted(() => {
                <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
              </q-btn>
              <q-item v-for="col in props.cols" :key="col.name">
-
                <q-item-section class="fix_top">
                  <q-item-label class="text-grey-6 text-weight-medium">{{
                    col.label
@ -360,10 +362,10 @@ onMounted(() => {
        </div>
      </template>
      <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลประกาศเกียรติคุณ
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
        </div>
      </template>
    </d-table>
@ -376,7 +378,6 @@ onMounted(() => {
    :visibleColumns="visibleColumnsHistory"
    :columns="columnsHistory"
  />
-
 </template>
 <style scoped>
 .absolute_button {
@ -385,7 +386,7 @@ onMounted(() => {
  top: -20px;
 }

-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
-</style>
+</style>
--- a/src/modules/10_registry/04_Achievement/05_Assessments.vue
+++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue
@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";

-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@ -244,9 +244,9 @@ const visibleColumns = ref<string[]>([
  "date",
 ]);

-function onHistory(id:string) {
+function onHistory(id: string) {
  modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }

 /** get data */
@ -270,7 +270,7 @@ function getData() {
 function getHistory() {
  showLoader();
  http
-    .get(config.API.dataUserCertificateHistory("assessments",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("assessments", idByRow.value))
    .then((res) => {
      const data = res.data.result;
      rowsHistory.value = data;
@ -440,9 +440,9 @@ onMounted(() => {
      </template>
      <template v-slot:no-data>
        <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
        >
-          <span> ไม่พบข้อมูลผลการประเมินการปฏิบัติราชการ </span>
+          <span> ไม่พบข้อมูล</span>
        </div>
      </template>
    </d-table>