Merge branch 'develop' into dev-tee

This commit is contained in:
setthawutttty 2023-09-20 13:58:30 +07:00
commit e91bbb22f4
61 changed files with 8406 additions and 10436 deletions

View file

@ -4,6 +4,9 @@ import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar";
import { useRoute, useRouter } from "vue-router";
import { useProbationDataStore } from "@/modules/05_placement/storeProbation";
import http from "@/plugins/http";
import config from "@/app.config";
const Header = defineAsyncComponent(
() =>
import(
@ -17,8 +20,6 @@ const FormSaveResult = defineAsyncComponent(
)
);
import http from "@/plugins/http";
import config from "@/app.config";
const router = useRouter();
const route = useRoute();
const $q = useQuasar();

View file

@ -4,6 +4,9 @@ import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar";
import { useRoute, useRouter } from "vue-router";
import { useProbationDataStore } from "@/modules/05_placement/storeProbation";
import http from "@/plugins/http";
import config from "@/app.config";
const Header = defineAsyncComponent(
() =>
import(
@ -17,8 +20,6 @@ const FormSaveResultCommader = defineAsyncComponent(
)
);
import http from "@/plugins/http";
import config from "@/app.config";
const router = useRouter();
const route = useRoute();
const $q = useQuasar();

View file

@ -1,13 +1,6 @@
<script setup lang="ts">
import { ref, defineAsyncComponent } from "vue";
// const tab = ref<string>("save1");
// const changeTab = (tabVal: string) => {
// tab.value = tabVal
// }
// const Header = defineAsyncComponent(
// () => import("@/modules/05_placement/components/probation/FormEvaluation/Header.vue")
// );
const FormReport = defineAsyncComponent(
() => import("@/modules/05_placement/components/probation/FormEvaluation/FormReport.vue")
)