แก้ไขรอบการปฏิบัติงานผู้ใช้งาน

src/modules/09_leave/components/2_Leave/DetailLeave.vue

@@ -434,7 +434,7 @@ function clickSave(reason: string) {
       <!-- <q-file
         v-model="filesUpload"
         dense
-        label="อัพโหลดไฟล์"
+        label="อัปโหลดไฟล์"
         outlined
         class="col-xs-12 col-sm-3 col-md-2"
         bg-color="white"

src/modules/09_leave/components/2_Leave/formDetail/formMain.vue

@@ -27,15 +27,15 @@ console.log(props);
         <div class="col">{{ props.data.fullName }}</div>
       </div>
       <div class="row">
-        <div class="col-4 text-grey-8">ตำแหน่งผู้ยืนขอ</div>
+        <div class="col-4 text-grey-8">ตำแหน่งผู้ยื่นขอ</div>
         <div class="col">{{ props.data.positionName }}</div>
       </div>
       <div class="row">
-        <div class="col-4 text-grey-8">ระดับผู้ยืนขอ</div>
+        <div class="col-4 text-grey-8">ระดับผู้ยื่นขอ</div>
         <div class="col">{{ props.data.positionLevelName }}</div>
       </div>
       <div class="row">
-        <div class="col-4 text-grey-8">สังกัดผู้ยืนขอ</div>
+        <div class="col-4 text-grey-8">สังกัดผู้ยื่นขอ</div>
         <div class="col">{{ props.data.organizationName }}</div>
       </div>
     </div>

src/modules/09_leave/components/4_ChangeRound/DialogForm.vue

@@ -33,7 +33,7 @@ const roundOp = ref<any>([]);
 
 /**Hook */
 onMounted(async () => {
-  await fetchDataOption();
+  // await fetchDataOption();
 });
 
 /**FormData */
@@ -124,8 +124,10 @@ async function fetchDataOption() {
           name: `${r.startTimeMorning}-${r.endTimeAfternoon}`,
         });
       });
-      roundOp.value = option;
-      console.log(roundOp.value);
+
+      roundOp.value = option.filter(
+        (e) => e.name !== props.DataRow?.currentRound
+      );
     })
     .catch((err) => {
       messageError($q, err);
@@ -190,12 +192,15 @@ function close() {
 }
 watch(
   () => props.modal,
-  (newDetailData, oldDetailData) => {
+  async (newDetailData, oldDetailData) => {
     if (props.editCheck === "edit") {
       formData.round = "";
       formData.reson = "";
       formData.effectiveDate = null;
     }
+    if (props.modal === true) {
+      await fetchDataOption();
+    }
   }
 );
 </script>