diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue index b439fb913..c2a8bb262 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue @@ -30,7 +30,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; const mainStore = useDisciplineMainStore(); - +const isSaveInfo = ref(false) const $q = useQuasar(); const mixin = useCounterMixin(); const store = useInvestigateDisStore(); @@ -404,6 +404,7 @@ onMounted(async () => { label="ส่งไปสรุปผลการพิจารณา" color="public" @click="sentIssueGate" + :disable="isSaveInfo" /> { :data="data" @submit:disciplinary="onSubmitDisciplinary" :fetchData="fetchDetailDisciplinary" + v-model:isSaveInfo="isSaveInfo" /> diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 60c7a072b..ca488991f 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -40,7 +40,7 @@ import type { OptionData } from "@/modules/07_insignia/interface/index/Main"; const modalPersonal = ref(false); const personId = ref(""); - +const isSaveInfo = defineModel('isSaveInfo') const calendarModal = ref(false); const calendarModalclose = () => (calendarModal.value = !calendarModal.value); const modalPopup = ref(false); @@ -211,6 +211,7 @@ function onSubmit() { emit("submit:disciplinary", formData); isSave.value = false; + isSaveInfo.value = false extendStatus.value = false; }); } @@ -232,7 +233,7 @@ async function fetchDatadetail() { if (countNum.value === 1) { isReadonly.value = props.data.status != "NEW" ?? true; isSave.value = false; - + isSaveInfo.value = false formData.respondentType = props.data.respondentType; formData.organizationId = props.data.organizationId; formData.organization = props.data.organization; @@ -524,6 +525,7 @@ async function selectComplainant(val: string) { /** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */ function changeFormData() { isSave.value = true; + isSaveInfo.value = true if (formData.disciplinaryFaultLevel !== "อื่นๆ") { formData.disciplinaryFaultLevelOther = ""; } @@ -537,6 +539,7 @@ function changeFormData() { /** เช็ควันที่สิ้นสุดต้องมากกว่า หรือเท่ากับวันเริ่ม */ function changeFormDataDate() { isSave.value = true; + isSaveInfo.value = true const startDate = new Date(formData.disciplinaryDateStart as Date); const endDate = new Date(formData.disciplinaryDateEnd as Date); diff --git a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue index bb110ade5..618b85608 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue @@ -345,6 +345,9 @@ onMounted(() => { 1 }} +
+ {{ props.row.prefix ? props.row.prefix : "" }}{{ props.row.firstName ? props.row.firstName : "" }} {{ props.row.lastName ? props.row.lastName : "" }} +
{{ props.row.title ? props.row.title : "-" }}