Merge branch 'develop' into devTee

src/modules/09_leave/components/4_specialTime/DialogApprove.vue

@@ -29,8 +29,8 @@ const props = defineProps({
   date: { type: String, default: "" },
   dateFix: { type: String, default: "" },
   id: { type: String, default: "" },
-  checkInStatus: { type: String, default: "NORMAL" },
-  checkOutStatus: { type: String, default: "NORMAL" },
+  checkInStatus: { type: String, default: "" },
+  checkOutStatus: { type: String, default: "" },
   closeDialog: { type: Function, default: () => {} },
   detailData: Object,
 });
@@ -125,7 +125,6 @@ function close() {
 watch(
   () => props.modal,
   () => {
-    console.log("props===>", props);
     if (props.editCheck === "APPROVE") {
       formData.checkIn = "";
       formData.checkOut = "";
@@ -145,7 +144,7 @@ watch(
           !props.detailData.checkInEdit &&
           props.detailData.checkOutEdit
         ) {
-          formData.checkIn = props.detailData.startAfternoon;
+          formData.checkIn = props.detailData.startTimeAfternoon;
           formData.checkOut = props.detailData.endTimeAfternoon;
         }
         formData.note = props.detailData.note;

src/modules/09_leave/views/ChangeRoundMain.vue

@@ -56,11 +56,30 @@ function Openmodal(check: string, detail: any) {
   }
 }
 
+/**
+ * function เรียกข้อมูลปฏิทินวันทำงาน
+ * @param id profileId
+ */
+async function fetchDataCalendarWork(id: string) {
+  showLoader();
+  await http
+    .get(config.API.leaveWorkByid(id))
+    .then((res) => {
+      dateWork.value = res.data.result.work;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      modalFix.value = true;
+      hideLoader();
+    });
+}
+
 const detailByid = ref();
-function OpenmodalFix(detail: any) {
-  dateWork.value = "NORMAL";
+async function OpenmodalFix(detail: any) {
+  await fetchDataCalendarWork(detail.profileId);
   detailByid.value = detail;
-  modalFix.value = true;
 }
 
 /** Function closePopup */

src/modules/10_order/views/Main.vue

@@ -229,7 +229,9 @@ const OrderStatus = ref<string>("ทั้งหมด");
 const OrderStatusOption = ref<DataOption1[]>([
   { id: "ทั้งหมด", name: "ทั้งหมด" },
 ]);
-const OrderStatusFilter1 = ref<any>([]);
+const OrderStatusFilter1 = ref<DataOption1[]>([
+  { id: "ทั้งหมด", name: "ทั้งหมด" },
+]);
 const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   for (let data of OriginalData.value) {
@@ -243,15 +245,7 @@ const OrderStatusFilter = async () => {
     }
 
     if (!addedOrderStatusValues.includes(OrderStatusValue)) {
-      OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
-      OrderStatusOption.value.push({
-        // id: OrderStatusValue,
-        id: OrderStatusOption.value.length.toString(),
-        name: OrderStatusValue,
-      });
-      OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
       OrderStatusFilter1.value.push({
-        // id: OrderStatusValue,
         id: OrderStatusFilter1.value.length.toString(),
         name: OrderStatusValue,
       });

src/modules/11_discipline/components/9_Order/MainPage.vue

@@ -224,7 +224,9 @@ const OrderStatus = ref<string>("ทั้งหมด");
 const OrderStatusOption = ref<DataOption1[]>([
   { id: "ทั้งหมด", name: "ทั้งหมด" },
 ]);
-const OrderStatusFilter1 = ref<any>([]);
+const OrderStatusFilter1 = ref<DataOption1[]>([
+  { id: "ทั้งหมด", name: "ทั้งหมด" },
+]);
 const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
   for (let data of stroe.mainData) {
@@ -238,15 +240,7 @@ const OrderStatusFilter = async () => {
     }
 
     if (!addedOrderStatusValues.includes(OrderStatusValue)) {
-      OrderStatusOption.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
-      OrderStatusOption.value.push({
-        // id: OrderStatusValue,
-        id: OrderStatusOption.value.length.toString(),
-        name: OrderStatusValue,
-      });
-      OrderStatusFilter1.value = [{ id: "ทั้งหมด", name: "ทั้งหมด" }];
       OrderStatusFilter1.value.push({
-        // id: OrderStatusValue,
         id: OrderStatusFilter1.value.length.toString(),
         name: OrderStatusValue,
       });

src/modules/12_evaluatePersonal/components/Detail/step/step3.vue

@@ -131,7 +131,7 @@ onMounted(() => {
     >
       <q-item-section
         >แบบตรวจสอบความถูกต้องครบถ้วนของข้อมูลเพื่อประกอบการคัดเลือกบุคคล
-        (เอกสารแบบ ก.)</q-item-section
+        (เอกสารแบบ ก)</q-item-section
       >
     </q-item>
     <q-item

src/modules/12_evaluatePersonal/components/Detail/step/step6.vue

@@ -109,6 +109,7 @@ onMounted(() => {
               <div class="col-xs-12 col-sm-12 row">
                 <div class="row col-12 q-col-gutter-md q-pa-sm">
                   <q-input
+                    readonly
                     dense
                     class="col-xs-12 col-sm-6"
                     outlined