Merge branch 'develop' into devTee

2024-12-25 15:27:13 +07:00 · 2024-12-25 15:27:13 +07:00 · b4a2bb253d
commit b4a2bb253d
parent 47878a7161 2573e7e36d
10 changed files with 31 additions and 45 deletions
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@ -625,7 +625,7 @@ onMounted(() => {
                bg-color="white"
                class="inputgreen"
                dense
-                :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่ใบอนุญาต'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกเลขที่ใบอนุญาต'}`,(val:string) =>  val.length <= 20 || `${'เลขที่ใบอนุญาตยาวเกินกำหนด'}`]"
                hide-bottom-space
              />
            </div>
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@ -312,6 +312,12 @@ function onClickOpenDialog(statusEdit: boolean = false, data: any = []) {
  formDataSalary.refCommandNo = statusEdit ? data.refCommandNo : "";
  formDataSalary.templateDoc = "";
  formDataSalary.doc = statusEdit ? data.templateDoc : "";
+
+  formDataSalary.amountSpecial = statusEdit
+    ? data.amountSpecial === 0
+      ? ""
+      : data.amountSpecial
+    : "";
 }

 /** function  ปิด dialog ตำแหน่งเงินเดือน*/
--- a/src/modules/05_placement/components/PersonalDetail/DetailMain.vue
+++ b/src/modules/05_placement/components/PersonalDetail/DetailMain.vue
@ -516,7 +516,7 @@ onMounted(async () => {
        class="q-mr-sm"
        @click="router.go(-1)"
      />
-      รายละเอียดของ {{ personalData.fullName }}
+      รายละเอียด {{ personalData.fullName }}
    </div>
  </div>
  <div class="q-pb-lg">
--- a/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Document.vue
@ -282,6 +282,7 @@ onMounted(async () => {
            hide-bottom-space
            accept=".pdf,.xlsx,.docx,.png,.jpg"
            clearable
+            :disable="!statusEdit"
          >
            <template v-slot:prepend>
              <q-icon name="attach_file" color="primary" />
@ -300,8 +301,6 @@ onMounted(async () => {
              >
            </template>
          </q-file>
-
-          <!-- <div class="col-1 self-center" v-if="formData.documentFile"></div> -->
        </div>

        <div v-if="fileList.length > 0" class="col-xs-12 row">
@ -315,7 +314,7 @@ onMounted(async () => {
            >
              <q-item-section>{{ data.fileName }}</q-item-section>
              <q-space />
-              <div>
+              <div v-if="statusEdit">
                <q-btn
                  size="12px"
                  flat
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
@ -32,7 +32,6 @@ const { showLoader, hideLoader, messageError } = mixin;
 const assignId = ref<string>(route.params.form.toString());
 const personalId = ref<string>(route.params.personalId.toString());

-
 const tab = ref<string>("save1");
 const dataArrayNumber = ref<number>();
 const dataRole = ref<string>("mentor");
@ -52,7 +51,7 @@ async function fecthAssign(id: string) {
      // messageError($q, e);
    })
    .finally(() => {
-      probationStore.checkLoad && hideLoader();
+      hideLoader();
    });
 }

@ -82,13 +81,13 @@ async function FileDownload(type: string) {
          `แบบบันทึกผล(ผู้ดูเเล)_${probationStore.person.name}_ครั้งที่${numTab.no}`,
          type
        );
-        hideLoader();
      })
      .catch(async (e) => {
        messageError($q, JSON.parse(await e.response.data.text()));
-        hideLoader();
      })
-      .finally(() => {});
+      .finally(() => {
+        hideLoader();
+      });
  } else {
    //ผุ้บังคับ
    showLoader();
@ -101,13 +100,13 @@ async function FileDownload(type: string) {
          `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}`,
          type
        );
-        hideLoader();
      })
      .catch(async (e) => {
        messageError($q, JSON.parse(await e.response.data.text()));
-        hideLoader();
      })
-      .finally(() => {});
+      .finally(() => {
+        hideLoader();
+      });
  }
 }

--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
@ -65,21 +65,10 @@ async function fecthAssign(id: string) {
      // messageError($q, e);
    })
    .finally(() => {
-      probationStore.checkLoad && hideLoader();
+      hideLoader();
    });
 }

-/** เปลี่ยน type file */
-function downloadFile(response: any, filename: string) {
-  const link = document.createElement("a");
-  var fileName = filename;
-  link.href = window.URL.createObjectURL(new Blob([response.data]));
-  link.setAttribute("download", fileName);
-  document.body.appendChild(link);
-  link.click();
-  document.body.removeChild(link);
-}
-
 /**
 * download file
 * @param type type
@ -96,13 +85,13 @@ async function FileDownload(type: string) {
        `แบบประเมินผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}`,
        type
      );
-      hideLoader();
    })
    .catch(async (e) => {
      messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
    })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }

 /** เปลี่ยนหน้า เพิ่ม */
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
@ -59,7 +59,7 @@ const fecthAssign = async (id: string) => {
      // messageError($q, e);
    })
    .finally(() => {
-      probationStore.checkLoad && hideLoader();
+      hideLoader();
    });
 };

@ -75,13 +75,13 @@ const FileDownload = async (type: string) => {
        `แบบประเมินผล(คณะกรรมการ)_${probationStore.person.name}_ครั้งที่${numTab.no}`,
        type
      );
-      hideLoader();
    })
    .catch(async (e) => {
      messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
    })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 };
 const addData = () => {
  router.push(
--- a/src/modules/05_placement/storeProbation.ts
+++ b/src/modules/05_placement/storeProbation.ts
@ -5,25 +5,24 @@ import type {
  DataPermissions,
  TabPermissions,
 } from "@/modules/05_placement/interface/index/Main";
-  
+
 export const useProbationDataStore = defineStore("probationStore", () => {
  const dataPermissions = ref<DataPermissions>();
-  
+
  const assign = ref<any>([]);
  const evaluate = ref<any>([]);
  const tabs = ref<any>([]);
  const mainTab = ref<string>("");
-  const checkLoad = ref<boolean>(false)
+  const checkLoad = ref<boolean>(false);
  const assignOutput = ref<any>([]);
  const director = ref<any>([]);
  const person = ref<any>([]);

  const fecthdataAssign = async (data: any) => {
-    checkLoad.value = data.evaluate.length == 0 ? true:false
+    checkLoad.value = data.evaluate.length == 0 ? true : false;
    assign.value = await data.assign;
    evaluate.value = await data.evaluate;
    tabs.value = await data.evaluate;
-
  };
  const fecthAssignoutput = (data: any) => {
    assignOutput.value = data.assign_output;
@ -114,6 +113,6 @@ export const useProbationDataStore = defineStore("probationStore", () => {
    behavior_no2,
    behavior_no3,
    dataPermissions,
-    checkLoad
+    checkLoad,
  };
 });
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@ -887,9 +887,3 @@ onMounted(async () => {
    :savaForm="clickSave"
  />
 </template>
-
-<style lang="scss" scoped>
-.font-size {
-  font-size: 1.2rem;
-}
-</style>
--- a/src/modules/09_leave/router.ts
+++ b/src/modules/09_leave/router.ts
@ -1,7 +1,7 @@
 const workMain = () => import("@/modules/09_leave/views/02_WorkingMain.vue");
 const leaveMain = () => import("@/modules/09_leave/views/05_LeaveListMain.vue");
 const leaveDetail = () =>
-  import("@/modules/09_leave/components/05_Leave/DetailLeave.vue");
+  import("@/modules/09_leave/components/05_Leave/DetailLeavePage.vue");
 const leaveDetailReject = () =>
  import("@/modules/09_leave/components/05_Leave/DetailLeaveReject.vue");
 const RoundMain = () => import("@/modules/09_leave/views/01_RoundMain.vue");