From 9bb81be90d2f766ef8e243de2c619e6824bf4df7 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 18 Dec 2024 16:39:42 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?= =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A5?= =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=88=E0=B8=B3=20=E0=B8=81=E0=B8=97?= =?UTF-8?q?=E0=B8=A1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/02_organizational/api.organization.ts | 1 + src/api/11_discipline/api.discipline.ts | 4 +- src/components/Dialogs/AddPersonal.vue | 40 ++++++++-- .../components/DialogHistory.vue | 79 +++++++++++++++---- .../04_registryPerson/views/listView.vue | 62 +++++++++------ .../components/1_Complaint/EditPage.vue | 10 +++ .../components/1_Complaint/Form.vue | 12 ++- .../2_InvestigateFacts/EditPage.vue | 2 +- .../components/2_InvestigateFacts/Form.vue | 37 +++++---- .../3_InvestigateDisciplinary/EditPage.vue | 2 +- .../3_InvestigateDisciplinary/Form.vue | 30 ++++--- .../4_Result/DialogSendToCommand.vue | 11 ++- .../components/4_Result/EditPage.vue | 4 +- .../components/4_Result/Form.vue | 16 +++- .../7_ListSuspend/DialogSendToCommand.vue | 28 ++++++- .../components/7_ListSuspend/ListsPage.vue | 58 +++++++++++++- .../components/PopupSendToNext.vue | 10 ++- .../interface/response/suspend.ts | 1 + src/modules/11_discipline/store/Main.ts | 66 +++++++++++++--- .../11_discipline/store/SuspendStore.ts | 3 +- 20 files changed, 370 insertions(+), 106 deletions(-) diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts index ad8eecca0..19a34b306 100644 --- a/src/api/02_organizational/api.organization.ts +++ b/src/api/02_organizational/api.organization.ts @@ -66,6 +66,7 @@ export default { // ค้นหาคนตามเงื่อนไข orgSearchPersonal: () => `${organization}/profile/search-personal`, + orgSearchPersonalByType: (type:string) => `${organization}/profile${type}/search-personal`, /** บรรจุแต่งตั้ง*/ orgPosPlacement: `${orgPos}/placement/search`, diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts index 19aafbbb6..6e0b61e0a 100644 --- a/src/api/11_discipline/api.discipline.ts +++ b/src/api/11_discipline/api.discipline.ts @@ -87,8 +87,8 @@ export default { `${discipline}/director/${disciplineId}/${id}`, /** ผู้ถูกพักราชการ */ - suspendMain: (page: number, pageSize: number, keyword: string) => - `${suspend}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, + suspendMain: (page: number, pageSize: number, keyword: string,type:string) => + `${suspend}?page=${page}&pageSize=${pageSize}&keyword=${keyword}&profileType=${type}`, suspendById: (id: string) => `${suspend}/${id}`, suspendReport: () => `${suspend}/report`, diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue index f45fcb049..5ce74adf9 100644 --- a/src/components/Dialogs/AddPersonal.vue +++ b/src/components/Dialogs/AddPersonal.vue @@ -46,6 +46,12 @@ const type = ref("citizenId"); const search = ref(""); const selected = ref([]); +const employeeClass = ref("officer"); +const employeeClassOption = ref([ + { id: "officer", name: "ข้าราชการ กทม. สามัญ" }, + { id: "employee", name: "ลูกจ้างประจำ กทม." }, +]); + const typeOps = ref([ { id: "citizenId", name: "เลขประจำตัวประชาชน" }, { id: "fullName", name: "ชื่อ-นามสกุล" }, @@ -97,6 +103,7 @@ const emit = defineEmits(["returnData"]); async function close() { props.close(); rows.value = []; + employeeClass.value = "officer"; search.value = ""; } @@ -111,8 +118,9 @@ function savePost() { /** save data หลังจาก ยืนยัน */ function saveData() { - props.save(); - emit("returnData", selected.value); + props.save(selected.value, employeeClass.value); + rows.value = []; + employeeClass.value = "officer"; } const searchRef = ref(null); @@ -129,11 +137,14 @@ async function getSearch() { showLoader(); const body = { fieldName: type.value, - keyword: search.value ? search.value.trim():'', + keyword: search.value ? search.value.trim() : "", }; await http .post( - config.API.orgSearchPersonal()+`?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}`, + config.API.orgSearchPersonalByType( + employeeClass.value == "officer" ? "" : "-employee" + ) + + `?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}`, body ) .then((res) => { @@ -233,7 +244,23 @@ watch( -
+
+
+ +
+
+
+
{{ col.value }}
diff --git a/src/modules/04_registryPerson/components/DialogHistory.vue b/src/modules/04_registryPerson/components/DialogHistory.vue index d71af7ea4..bc95028cb 100644 --- a/src/modules/04_registryPerson/components/DialogHistory.vue +++ b/src/modules/04_registryPerson/components/DialogHistory.vue @@ -2,7 +2,7 @@ import { ref } from "vue"; import { useQuasar } from "quasar"; -import { useRouter } from "vue-router"; +import { useRouter,useRoute } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; import http from "@/plugins/http"; import config from "@/app.config"; @@ -22,6 +22,7 @@ import DialogHeader from "@/components/DialogHeader.vue"; //use const myForm = ref(); const router = useRouter(); +const route = useRoute(); const $q = useQuasar(); const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin(); @@ -29,7 +30,7 @@ const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin(); const modal = defineModel("modal", { required: true }); //แสดง popup ประวัติถือครองตำแหน่ง //ตัวแปร -const employeeClass = ref(""); //ประเภทข้า่รายการ +const employeeClass = ref(route.name == "registryNew" ? 'officer':'perm'); //ประเภทข้า่รายการ const typeKeyword = ref(""); const Keyword = ref(""); const positionKeyword = ref(""); @@ -252,23 +253,23 @@ function closeDialog() { diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue index 7b3150d48..2a3f5ea6e 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue @@ -18,7 +18,7 @@ import type { ArrayPerson, ArrayFileList, } from "@/modules/11_discipline/interface/request/complaint"; -import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact"; +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"; //เรื่องร้องเรียน diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 09e9fe10d..98afee391 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -56,6 +56,7 @@ const calendarModal = ref(false); const calendarModalclose = () => (calendarModal.value = !calendarModal.value); const modalPopup = ref(false); +const isEmpType = ref(""); const checkRoutePermisson = ref( route.name == "disciplineDisciplinaryDetail" ); @@ -286,6 +287,7 @@ async function fetchDatadetail() { id: person.id, idcard: person.idcard, name: person.name, + profileType: person.profileType, prefix: person.prefix, firstName: person.firstName, lastName: person.lastName, @@ -334,6 +336,7 @@ async function fetchDatadetail() { idcard: person.idcard, name: person.name, prefix: person.prefix, + profileType: person.profileType, firstName: person.firstName, lastName: person.lastName, posLevelName: person.posLevelName, @@ -397,14 +400,6 @@ function returnCount(num: number) { async function addPerson(data: any) { await mainStore.fetchData(data); -} - -/** - * ฟังชั่น รับค่าจาก คอมโพเเนน - * @param returnData ค่าที่ได้คืนมา - */ -function handleSave(returnData: any) { - addPerson(returnData); changeFormData(); toggleModal(); } @@ -630,9 +625,10 @@ async function saveDuty(id: string, duty: string, resolution: string) { }); } -function onclickViewinfo(id: string) { +function onclickViewinfo(id: string, type: string) { modalPersonal.value = true; personId.value = id; + isEmpType.value = type; } function updatemodalPersonal(modal: boolean) { @@ -918,7 +914,12 @@ onMounted(async () => { round color="info" icon="mdi-eye" - @click="onclickViewinfo(props.row.personId)" + @click=" + onclickViewinfo( + props.row.personId, + props.row.profileType + ) + " > ดูข้อมูลในทะเบียนประวัติ @@ -955,6 +956,13 @@ onMounted(async () => {
{{ props.row.salary.toLocaleString() }}
+
+ {{ + props.row.profileType + ? mainStore.convertType(props.row.profileType) + : "-" + }} +
{{ col.value ? col.value : "-" }}
@@ -1946,7 +1954,6 @@ onMounted(async () => { :close="toggleModal" :save="addPerson" :selected-data="mainStore.rowsAdd" - @returnData="handleSave" /> { :modal="modalPersonal" :id="personId" @update:modal="updatemodalPersonal" + v-model:is-employee="isEmpType" /> diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue index e803bb965..d4b025fa1 100644 --- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue +++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue @@ -7,6 +7,7 @@ import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useRoute } from "vue-router"; import { useCommandMainStore } from "@/modules/18_command/store/Main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { ListCommand } from "@/modules/18_command/interface/index/Main"; import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer"; @@ -18,6 +19,8 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom const $q = useQuasar(); const route = useRoute(); +const mainStore = useDisciplineMainStore(); + const storeCommand = useCommandMainStore(); const mixin = useCounterMixin(); const { @@ -278,7 +281,13 @@ watch(
{{ props.row.salary.toLocaleString() }}
- +
+ {{ + props.row.profileType + ? mainStore.convertType(props.row.profileType) + : "-" + }} +
{{ col.value ?? "-" }}
diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue index bca5e9dfc..4250d7a48 100644 --- a/src/modules/11_discipline/components/4_Result/EditPage.vue +++ b/src/modules/11_discipline/components/4_Result/EditPage.vue @@ -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"; +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"; //เรื่องร้องเรียน diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue index 2535e8c27..551138394 100644 --- a/src/modules/11_discipline/components/4_Result/Form.vue +++ b/src/modules/11_discipline/components/4_Result/Form.vue @@ -13,13 +13,14 @@ import type { FormData, FormRef, DataOption, -} from "@/modules/11_discipline/interface/request/result"; +} from "@/modules/11_discipline/interface/request/Result"; import DialogHistory from "@/modules/11_discipline/components/4_Result/DialogHistory.vue"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; const mainStore = useDisciplineMainStore(); +const isEmpType = ref('') const dataStore = useDisciplineResultStore(); const mixin = useCounterMixin(); const { @@ -227,9 +228,10 @@ function closeDetail() { } /** เปิดรายละเอียด */ -function onclickViewinfo(id: string) { +function onclickViewinfo(id: string,type:string) { modalPersonal.value = true; personId.value = id; + isEmpType.value = type } function updatemodalPersonal(modal: boolean) { @@ -394,7 +396,7 @@ watch( round color="info" icon="mdi-eye" - @click="onclickViewinfo(props.row.personId)" + @click="onclickViewinfo(props.row.personId,props.row.profileType)" > ดูข้อมูลในทะเบียนประวัติ @@ -431,6 +433,13 @@ watch( : "" }}
+
+ {{ + props.row.profileType + ? mainStore.convertType(props.row.profileType) + : "-" + }} +
{{ col.value }}
@@ -644,6 +653,7 @@ watch( diff --git a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue index 442b24704..bfed92497 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue @@ -6,7 +6,7 @@ import { useCounterMixin } from "@/stores/mixin"; import { useCommandMainStore } from "@/modules/18_command/store/Main"; import type { QTableProps } from "quasar"; -import type { dataType } from "@/modules/11_discipline/interface/response/Suspend"; +import type { dataType } from "@/modules/11_discipline/interface/response/suspend"; import type { ListCommand } from "@/modules/18_command/interface/index/Main"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -56,6 +56,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "name", align: "left", @@ -106,6 +115,7 @@ const columns = ref([ /** คอลัมน์ที่แสดง */ const visibleColumns = ref([ "no", + "profileType", "name", "position", "positionLevel", @@ -154,6 +164,15 @@ function serchDataTable() { ); } +function convertType(val: string) { + switch (val) { + case "OFFICER": + return "ข้าราชการ กทม. สามัญ"; + case "EMPLOYEE": + return "ลูกจ้างประจำ กทม."; + } +} + /** * เมื่อ props.modal เป็น true * กำหนดให้ selected เป็นค่าว่างและกำหนด filter ประเภทตำแหน่งตามประเภทการสอบ @@ -270,6 +289,13 @@ watch(
{{ props.rowIndex + 1 }}
+
+ {{ + props.row.profileType + ? convertType(props.row.profileType.toUpperCase()) + : "-" + }} +
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue index 90d18da09..9efbbfeb3 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue @@ -8,7 +8,10 @@ import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/SuspendStore"; -import type { dataType } from "@/modules/11_discipline/interface/response/Suspend"; +import type { + dataType, + DataOption, +} from "@/modules/11_discipline/interface/response/suspend"; import type { QTableProps } from "quasar"; import DialogSendToCommand from "@/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue"; @@ -21,11 +24,18 @@ const router = useRouter(); const mixin = useCounterMixin(); const { messageError, showLoader, hideLoader, success } = mixin; +const employeeClass = ref(""); +const employeeClassOption = ref([ + { id: "", name: "ทั้งหมด" }, + { id: "OFFICER", name: "ข้าราชการ กทม. สามัญ" }, + { id: "EMPLOYEE", name: "ลูกจ้างประจำ กทม." }, +]); const modal = ref(false); /** คอลัมน์ที่แสดง */ const visibleColumns = ref([ "no", + "profileType", "title", "name", "positionType", @@ -52,6 +62,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "title", align: "left", @@ -165,7 +184,8 @@ async function getList() { config.API.suspendMain( pagination.value.page, pagination.value.rowsPerPage, - filterKeyword.value.trim() + filterKeyword.value.trim(), + employeeClass.value ) ) .then(async (res) => { @@ -205,6 +225,15 @@ watch( } ); +function convertType(val: string) { + switch (val) { + case "OFFICER": + return "ข้าราชการ กทม. สามัญ"; + case "EMPLOYEE": + return "ลูกจ้างประจำ กทม."; + } +} + /** เรียกใช้งานเมื่อเริ่มหน้าเว็ป */ onMounted(async () => { await getList(); @@ -221,7 +250,23 @@ onMounted(async () => {
-
+
+
+ +
{
{{ props.row.title ? props.row.title : "-" }}
+
+ {{ + props.row.profileType + ? convertType(props.row.profileType.toUpperCase()) + : "-" + }} +
("modal", { required: true }); const mixin = useCounterMixin(); const $q = useQuasar(); const { dialogConfirm, dialogMessageNotify, onSearchDataTable } = mixin; +const mainStore = useDisciplineMainStore(); const dataMapToSend = computed(() => { return selected.value.map((i: any) => ({ @@ -214,7 +216,13 @@ watch(
{{ props.rowIndex + 1 }}
- +
+ {{ + props.row.profileType + ? mainStore.convertType(props.row.profileType) + : "-" + }} +
{{ col.value }}
diff --git a/src/modules/11_discipline/interface/response/suspend.ts b/src/modules/11_discipline/interface/response/suspend.ts index 9cb23a0e1..c83d3c7fd 100644 --- a/src/modules/11_discipline/interface/response/suspend.ts +++ b/src/modules/11_discipline/interface/response/suspend.ts @@ -19,6 +19,7 @@ interface listData { offenseDetails: string; disciplinaryFaultLevel: string; disciplinaryCaseFault: string; + profileType: string; } interface dataType { diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts index 2d43de8df..5bf475a8b 100644 --- a/src/modules/11_discipline/store/Main.ts +++ b/src/modules/11_discipline/store/Main.ts @@ -44,6 +44,15 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "idcard", align: "left", @@ -115,6 +124,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { /** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */ const visibleColumnsRespondent = ref([ "no", + "profileType", "idcard", "name", "posNo", @@ -125,16 +135,17 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { ]); /** หัวตารางกรรมการ */ + // { + // name: "info", + // align: "left", + // label: "", + // sortable: false, + // field: "info", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, const columnsDirector = ref([ - { - name: "info", - align: "left", - label: "", - sortable: false, - field: "info", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + { name: "no", align: "left", @@ -144,6 +155,15 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "idcard", align: "left", @@ -220,9 +240,10 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { ]); /** หัวข้อที่เเสดงในตารางกรรมการ */ + // "info", const visibleColumnsDirector = ref([ - "info", "no", + "profileType", "idcard", "name", "posNo", @@ -407,8 +428,13 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { * จัดเก็บข้อมูลไว้ เพื่อใช้ใน POPUP * @param data ข้อมูลรายการบุคคล */ - async function fetchData(data: ArrayPersonAdd[]) { + async function fetchData(data: ArrayPersonAdd[], type?: string) { const dataList: any = data.map((item: any) => ({ + profileType: item.profileType + ? item.profileType + : type == "officer" + ? "OFFICER" + : "EMPLOYEE", id: item.id, idcard: item.idcard, name: item.name, @@ -442,7 +468,13 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { posLevelId: item.posLevelId, posLevelName: item.posLevelName, })); - rowsAdd.value = dataList; + + const newItems = dataList.filter( + (newItem: any) => !rowsAdd.value.some((existingItem: any) => existingItem.personId === newItem.personId) + ); + + // เพิ่มข้อมูลใหม่เข้า rowsAdd + rowsAdd.value = [...rowsAdd.value, ...newItems]; } /** @@ -454,6 +486,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { id: item.id, idcard: item.idcard, name: item.name, + profileType: item.profileType, prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, @@ -488,6 +521,14 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { rowsSend.value = dataList; } + function convertType(val: string) { + switch (val) { + case "OFFICER": + return "ข้าราชการ กทม. สามัญ"; + case "EMPLOYEE": + return "ลูกจ้างประจำ กทม."; + } + } return { complainantoptionsMain, convertFault, @@ -513,5 +554,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { pathDiscip, pathComplaintsChannal, pathDirector, + convertType, }; }); diff --git a/src/modules/11_discipline/store/SuspendStore.ts b/src/modules/11_discipline/store/SuspendStore.ts index c87fc13b4..5c3b5d6ed 100644 --- a/src/modules/11_discipline/store/SuspendStore.ts +++ b/src/modules/11_discipline/store/SuspendStore.ts @@ -7,7 +7,7 @@ import type { listData, dataType, DataOption, -} from "@/modules/11_discipline/interface/response/Suspend"; +} from "@/modules/11_discipline/interface/response/suspend"; import type { QTableProps } from "quasar"; export const useDisciplineSuspendStore = defineStore( @@ -38,6 +38,7 @@ export const useDisciplineSuspendStore = defineStore( name: `${item.prefix}${item.firstName} ${item.lastName}`, prefix: item.prefix, firstName: item.firstName, + profileType: item.profileType, lastName: item.lastName, organization: item.organization, position: item.position,