Merge branch 'develop' into dev-tee

src/api/06_retirement/api.retirement.ts

@@ -32,7 +32,7 @@ export default {
   listExitInterview: () => `${retirement}/resign/questionnaire`,
   ExitInterviewByid: (id: string) => `${retirement}/resign/questionnaire/${id}`,
   ExitInterviewReport: `${retirement}/resign/questionnaire/report`,
-  AppointInterview:(id: string) =>`${retirement}/resign/questionnaire/appoint/${id}`,
+  AppointInterview: (id: string) => `${retirement}/resign/questionnaire/appoint/${id}`,
   // ปลดออก
   retirementDischarge,
   listDischarge: () => `${retirement}/discharge`,
@@ -52,5 +52,9 @@ export default {
   outReport: `${retirement}/out/report`,
 
   fileRetirement: (id: string) => `${retirement}/upload/${id}`,
-  checkfileupload: (id: string) => `${retirement}/upload/check/${id}`
+  checkfileupload: (id: string) => `${retirement}/upload/check/${id}`,
+
+  editDetail: (retireId: string) => `${retirement}/detail/${retireId}`
+
+
 };

src/components/CurruncyInput.vue

@@ -13,8 +13,8 @@
     :borderless="!edit"
     hide-bottom-space
   >
-    <template v-for="(_, slot) in slots" v-slot:[slot]="scope">
+    <template v-for="slot in slots">
-      <slot :name="slot" v-bind="scope || {}" />
+      <slot :name="slot" />
     </template>
   </q-input>
 </template>
@@ -37,9 +37,9 @@ const props = defineProps({
 });
 
 const { inputRef, formattedValue, setValue } = useCurrencyInput({
-  locale: "en-US",
+  locale: "th-TH",
-  currency: "EUR",
+  currency: "THB",
-  // currencyDisplay: "hidden",
+  currencyDisplay: "hidden" as any,
   hideCurrencySymbolOnFocus: true,
   hideGroupingSeparatorOnFocus: true,
   hideNegligibleDecimalDigitsOnFocus: true,
@@ -50,7 +50,7 @@ const { inputRef, formattedValue, setValue } = useCurrencyInput({
 
 watch(
   () => props.modelValue,
-  (value) => {
+  (value: any) => {
     setValue(value);
   }
 );

src/components/Dialogs/PopupReason.vue

@@ -2,7 +2,7 @@
 import { ref, watch } from "vue";
 import DialogHeader from "@/components/DialogHeader.vue";
 
-const reason = ref<string>("");
+const reason = ref<string | undefined>("");
 const props = defineProps({
   modal: {
     type: Boolean,
@@ -18,16 +18,21 @@ const props = defineProps({
   },
   clickClose: {
     type: Function,
-    default: () => { },
+    default: () => {},
   },
   savaForm: {
     type: Function,
-    default: () => { },
+    default: () => {},
+  },
+  textReport: {
+    type: String,
   },
 });
 watch(props, () => {
-  if (props.modal === true) {
+  if (props.modal === true && props.textReport == "") {
     reason.value = "";
+  } else {
+    reason.value = props.textReport;
   }
 });
 
@@ -51,18 +56,31 @@ const submit = () => {
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-12">
               <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
-
+                <q-input
-                <q-input type="textarea" class="full-width inputgreen cursor-pointer" hide-bottom-space outlined dense
+                  type="textarea"
-                  lazy-rules :rules="[(val) => !!val || `กรุณากรอก${label}`]" v-model="reason" :label="`${label}`" />
+                  class="full-width inputgreen cursor-pointer"
-
+                  hide-bottom-space
-
+                  outlined
+                  dense
+                  lazy-rules
+                  :rules="[(val) => !!val || `กรุณากรอก${label}`]"
+                  v-model="reason"
+                  :label="`${label}`"
+                />
               </div>
             </div>
           </div>
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn dense unelevated label="บันทึก" color="public" @click="submit" class="q-px-md">
+          <q-btn
+            dense
+            unelevated
+            label="บันทึก"
+            color="public"
+            @click="submit"
+            class="q-px-md"
+          >
             <!-- icon="mdi-content-save-outline" -->
             <q-tooltip>บันทึก</q-tooltip>
           </q-btn>

src/modules/04_registry/components/Salary.vue

@@ -643,10 +643,10 @@ const {
 const route = useRoute();
 const id = ref<string>("");
 const date = ref<Date>(new Date());
-const amount = ref<number | null>(0);
+const amount = ref<number | undefined>(0);
 // const salary = ref<number | null>(null);
-const positionSalaryAmount = ref<number | null>(0);
+const positionSalaryAmount = ref<number | undefined>(0);
-const mouthSalaryAmount = ref<number | null>(0);
+const mouthSalaryAmount = ref<number | undefined>(0);
 const ocId = ref<string>();
 const positionId = ref<string>();
 const positionLineId = ref<string>();
@@ -1816,13 +1816,13 @@ const templateDetail = async () => {
  * กดบันทึกใน dialog
  */
 const clickSave = async () => {
-  if (amount.value == 0) {
+  // if (amount.value == 0) {
-    amount.value = null;
+  //   amount.value = null;
-  } else if (positionSalaryAmount.value == 0) {
+  // } else if (positionSalaryAmount.value == 0) {
-    positionSalaryAmount.value = null;
+  //   positionSalaryAmount.value = null;
-  } else if (mouthSalaryAmount.value == 0) {
+  // } else if (mouthSalaryAmount.value == 0) {
-    mouthSalaryAmount.value = null;
+  //   mouthSalaryAmount.value = null;
-  }
+  // }
 
   myForm.value.validate().then(async (result: boolean) => {
     if (result) {
@@ -2018,9 +2018,9 @@ const addData = () => {
   edit.value = true;
   date.value = new Date();
   date.value = new Date();
-  amount.value = 0;
+  amount.value = undefined;
-  positionSalaryAmount.value = 0;
+  positionSalaryAmount.value = undefined;
-  mouthSalaryAmount.value = 0;
+  mouthSalaryAmount.value = undefined;
   ocId.value = "";
   positionId.value = "";
   posNoId.value = "";

src/modules/04_registry/components/SalaryEmployee.vue

@@ -617,9 +617,9 @@ const {
 const route = useRoute();
 const id = ref<string>("");
 const date = ref<Date>(new Date());
-const amount = ref<number | null>(null);
+const amount = ref<number | undefined>(0);
-const positionSalaryAmount = ref<number | null>(null);
+const positionSalaryAmount = ref<number | undefined>(0);
-const mouthSalaryAmount = ref<number | null>(null);
+const mouthSalaryAmount = ref<number | undefined>(0);
 const search = ref<string>("");
 const refCommandNo = ref<any>();
 const expanded = ref<string[]>([]);
@@ -1717,9 +1717,9 @@ const templateDetail = async () => {
  * กดบันทึกใน dialog
  */
 const clickSave = async () => {
-  if (amount.value === 0) {
+  // if (amount.value === 0) {
-    amount.value = null;
+  //   amount.value = null;
-  }
+  // }
   myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
@@ -1919,9 +1919,9 @@ const addData = () => {
   modal.value = true;
   edit.value = true;
   date.value = new Date();
-  amount.value = 0;
+  amount.value = undefined;
-  positionSalaryAmount.value = null;
+  positionSalaryAmount.value = undefined;
-  mouthSalaryAmount.value = null;
+  mouthSalaryAmount.value = undefined;
 
   posNoId.value = "";
   posNoEmployee.value = "";

src/modules/04_registry/components/SalaryEmployeeTemp.vue

@@ -592,9 +592,9 @@ const {
 const route = useRoute();
 const id = ref<string>("");
 const date = ref<Date>(new Date());
-const amount = ref<number | null>(null);
+const amount = ref<number | undefined>(0);
-const positionSalaryAmount = ref<number | null>(null);
+const positionSalaryAmount = ref<number | undefined>(0);
-const mouthSalaryAmount = ref<number | null>(null);
+const mouthSalaryAmount = ref<number | undefined>(0);
 const search = ref<string>("");
 const expanded = ref<string[]>([]);
 const selected = ref<string>("");
@@ -1746,9 +1746,9 @@ const templateDetail = async () => {
  * กดบันทึกใน dialog
  */
 const clickSave = async () => {
-  if (amount.value == 0) {
+  // if (amount.value == 0) {
-    amount.value = null;
+  //   amount.value = null;
-  }
+  // }
   myForm.value.validate().then(async (result: boolean) => {
     if (result) {
       if (modalEdit.value) {
@@ -1948,9 +1948,9 @@ const addData = () => {
   modal.value = true;
   edit.value = true;
   date.value = new Date();
-  amount.value = 0;
+  amount.value = undefined;
-  positionSalaryAmount.value = null;
+  positionSalaryAmount.value = undefined;
-  mouthSalaryAmount.value = null;
+  mouthSalaryAmount.value = undefined;
 
   posNoId.value = "";
   posNoEmployee.value = "";

src/modules/06_retirement/components/ListRetirement/TableList.vue

@@ -8,12 +8,13 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import DialogHeader from "@/components/DialogHeader.vue";
+import DialogPopupReason from "@/components/Dialogs/PopupReason.vue";
 
 const route = useRoute();
 const router = useRouter();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, success } = mixin;
+const { showLoader, hideLoader, messageError, success, dialogConfirm } = mixin;
 // const type_params = route.params.type;
 // const year_params = route.params.year;
 const retireld_params = route.params.retirementId;
@@ -26,6 +27,8 @@ const retireld = ref<string>(retireld_params.toString());
 const profileId = ref<string>("");
 const filter = ref<string>("");
 const statusUpload = ref<boolean>();
+const modalEdit = ref<boolean>(false);
+const textReport = ref<string>("");
 
 const columns = ref<any["columns"]>([
   {
@@ -177,6 +180,7 @@ const fecthlistprofile = async (id: string) => {
       round.value = res.data.result.round;
       statusReport.value = res.data.result.json;
       typeReport.value = res.data.result.typeReport;
+      textReport.value = res.data.result.detail;
       rows.value = res.data.result.profile.map((e: any) => ({
         id: e.id,
         profileId: e.profileId,
@@ -312,6 +316,7 @@ const uploadFile = async (event: any) => {
   console.log(selectedFile);
   const formdata = new FormData();
   formdata.append("file", selectedFile);
+
   await http
     .put(config.API.fileRetirement(retireld.value.toString()), formdata)
     .then((res) => {
@@ -381,6 +386,36 @@ const downloadFile = (response: any, filename: string) => {
 //     return "color: #26a69a;";
 //   } else return "";
 // };
+const saveEdiitReport = (reason: string) => {
+  const formdata = new FormData();
+  formdata.append("Detail", reason);
+  dialogConfirm(
+    $q,
+    async () => {
+      await http
+        .put(config.API.editDetail(retireld.value), formdata)
+        .then(() => {
+          success($q, "แก้ไขข้อความสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          fecthlistprofile(retireld.value);
+          closemodalEditReport();
+        });
+    },
+    "ยืนยันการแก้ไขข้อมูล",
+    "ต้องการยืนยันการแก้ไขข้อมูลนี้หรือไม่ ?"
+  );
+};
+const openmodalEditReport = () => {
+  modalEdit.value = true;
+};
+const closemodalEditReport = () => {
+  modalEdit.value = false;
+};
+
 const paging = ref<boolean>(true);
 const pagination = ref({
   sortBy: "order",
@@ -427,9 +462,22 @@ const paginationLabel = (start: number, end: number, total: number) => {
           <!-- <q-btn flat round style="color: #016987;" icon="save" @click="saveList">
           <q-tooltip>บันทึกข้อมูล</q-tooltip>
         </q-btn> -->
-          <q-btn color="primary" flat round icon="download">
+          <q-btn color="primary" flat round icon="mdi-dots-vertical">
             <q-menu>
               <q-list style="min-width: 100px">
+                <q-item
+                  clickable
+                  v-close-popup
+                  type="a"
+                  @click="openmodalEditReport()"
+                  target="_blank"
+                >
+                  <q-item-section avatar
+                    ><q-icon color="primary" name="mdi-pencil"
+                  /></q-item-section>
+                  <q-item-section>แก้ไข มติ อ.ก.ก. </q-item-section>
+                </q-item>
+                <q-separator />
                 <q-item
                   clickable
                   v-close-popup
@@ -743,6 +791,15 @@ const paginationLabel = (start: number, end: number, total: number) => {
       </q-card-actions>
     </q-card>
   </q-dialog>
+
+  <DialogPopupReason
+    :modal="modalEdit"
+    title="แก้ไขมติ อ.ก.ก."
+    label="มติ อ.ก.ก."
+    :click-close="closemodalEditReport"
+    :savaForm="saveEdiitReport"
+    :textReport="textReport"
+  />
 </template>
 
 <style lang="scss" scope>

src/modules/07_insignia/components/2_Manage/listManage.vue

@@ -190,8 +190,9 @@ const sendToDirector = async () => {
       .catch((err) => {
         messageError($q, err);
       })
-      .finally(() => {
+      .finally(async () => {
-        hideLoader();
+        await hideLoader();
+        await fecthStat(round.value);
       });
   });
 };
@@ -257,8 +258,9 @@ const directorApproved = async () => {
         .catch((err) => {
           messageError($q, err);
         })
-        .finally(() => {
+        .finally(async () => {
-          hideLoader();
+          await hideLoader();
+          await fecthStat(round.value);
         });
     },
     "ยืนยันการอนุมัติ",
@@ -288,8 +290,9 @@ const requestSendNote = async () => {
       .catch((err) => {
         messageError($q, err);
       })
-      .finally(() => {
+      .finally(async () => {
-        hideLoader();
+        await hideLoader();
+        await fecthStat(round.value);
       });
   });
 };

src/modules/08_registryEmployee/views/SalaryEmployee.vue

@@ -625,9 +625,9 @@ const {
 const route = useRoute();
 const id = ref<string>("");
 const date = ref<Date>(new Date());
-const amount = ref<number | null>(null);
+const amount = ref<number | undefined>(0);
-const positionSalaryAmount = ref<number | null>(null);
+const positionSalaryAmount = ref<number | undefined>(0);
-const mouthSalaryAmount = ref<number | null>(null);
+const mouthSalaryAmount = ref<number | undefined>(0);
 const search = ref<string>("");
 const refCommandNo = ref<any>();
 const expanded = ref<string[]>([]);
@@ -1712,9 +1712,9 @@ const templateDetail = async () => {
  */
 const clickSave = async () => {
   // dialogConfirm($q, () => SaveData());
-  if (amount.value == 0) {
+  // if (amount.value == 0) {
-    amount.value = null;
+  //   amount.value = null;
-  }
+  // }
   await myForm.value.validate().then(async (result: boolean) => {
     if (result && agencyId.value) {
       if (modalEdit.value) {
@@ -1918,9 +1918,9 @@ const addData = () => {
   modal.value = true;
   edit.value = true;
   date.value = new Date();
-  amount.value = 0;
+  amount.value = undefined;
-  positionSalaryAmount.value = null;
+  positionSalaryAmount.value = undefined;
-  mouthSalaryAmount.value = null;
+  mouthSalaryAmount.value = undefined;
 
   posNoId.value = "";
   posNoEmployee.value = "";