From 3cc4c2ec293d5ca868fe63bf0936a00dbfc1372c Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 17 Jan 2024 10:08:35 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=A7?= =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../6_BasicInformation/Director/AddPage.vue | 1 + .../Director/DialogInvestigateTotal.vue | 2 +- .../6_BasicInformation/Director/EditPage.vue | 3 + .../6_BasicInformation/Director/Form.vue | 85 ++++++------------- .../components/8_AppealComplain/Form.vue | 8 +- .../interface/request/director.ts | 8 +- 6 files changed, 38 insertions(+), 69 deletions(-) diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue index a6bfa08ce..a37435273 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue @@ -31,6 +31,7 @@ function addData(formData: FormDataPost) { position: formData.position, email: formData.email, phone: formData.phone, + qualification: formData.qualification, }) .then((res) => { success($q, "บันทึกข้อมูลสำเร็จ"); diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue index c838556de..22f972f48 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue @@ -134,7 +134,7 @@ watch(props, () => { separator > - {{ item.fullName }} + {{ `${item.fullName} (${item.duty})` }} diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue index 0892f8196..b4a5b2901 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue @@ -26,6 +26,7 @@ const data = reactive({ position: "", phone: "", email: "", + qualification: "", }); /** @@ -44,6 +45,7 @@ async function fetchData(){ data.position = dataApi.position; data.phone = dataApi.phone; data.email = dataApi.email; + data.qualification = dataApi.qualification; }) .catch((e) => { messageError($q, e); @@ -71,6 +73,7 @@ function putData(formData: FormData) { position: formData.position, email: formData.email, phone: formData.phone, + qualification: formData.qualification, }) .then((res) => { success($q, "บันทึกข้อมูลสำเร็จ"); diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue index 5d5f78c3a..e66a366f6 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue @@ -12,21 +12,19 @@ import type { } from "@/modules/11_discipline/interface/request/director"; import http from "@/plugins/http"; import config from "@/app.config"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue"; -const qualification = ref(""); -const mainStore = useDisciplineMainStore(); +const modalPersonal = ref(false); +const personId = ref(""); const searchRef = ref(null); const rows = ref([]); const search = ref(""); const $q = useQuasar(); const mixin = useCounterMixin(); const { messageError, showLoader, dialogMessageNotify, hideLoader } = mixin; -/** - * รับ props มาจาก page หลัก - */ + +/** รับ props มาจาก page หลัก */ const props = defineProps({ data: { type: Object, @@ -37,6 +35,7 @@ const props = defineProps({ default: () => "", }, }); + const type = ref("idcard"); const typeOps = ref([ { id: "idcard", name: "เลขประจำตัวประชาชน" }, @@ -63,20 +62,7 @@ const formData = reactive({ position: "", phone: "", email: "", -}); - -/** - * เช็คข้อมูลจาก props - * เมื่อมีข้อมูล - * เก็บข้อมูลลง formData - */ -watch(props.data, async () => { - formData.prefix = props.data.prefix; - formData.firstname = props.data.firstname; - formData.lastname = props.data.lastname; - formData.position = props.data.position; - formData.phone = props.data.phone; - formData.email = props.data.email; + qualification: "", }); /** @@ -93,8 +79,6 @@ const formRef: FormRef = { firstname: firstnameRef, lastname: lastnameRef, position: positionRef, - // phone: phoneRef, - // email: emailRef, }; const columnsRespondent = ref([ @@ -116,15 +100,6 @@ const columnsRespondent = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - // { - // name: "idcard", - // align: "left", - // label: "เลขบัตรประชาชน", - // sortable: true, - // field: "idcard", - // headerStyle: "font-size: 14px", - // style: "font-size: 14px", - // }, { name: "name", align: "left", @@ -134,15 +109,6 @@ const columnsRespondent = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - // { - // name: "posNo", - // align: "left", - // label: "ตำแหน่งเลขที่", - // sortable: true, - // field: "posNo", - // headerStyle: "font-size: 14px", - // style: "font-size: 14px", - // }, { name: "position", align: "left", @@ -152,24 +118,6 @@ const columnsRespondent = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - // { - // name: "positionLevel", - // align: "left", - // label: "ระดับ", - // sortable: true, - // field: "positionLevel", - // headerStyle: "font-size: 14px", - // style: "font-size: 14px", - // }, - // { - // name: "salary", - // align: "left", - // label: "เงินเดือน", - // sortable: true, - // field: "salary", - // headerStyle: "font-size: 14px", - // style: "font-size: 14px", - // }, { name: "organization", align: "left", @@ -311,8 +259,6 @@ function returnDetail(data: any) { formData.email = data.email; } -const modalPersonal = ref(false); -const personId = ref(""); /** * function ดูประวัติแบบย่อย * @param id personId @@ -321,6 +267,7 @@ function onclickViewinfo(id: string) { modalPersonal.value = true; personId.value = id; } + /** * function อัปเดท modal * @param modal ค่า modal @@ -328,6 +275,21 @@ function onclickViewinfo(id: string) { function updatemodalPersonal(modal: boolean) { modalPersonal.value = modal; } + +/** + * เช็คข้อมูลจาก props + * เมื่อมีข้อมูล + * เก็บข้อมูลลง formData + */ + watch(props.data, async () => { + formData.prefix = props.data.prefix; + formData.firstname = props.data.firstname; + formData.lastname = props.data.lastname; + formData.position = props.data.position; + formData.phone = props.data.phone; + formData.email = props.data.email; + formData.qualification = props.data.qualification; +});