diff --git a/src/modules/02_organizational/views/MainTree.vue b/src/modules/02_organizational/views/MainTree.vue index c81ff4cbe..cb7d1bc2f 100644 --- a/src/modules/02_organizational/views/MainTree.vue +++ b/src/modules/02_organizational/views/MainTree.vue @@ -1674,8 +1674,6 @@ const editPositionStructure = async (node: any) => { qtreeEdit.value.setExpanded(nodeJoin, true); }) .catch((e) => { - console.log(e); - console.log(e.response); messageError($q, e); }) .finally(async () => { @@ -1715,8 +1713,6 @@ const clickHistory = async () => { }) .catch((e) => { rowsHistory.value.splice(0); - console.log(e); - console.log(e.response); manageApiErrorMsg(e); // messageError($q, e); }) diff --git a/src/modules/02_organizational/views/MainTreeEmployee.vue b/src/modules/02_organizational/views/MainTreeEmployee.vue index 6af471f15..ec671f3bf 100644 --- a/src/modules/02_organizational/views/MainTreeEmployee.vue +++ b/src/modules/02_organizational/views/MainTreeEmployee.vue @@ -976,7 +976,6 @@ onMounted(async () => { const onSelected = async (id: string) => { // await fetchPositionNumber(id); organizationId.value = id; - console.log(organizationId.value); }; /** diff --git a/src/modules/02_organizational/views/ManageReport2Add.vue b/src/modules/02_organizational/views/ManageReport2Add.vue index ea5e8c89a..d08c975f1 100644 --- a/src/modules/02_organizational/views/ManageReport2Add.vue +++ b/src/modules/02_organizational/views/ManageReport2Add.vue @@ -763,7 +763,6 @@ const checkSave = async () => { }; const saveData = async () => { - // console.log(myData.value); showLoader(); const body: RequestReport2 = { organizationShortNameId: myData.value.goverment2, diff --git a/src/modules/02_organizational/views/Report.vue b/src/modules/02_organizational/views/Report.vue index ccc0d7cc5..e3e9f2afb 100644 --- a/src/modules/02_organizational/views/Report.vue +++ b/src/modules/02_organizational/views/Report.vue @@ -107,7 +107,8 @@ const $q = useQuasar(); // show dialog const mixin = useCounterMixin(); const router = useRouter(); const route = useRoute(); -const { date2Thai, success, dateToISO, showLoader, hideLoader } = mixin; +const { date2Thai, success, dateToISO, showLoader, hideLoader, messageError } = + mixin; const govermentOP = ref([]); const govermentOPfilter = ref([]); @@ -132,7 +133,7 @@ const fetchOrganizationAgency = async () => { govermentOPfilter.value = option; }) .catch((e) => { - console.log(e); + messageError($q, e); }) .finally(() => { hideLoader(); diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue index 60d5f3982..d7f83f412 100644 --- a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue +++ b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue @@ -308,7 +308,6 @@ const fetchData = async () => { cert_issuedate.value = data.certificateIssueDate; examAttribute.value = data.examAttribute; number.value = data.number; - console.log(data); examOrder.value = data.examOrder; score_expired.value = data.scoreExpire; if (data.scoreResult != null) { diff --git a/src/modules/04_registry/components/Document.vue b/src/modules/04_registry/components/Document.vue index 7eb3972ed..3b6c40856 100644 --- a/src/modules/04_registry/components/Document.vue +++ b/src/modules/04_registry/components/Document.vue @@ -219,7 +219,6 @@ const uploadData = async () => { const formData = new FormData(); formData.append("avatar", newFile); formData.append("moss", "newFile"); - console.log(formData); showLoader(); await http .post(config.API.profilePaperId(profileId.value), formData) diff --git a/src/modules/04_registry/components/Information/Address.vue b/src/modules/04_registry/components/Information/Address.vue index 982e190c7..ae57f5613 100644 --- a/src/modules/04_registry/components/Information/Address.vue +++ b/src/modules/04_registry/components/Information/Address.vue @@ -752,8 +752,6 @@ const saveData = async () => { }; const selectProvince = async (e: string | null, name: string) => { - console.log("5555555555555"); - if (e != null) { if (name == "1") { addressData.value.districtId = ""; diff --git a/src/modules/04_registry/components/Leave.vue b/src/modules/04_registry/components/Leave.vue index 2b1032b9b..1e6a29701 100644 --- a/src/modules/04_registry/components/Leave.vue +++ b/src/modules/04_registry/components/Leave.vue @@ -726,7 +726,6 @@ const fetchData = async () => { .get(config.API.profileLeaveId(profileId.value)) .then((res) => { const data = res.data.result; - // console.log(data); data.map((e: ResponseObject) => { rows.value.push({ id: e.id, @@ -918,7 +917,6 @@ const clickAddLeave = async () => { numUsedLeave.value = 0; await clickTotal(); if (rowsTotal.value.length > 0) { - // console.log(rowsTotal.value); let data: DataOptionLeave[] = []; rowsTotal.value.map((e: ResponseTotalObject) => { data.push({ @@ -1140,7 +1138,6 @@ const selectData = async (props: DataProps) => { numUsedLeave.value = props.row.sumLeave; await clickTotal(); if (rowsTotal.value.length > 0) { - // console.log(rowsTotal.value); let data: DataOptionLeave[] = []; rowsTotal.value.map((e: ResponseTotalObject) => { data.push({ diff --git a/src/modules/04_registry/components/PopupHistory.vue b/src/modules/04_registry/components/PopupHistory.vue index 4f7746cbe..088f0821a 100644 --- a/src/modules/04_registry/components/PopupHistory.vue +++ b/src/modules/04_registry/components/PopupHistory.vue @@ -90,7 +90,6 @@ const fecthPositionOfficer = async () => { .get(config.API.listPositionPathHistory) .then((res) => { let data = res.data.result.items; - console.log(data); positionOps.value = data.map((e: any) => ({ id: e.id, name: e.name })); options.value = positionOps.value; }) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index e0ac9546f..684c719a4 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -838,7 +838,6 @@ const fetchData = async () => { } else { leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${data.leaveReason})`; } - console.log(data.leaveReason); reasonStatus.value = reason.length > 0 ? true : false; }) .catch((e) => { @@ -1301,12 +1300,6 @@ const Retire = async () => { } }; const clickSaveDeceased = async () => { - // console.log( - // filePassaway.value, - // deathCertificateNo.value, - // placeDeathCertificate.value, - // reasonDeath.value - // ); const formData = new FormData(); formData.append("File", filePassaway.value); formData.append("Number", deathCertificateNo.value); @@ -1333,7 +1326,6 @@ const clickSaveDeceased = async () => { router.push("/deceased"); }) .catch((e) => { - console.log(e); messageError($q, e); }) .finally(() => { diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue index 86336b578..32556b17d 100644 --- a/src/modules/04_registry/components/Salary.vue +++ b/src/modules/04_registry/components/Salary.vue @@ -1578,9 +1578,7 @@ const fetchData = async () => { await http .get(config.API.profileSalaryId(profileId.value)) .then((res) => { - let data = res.data.result; - console.log(data); - + let data = res.data.result; rows.value = []; data.map((e: ResponseObject) => { rows.value.push({ diff --git a/src/modules/04_registry/components/SalaryEmployee.vue b/src/modules/04_registry/components/SalaryEmployee.vue index f500e4f60..0a8d3d4db 100644 --- a/src/modules/04_registry/components/SalaryEmployee.vue +++ b/src/modules/04_registry/components/SalaryEmployee.vue @@ -1493,7 +1493,7 @@ const fetchData = async () => { .get(config.API.profileSalaryEmployeeId(profileId.value)) .then((res) => { const data = res.data.result; - console.log(data); + rows.value = []; data.map((e: any) => { rows.value.push({ @@ -1634,7 +1634,6 @@ const checkRowPage = () => { editRow.value = false; next.value = true; previous.value = true; - // console.log(rowIndex.value); if (rowIndex.value + 1 >= rows.value.length) { next.value = false; } @@ -1885,7 +1884,6 @@ const clickClose = async () => { * @param props ค่า props ใน row ที่เลือก */ const selectData = async (props: DataPropsEmployee) => { - // console.log(props.row); modalEdit.value = true; modal.value = true; edit.value = false; @@ -1996,7 +1994,6 @@ const clickHistory = async (row: RequestItemsEmployee) => { .get(config.API.profileSalaryEmployeeHisId(row.id)) .then((res) => { const data = res.data.result; - // console.log("clickHistory", data); rowsHistory.value = []; data.map((e: ResponseObjectEmployee) => { rowsHistory.value.push({ diff --git a/src/modules/04_registry/components/SalaryEmployeeTemp.vue b/src/modules/04_registry/components/SalaryEmployeeTemp.vue index 82f140634..552cede36 100644 --- a/src/modules/04_registry/components/SalaryEmployeeTemp.vue +++ b/src/modules/04_registry/components/SalaryEmployeeTemp.vue @@ -1522,7 +1522,6 @@ const fetchData = async () => { .get(config.API.profileSalaryEmployeeId(profileId.value)) .then((res) => { const data = res.data.result; - // console.log(data); rows.value = []; data.map((e: ResponseObjectEmployee) => { rows.value.push({ @@ -1663,7 +1662,6 @@ const checkRowPage = () => { editRow.value = false; next.value = true; previous.value = true; - // console.log(rowIndex.value); if (rowIndex.value + 1 >= rows.value.length) { next.value = false; } @@ -1914,7 +1912,6 @@ const clickClose = async () => { * @param props ค่า props ใน row ที่เลือก */ const selectData = async (props: DataPropsEmployee) => { - // console.log(props.row); modalEdit.value = true; modal.value = true; edit.value = false; @@ -2025,7 +2022,6 @@ const clickHistory = async (row: RequestItemsEmployee) => { .get(config.API.profileSalaryEmployeeHisId(row.id)) .then((res) => { const data = res.data.result; - // console.log("clickHistory", data); rowsHistory.value = []; data.map((e: ResponseObjectEmployee) => { rowsHistory.value.push({ diff --git a/src/modules/05_placement/components/Other/OtherModal.vue b/src/modules/05_placement/components/Other/OtherModal.vue index b39a8d1a8..782be968a 100644 --- a/src/modules/05_placement/components/Other/OtherModal.vue +++ b/src/modules/05_placement/components/Other/OtherModal.vue @@ -78,7 +78,6 @@ const loadTreeData = async () => { }; function filterByPersonIdNull(obj: any) { - // console.log(obj); if (obj.name === null && obj.isCondition != true) { return true; } @@ -155,8 +154,6 @@ const validateData = async () => { }; const id = ref(""); const saveAppoint = async () => { - console.log("save", dataForm); - myFormPosition.value.validate().then(async (result: boolean) => { if (props.personalId !== undefined) { id.value = props.personalId.toString(); @@ -175,12 +172,11 @@ const saveAppoint = async () => { // mouthSalaryAmount: dataForm.mouthSalaryAmount, // positionSalaryAmount: dataForm.positionSalaryAmount, }; - console.log("save appoint===>", dataAppoint); + showLoader(); await http .put(config.API.otherPosition(id.value), dataAppoint) - .then((res) => { - console.log("respone=>", res); + .then(() => { success($q, "บันทึกสำเร็จ"); }) .catch((e) => { @@ -280,9 +276,8 @@ const positionLevelOptions = ref([ ]); const selectedPosition = async (data: any) => { - console.log("selecteds", data); if (data.name == null && selected.value != data.keyId) { - // console.log("selecteds", data); + editDataStatus.value = true; selected.value = data.keyId; @@ -364,7 +359,7 @@ const selectedPosition = async (data: any) => { dataForm.positionPathSideId = ""; dataForm.positionTypeId = ""; } - console.log("dataForm", dataForm); + }; const checkPosition = (val: string) => { @@ -377,25 +372,25 @@ const expanded = ref([]); watch(props, () => { expanded.value = []; const dataPersonal = props.personal; - console.log(props.personal); + if (dataPersonal) { dataPersonal.map((data: any) => { personal.value = data; }); - console.log("personal", personal.value); + } - // console.log("draft===>", personal.value.draft); + if (personal.value) { - // const findData = dataRespone.value.find(findByPerson); + let findData: any = null; dataRespone.value.map((x: any) => { findData = findByPerson(x); - // console.log(findData); + if (findData != null) { - // console.log("findData===>", findData); + selectedPosition(findData); for (let i = 3; i <= findData.keyId.length; i += 2) { expanded.value.push(findData.keyId.slice(0, i)); @@ -408,7 +403,6 @@ watch(props, () => { }); function findByPerson(element: any): any { - // console.log("searchTree element===>", element) if ( element.positionNumId && element.positionLineId === personal.value.positionLineId && diff --git a/src/modules/05_placement/components/PersonalDetail/Detail.vue b/src/modules/05_placement/components/PersonalDetail/Detail.vue index fe0949eef..60eff23da 100644 --- a/src/modules/05_placement/components/PersonalDetail/Detail.vue +++ b/src/modules/05_placement/components/PersonalDetail/Detail.vue @@ -114,8 +114,7 @@ const fetchData = async () => { .get(config.API.placementPersonalId(examId.value)) .then((res: any) => { const data = res.data.result; - // data.value = data; - // console.log(data); + personalData.value.fullName = data.fullName; personalData.value.id = data.personalId; diff --git a/src/modules/05_placement/components/PersonalDetail/Education.vue b/src/modules/05_placement/components/PersonalDetail/Education.vue index 3da674bad..750d237f8 100644 --- a/src/modules/05_placement/components/PersonalDetail/Education.vue +++ b/src/modules/05_placement/components/PersonalDetail/Education.vue @@ -604,7 +604,6 @@ const clickClose = async () => { * @param _props ค่า props ใน row ที่เลือก */ const selectData = async (_props: DataProps) => { - // console.log(_props.row); modalEdit.value = true; modal.value = true; edit.value = false; diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue index 000bb85d5..f16d0f19a 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue +++ b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue @@ -327,9 +327,7 @@ const clickSave = async () => { /** * บันทึกเพิ่มข้อมูล */ -const saveData = async () => { - // console.log("saveData"); - +const saveData = async () => { showLoader(); await http .post(config.API.placementCertId(route.params.personalId.toString()), { diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue index a8dbff4f5..8b13435cc 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/Information.vue +++ b/src/modules/05_placement/components/PersonalDetail/Information/Information.vue @@ -115,7 +115,6 @@ const fetchPerson = async () => { .then((res) => { const data = res.data.result; let optionbloodGroups: optionData[] = []; - // console.log(data); data.bloodGroups.map((r: any) => { optionbloodGroups.push({ id: r.id ?? "", diff --git a/src/modules/05_placement/components/Relocation/RelocationMain.vue b/src/modules/05_placement/components/Relocation/RelocationMain.vue index 592a83278..851ff650a 100644 --- a/src/modules/05_placement/components/Relocation/RelocationMain.vue +++ b/src/modules/05_placement/components/Relocation/RelocationMain.vue @@ -214,7 +214,6 @@ const openModalOrder = () => { }; const openModalTree = (id: string) => { personalId.value = id; - console.log(personalId.value); personal.value = rows.value.filter((e: any) => e.id === id); modalTree.value = true; }; @@ -224,7 +223,6 @@ const getData = async () => { .get(config.API.relocationMain()) .then((res: any) => { const data = res.data.result; - console.log("data==>", data); rows.value = data.map((item: relocationType) => ({ fullname: `${item.prefix}${item.firstname} ${item.lastname}`, id: item.id, @@ -262,7 +260,6 @@ const getData = async () => { organizationPositionOld: item.organizationPositionOld, createdAt:date2Thai(item.createdAt), })); - console.log(rows.value); }) .catch((e) => { // messageError($q, e); @@ -280,9 +277,7 @@ const saveOrder = async () => { showLoader(); await http .post(config.API.relocationMainReport(), body) - .then((res: any) => { - // const data = res.data.result; - // console.log(data); + .then(() => { success($q, "ส่งไปออกคำสั่งย้าย"); closeModal(); }) @@ -297,9 +292,8 @@ const saveOrder = async () => { const deleteData = async (id: string) => { await http .delete(config.API.relocationMainDelete(id)) - .then((res) => { + .then(() => { success($q, "ลบข้อมูลสำเร็จ"); - console.log(res); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/05_placement/components/Relocation/RelocationModal.vue b/src/modules/05_placement/components/Relocation/RelocationModal.vue index 4651480d3..418cc5ead 100644 --- a/src/modules/05_placement/components/Relocation/RelocationModal.vue +++ b/src/modules/05_placement/components/Relocation/RelocationModal.vue @@ -85,7 +85,6 @@ const loadTreeData = async () => { }; function filterByPersonIdNull(obj: any) { - // console.log(obj); if (obj.name === null && obj.isCondition != true) { return true; } @@ -162,8 +161,6 @@ const validateData = async () => { }; const id = ref(""); const saveAppoint = async () => { - console.log("save", dataForm); - myFormPosition.value.validate().then(async (result: boolean) => { if (props.personalId !== undefined) { id.value = props.personalId.toString(); @@ -182,12 +179,11 @@ const saveAppoint = async () => { // mouthSalaryAmount: dataForm.mouthSalaryAmount, // positionSalaryAmount: dataForm.positionSalaryAmount, }; - console.log("save appoint===>", dataAppoint); + showLoader(); await http .put(config.API.relocationMainPut(id.value), dataAppoint) - .then((res) => { - console.log("respone=>", res); + .then(() => { success($q, "บันทึกสำเร็จ"); }) .catch((e) => { @@ -286,9 +282,8 @@ const positionLevelOptions = ref([ ]); const selectedPosition = async (data: any) => { - console.log("selecteds", data); if (data.name == null && selected.value != data.keyId) { - // console.log("selecteds", data); + editDataStatus.value = true; selected.value = data.keyId; @@ -370,7 +365,6 @@ const selectedPosition = async (data: any) => { dataForm.positionPathSideId = ""; dataForm.positionTypeId = ""; } - console.log("dataForm", dataForm); }; const checkPosition = (val: string) => { @@ -383,25 +377,21 @@ const expanded = ref([]); watch(props, () => { expanded.value = []; const dataPersonal = props.personal; - console.log(props.personal); if (dataPersonal) { dataPersonal.map((data: any) => { personal.value = data; }); - console.log("personal", personal.value); } - // console.log("draft===>", personal.value.draft); + if (personal.value) { // const findData = dataRespone.value.find(findByPerson); let findData: any = null; dataRespone.value.map((x: any) => { findData = findByPerson(x); - // console.log(findData); if (findData != null) { - // console.log("findData===>", findData); selectedPosition(findData); for (let i = 3; i <= findData.keyId.length; i += 2) { expanded.value.push(findData.keyId.slice(0, i)); @@ -414,7 +404,6 @@ watch(props, () => { }); function findByPerson(element: any): any { - // console.log("searchTree element===>", element) if ( element.positionNumId && element.positionLineId === personal.value.positionLineId && diff --git a/src/modules/05_placement/components/Relocation/RelocationbyId.vue b/src/modules/05_placement/components/Relocation/RelocationbyId.vue index 150f1e6a7..adbade974 100644 --- a/src/modules/05_placement/components/Relocation/RelocationbyId.vue +++ b/src/modules/05_placement/components/Relocation/RelocationbyId.vue @@ -207,9 +207,7 @@ const saveData = async () => { showLoader(); await http .put(config.API.relocationMainEdit(dataId), body) - .then((res: any) => { - // const data = res.data.result; - // console.log(data); + .then(() => { success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ"); edit.value = false; }) diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue index 2ad3d424b..cef9b0d0e 100644 --- a/src/modules/05_placement/components/Transfer/transferRegistry.vue +++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue @@ -284,7 +284,6 @@ const getClass = (val: boolean) => { onMounted(async () => { if (keycloak.tokenParsed != null) { roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1"); - console.log("roleAdmin===>", roleAdmin.value); } await getData(); }); diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue index a0116fc5f..6f542e119 100644 --- a/src/modules/05_placement/components/helpgovernment/mainHelp.vue +++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue @@ -223,7 +223,6 @@ const deleteData = async (id: string) => { .delete(config.API.officerMainDelete(id)) .then((res) => { success($q, "ลบข้อมูลสำเร็จ"); - console.log(res); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue index bacc25547..d3b9be9c5 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue @@ -94,8 +94,7 @@ const fecthAssign = async () => { showLoader(); await http .get(config.API.evaluateCreate(assignId.value)) - .then(async (res: any) => { - console.log(res); + .then(async (res) => { if (props.action == "add") { person.value = res.data.data.person; commander.value = res.data.data.commander; diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue index 8c9b901c5..5b9982674 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue @@ -6,7 +6,7 @@ import { useCounterMixin } from "@/stores/mixin"; import { useRouter, useRoute } from "vue-router"; import http from "@/plugins/http"; import config from "@/app.config"; -import criterion from "@/modules/05_placement/components/Other/Criterion.vue" +import criterion from "@/modules/05_placement/components/Other/Criterion.vue"; const router = useRouter(); const routeName = router.currentRoute.value.name; @@ -28,9 +28,7 @@ const { const route = useRoute(); const assignId = ref(route.params.form.toString()); const personalId = ref(route.params.personalId.toString()); -const saveEdit = (id: string) => { - dialogConfirm($q, () => console.log("save")); -}; + const edit = () => { status.value = true; }; @@ -87,7 +85,6 @@ const fecthAssign = async () => { chairman.value = res.data.data.chairman; commander.value = res.data.data.commander; mentors.value = res.data.data.mentors; - console.log(commander.value.name); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue index f7811488f..776d19a49 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue @@ -265,7 +265,7 @@ const savaForm = () => { alerts[index + 11].value = true; } }); - console.log(evaluate_expenct_level.value); + dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ"); } else { @@ -346,13 +346,13 @@ ArrayCountbotton.forEach((variable, index) => { }); watch(lengthevaluate_expenct_level, (newLength) => { if (newLength === evaluate_expenct_level.value.length) { - console.log(true); + alerts[0].value = false; } }); watch(lengthevaluate_ouptut, (newLength) => { if (newLength === evaluate_ouptut.value.length) { - console.log(true); + alerts[1].value = false; } }); diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue index d1ce720d0..e18297be1 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue @@ -235,8 +235,6 @@ const savaForm = () => { alerts[index + 11].value = true; } }); - console.log(evaluate_expenct_level.value); - dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ"); } else { putformData(); @@ -311,13 +309,13 @@ ArrayCountbotton.forEach((variable, index) => { }); watch(lengthevaluate_expenct_level, (newLength) => { if (newLength === evaluate_expenct_level.value.length) { - console.log(true); + alerts[0].value = false; } }); watch(lengthevaluate_ouptut, (newLength) => { if (newLength === evaluate_ouptut.value.length) { - console.log(true); + alerts[1].value = false; } }); diff --git a/src/modules/05_placement/components/probation/SummaryScore.vue b/src/modules/05_placement/components/probation/SummaryScore.vue index ea23c6195..90ae2bd67 100644 --- a/src/modules/05_placement/components/probation/SummaryScore.vue +++ b/src/modules/05_placement/components/probation/SummaryScore.vue @@ -64,9 +64,6 @@ const result_option = ref([ const note = ref(""); const date = ref(new Date()); -const saveEdit = (id: string) => { - dialogConfirm($q, () => console.log("save")); -}; const edit = () => { status.value = true; }; @@ -349,24 +346,24 @@ onMounted(() => {
-
- ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ -
-
- -
-
+
+ ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ +
+
+ +
+
@@ -434,7 +431,9 @@ onMounted(() => { dense :disable="!status" class="full-width datepicker" - :model-value="evaluate_date != null ? date2Thai(evaluate_date) : null" + :model-value=" + evaluate_date != null ? date2Thai(evaluate_date) : null + " :rules="[(val) => !!val || `${'วัน เดือน ปี ที่ประเมิน'}`]" >