diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue index 6f92cced5..c653756f1 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue @@ -365,12 +365,8 @@ function onSubmit() { dialogConfirm( $q, async () => { - myForm.value?.validate().then(async (result: boolean) => { - if (result) { - addEditData(isEdit.value); - modal.value = false; - } - }); + addEditData(isEdit.value); + modal.value = false; }, "ยืนยันการบันทึกข้อมูล", "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?" @@ -587,7 +583,7 @@ onMounted(async () => { - + { - const hasError = []; - for (const key in objectRef) { - if (Object.prototype.hasOwnProperty.call(objectRef, key)) { - const property = objectRef[key]; - if (property.value && typeof property.value.validate === "function") { - const isValid = property.value.validate(); - hasError.push(isValid); - } - } - } - if (hasError.every((result) => result === true)) { - if (edit.value) { - editData(); - } else { - saveData(); - } + if (edit.value) { + editData(); + } else { + saveData(); } }, "ยืนยันการบันทึกข้อมูล", @@ -228,12 +216,6 @@ async function getData() { // }); // } -const infoRows = [ - { title: "รายละเอียด", value: "" }, - { title: "ล้างมลทิน", value: "" }, - { title: "เลขที่คำสั่ง", value: "" }, - { title: "เอกสารอ้างอิง (ลงวันที่)", value: "" }, -]; onMounted(() => { getData(); }); @@ -467,7 +449,7 @@ onMounted(() => { - + @@ -541,7 +523,7 @@ onMounted(() => { บันทึกข้อมูล - + diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue index 0b2142c41..2ef2777a6 100644 --- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue +++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue @@ -3,9 +3,7 @@ import { ref, watch, reactive } from "vue"; import DialogHeader from "@/components/DialogHeader.vue"; import { useCounterMixin } from "@/stores/mixin"; import { useQuasar, type QTableProps } from "quasar"; -import type { - RowList, -} from "@/modules/04_registryNew/interface/index/other"; +import type { RowList } from "@/modules/04_registryNew/interface/index/other"; import http from "@/plugins/http"; import config from "@/app.config"; @@ -93,7 +91,8 @@ const columns = ref([ ]); function getHistory() { showLoader(); - http.get(config.API.profileNewOtherHisById(id.value)) + http + .get(config.API.profileNewOtherHisById(id.value)) .then((res) => { let data = res.data.result; rows.value = []; @@ -201,23 +200,7 @@ watch(modal, (status) => { - - {{ - (formFilter.page - 1) * formFilter.pageSize + - props.rowIndex + - 1 - }} - - - {{ col.value == null ? null : date2Thai(col.value) }} - - + {{ col.value ? col.value : "-" }}