Merge branch 'develop' into warunee-dev

This commit is contained in:
Warunee Tamkoo 2023-12-01 14:42:32 +07:00
commit ab15f989cc
14 changed files with 637 additions and 42 deletions

View file

@ -2,7 +2,7 @@ import { defineStore } from "pinia";
import type { QTableProps } from "quasar";
import { ref } from "vue";
import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
import type { ArrayPerson } from "@/modules/11_discipline/interface/response/investigate";
import type { ArrayPerson, ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
/** option ผู้ถูกสอบสวน*/
@ -278,6 +278,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
rowsAdd.value = data;
}
return {
complainantoptionsMain,
convertFault,
@ -292,7 +293,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
visibleColumnsDirector,
rowsAdd,
fetchData,
statusResultOptions,
convertStatusResult,