Merge branch 'develop' into NiceDev

src/modules/05_leave/components/Forms/01_SickForm.vue

@@ -134,12 +134,13 @@ const onSubmit = async () => {
 async function saveFormData() {
 	const formData = new FormData()
 	if (formDataSick.leaveDocument.length > 0) {
-		const blob = formDataSick.leaveDocument[0].slice(0, formDataSick.leaveDocument[0].size)
+		const blob = formDataSick.leaveDocument.slice(0, formDataSick.leaveDocument[0].size)
 		const newFile = new File(blob, nameFile.value, {
 			type: formDataSick.leaveDocument[0].type,
 		})
 		formData.append("leaveDocument", newFile)
 	}
+
 	formData.append("type", formDataSick.type)
 	formData.append("leaveStartDate", dateToISO(formDataSick.leaveStartDate))
 	formData.append("leaveEndDate", dateToISO(formDataSick.leaveEndDate))

src/modules/06_evaluate/components/Tab1.vue

@@ -19,6 +19,7 @@ import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue";
 
 import { useEvaluateStore } from "@/modules/06_evaluate/store";
 import { useCounterMixin } from "@/stores/mixin";
+import type router from "../router";
 
 const store = useEvaluateStore();
 const mixin = useCounterMixin();
@@ -26,6 +27,9 @@ const { dialogConfirm } = mixin;
 
 const $q = useQuasar();
 
+const externalLink =
+  "https://accreditation.ocsc.go.th/accreditation/search/curriculum";
+
 function onCilckNextStep() {
   store.step < 9 &&
     dialogConfirm(
@@ -124,7 +128,9 @@ onMounted(() => {
           </div>
         </div>
         <div class="col-3 text-right">
-          <router-link to="https://accreditation.ocsc.go.th/accreditation/search/curriculum">ไปยัง ก.พ. เพื่อตรวจสอบข้อมูล</router-link>
+          <q-btn :href="externalLink" target="_blank" outline color="blue" no-caps >
+            ไปยัง ก.พ. เพื่อตรวจสอบข้อมูล
+          </q-btn>
         </div>
       </div>