แก้ path

This commit is contained in:
STW_TTTY\stwtt 2024-09-23 14:48:22 +07:00
parent e15d27ca8b
commit daa2054b56
6 changed files with 104 additions and 21 deletions

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { onMounted, reactive, ref } from "vue";
import { onMounted, reactive, ref, computed } from "vue";
import { useRouter, useRoute } from "vue-router";
import { useQuasar } from "quasar";
@ -13,7 +13,7 @@ import type {
FormData,
ArrayPerson,
ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint";
} from "@/modules/11_discipline/interface/request/Complaint";
import Form from "@/modules/11_discipline/components/1_Complaint/Form.vue";
import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
@ -163,11 +163,15 @@ const visibleColumns = ref<string[]>([
"organization",
]);
/** ดึงข้อมูล */
async function getData() {
showLoader();
await http
.get(config.API.complaintbyId(id.value))
.get(
config.API.complaintbyGetId(id.value, mainStore.pathComplaints(route.name as string))
)
.then((res) => {
const dataList = res.data.result;
data.id = dataList.id;

View file

@ -9,13 +9,13 @@ import { useCounterMixin } from "@/stores/mixin";
import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { ArrayPersonAdd } from "../../interface/response/investigate";
import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
import type { ArrayPersonAdd } from "../../interface/response/Investigate";
import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
import type {
FormData as FormDataComplaint,
ArrayPerson,
ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint";
} from "@/modules/11_discipline/interface/request/Complaint";
import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //
@ -117,8 +117,8 @@ async function getDataComplaint() {
showLoader();
await http
.get(
config.API.complaintbyId(
data.idComplaint ? data.idComplaint : store.complaintId
config.API.complaintbyGetId(
data.idComplaint ? data.idComplaint : store.complaintId,mainStore.pathComplaints(route.name as string)
)
)
.then((res) => {
@ -155,7 +155,7 @@ async function getDataComplaint() {
function getData() {
showLoader();
http
.get(config.API.investigateById(id.value))
.get(config.API.investigateByGetId(id.value,mainStore.pathInves(route.name as string)))
.then((res) => {
const dataList = res.data.result;
data.id = dataList.id;

View file

@ -17,8 +17,8 @@ import type {
FormData as FormDataComplaint,
ArrayPerson,
ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
} from "@/modules/11_discipline/interface/request/Complaint";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //
@ -127,7 +127,7 @@ const dataInvestigatefacts = reactive<FormInvestigateFact>({
async function fetchDetailDisciplinary() {
showLoader();
await http
.get(config.API.disciplineDisciplinaryById(id.value))
.get(config.API.disciplineDisciplinaryByGetId(id.value,mainStore.pathDiscip(route.name as string)))
.then((res) => {
data.value = res.data.result;
status.value = res.data.result.status;
@ -146,7 +146,7 @@ async function fetchDetailDisciplinary() {
async function fetchDetailInvestigate() {
showLoader();
await http
.get(config.API.investigateById(idInvestigate.value))
.get(config.API.investigateByGetId(idInvestigate.value,mainStore.pathInves(route.name as string)))
.then((res) => {
const dataList = res.data.result;
dataInvestigatefacts.id = dataList.id;
@ -191,7 +191,7 @@ async function fetchDetailInvestigate() {
async function fetchDetailComplaints() {
showLoader();
await http
.get(config.API.complaintbyId(idComplaint.value))
.get(config.API.complaintbyGetId(idComplaint.value,mainStore.pathComplaints(route.name as string)))
.then((res) => {
const dataList = res.data.result;
dataComplaints.id = dataList.id;

View file

@ -9,13 +9,13 @@ import { useCounterMixin } from "@/stores/mixin";
import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { DataListRow } from "@/modules/11_discipline/interface/request/result";
import type { DataListRow } from "@/modules/11_discipline/interface/request/Result";
import type {
FormData as FormDataComplaint,
ArrayPerson,
ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
} from "@/modules/11_discipline/interface/request/Complaint";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue";
import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //
@ -162,7 +162,12 @@ async function fetchDetailResult() {
async function fetchDetailDisciplinary() {
showLoader();
await http
.get(config.API.disciplineDisciplinaryById(id.value))
.get(
config.API.disciplineDisciplinaryByGetId(
id.value,
mainStore.pathDiscip(route.name as string)
)
)
.then((res) => {
dataDisciplinary.value = res.data.result;
})
@ -178,7 +183,12 @@ async function fetchDetailDisciplinary() {
async function fetchDetailInvestigate() {
showLoader();
await http
.get(config.API.investigateById(idInvestigate.value))
.get(
config.API.investigateByGetId(
idInvestigate.value,
mainStore.pathInves(route.name as string)
)
)
.then((res) => {
const dataList = res.data.result;
dataInvestigatefacts.id = dataList.id;
@ -223,7 +233,12 @@ async function fetchDetailInvestigate() {
async function fetchDetailComplaints() {
showLoader();
await http
.get(config.API.complaintbyId(idComplaint.value))
.get(
config.API.complaintbyGetId(
idComplaint.value,
mainStore.pathComplaints(route.name as string)
)
)
.then((res) => {
const dataList = res.data.result;
dataComplaints.id = dataList.id;