From 372cacbf8a01ef4ea214a7043c4121d0e32f0589 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 10 Jan 2025 14:14:49 +0700 Subject: [PATCH 1/8] isDirector --- .../02_organization/components/DialogMovePos.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/modules/02_organization/components/DialogMovePos.vue b/src/modules/02_organization/components/DialogMovePos.vue index 658d0a541..bf625580c 100644 --- a/src/modules/02_organization/components/DialogMovePos.vue +++ b/src/modules/02_organization/components/DialogMovePos.vue @@ -261,6 +261,16 @@ watch( 1 }} +
+ {{ col.value }} + + ผู้อำนวยการ/หัวหน้า + +
{{ col.value }} From de5c82b7efae7a7bbf25c718ad092aa799dc179c Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 10 Jan 2025 18:00:40 +0700 Subject: [PATCH 2/8] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20=20API=20Committee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/05_placement/api.probation.ts | 1 + .../components/probation/ProbationDetail.vue | 29 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts index e3c9989d8..7deae216f 100644 --- a/src/api/05_placement/api.probation.ts +++ b/src/api/05_placement/api.probation.ts @@ -33,6 +33,7 @@ export default { probationsGetAssign: (assignId: string) => `${finish}?assign_id=${assignId}`, changestatusProbations: (personalId: string) => `${evaluate}/report/change-status?personal_id=${personalId}`, + probationCommittee : `${appointMain}/committee`, // probationGetAssignList: (personalId: string) => // `${finish}/assign-list?personal_id=${personalId}`, diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue index 2dc9e8ac5..213e54a0e 100644 --- a/src/modules/05_placement/components/probation/ProbationDetail.vue +++ b/src/modules/05_placement/components/probation/ProbationDetail.vue @@ -243,12 +243,6 @@ function clickSelect(id: string) { } } -/** รีเซ็ตค่าในช่อง input */ -function resetFilter() { - filterKeyword.value = ""; - filterRef.value.focus(); -} - function paginationLabel(start: string, end: string, total: string) { if (paging.value == true) return " " + start + "-" + end + " ใน " + total; else return start + "-" + end + " ใน " + total; @@ -284,6 +278,19 @@ async function fetchProfilePhoto() { }); } +const isCommittee = ref(false); //สถานะการแสดงเพิ่มแบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ +function fetchCheckCommittee() { + http + .get(config.API.probationCommittee + `/${personalId.value}`) + .then((res) => { + const data = res.data.result; + isCommittee.value = data; + }) + .catch((err) => { + messageError($q, err); + }); +} + function onSearch() { rows.value = onSearchDataTable( filterKeyword.value, @@ -294,7 +301,12 @@ function onSearch() { /** get ค่า เมื่อโหลดหน้า */ onMounted(async () => { - await Promise.all([getpersonalList(), getAssignList(), fetchProfilePhoto()]); + await Promise.all([ + getpersonalList(), + getAssignList(), + fetchProfilePhoto(), + fetchCheckCommittee(), + ]); }); @@ -389,8 +401,7 @@ onMounted(async () => {
Date: Sat, 11 Jan 2025 11:24:07 +0700 Subject: [PATCH 3/8] fixing landing dev only --- src/views/MainLayout.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 9712517f2..bfa7c088b 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -84,13 +84,7 @@ const modalLoginLinkage = ref(false); //เข้าสู่ระบ // landing page redirect const landingPageUrl = ref(getLandingUrl()); function getLandingUrl() { - if (window.location.hostname === "bmasso.bma.go.th") { - return `${configParam.landingPageUrl}/landing?mode=dev`; - } else if (window.location.hostname === "bma-ehr.frappet.com") { - return `${configParam.landingPageUrl}/landing?mode=prod`; - } else { - return `${configParam.landingPageUrl}/landing?mode=dev`; - } + return `${configParam.landingPageUrl}/landing`; } async function fetchmsgNoread() { From a7b19a86513792fe4be6d5f34eac9bb661082112 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Sat, 11 Jan 2025 12:55:58 +0700 Subject: [PATCH 4/8] fixing bug --- .../components/probation/FormAssign.vue | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index 8b371d213..c21c462f1 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -46,7 +46,7 @@ const fullname = ref(); const date_start = ref(); const date_finish = ref(); const other_desc = ref(""); -const other4_desc = ref(); +const other4_desc = ref(""); const monthOp: MonthOption[] = []; const other5_no1_desc = ref(""); const group = ref(null); @@ -572,12 +572,12 @@ function putDataEdit(id: string) { : dateToISO(new Date(date_finish.value)), assign_knowledges: know_ledge, assign_jobs: assign_job.filter((item) => item !== null), - other_desc: other_desc.value, + other_desc: other_desc.value ?? "", assign_skill: allSkills, assign_competency: assign_competencyMain.value, assign_competency_group: assign_competencyGroupMain.value, - other4_desc: other4_desc.value, - other5_no1_desc: other5_no1_desc.value, + other4_desc: other4_desc.value ?? "", + other5_no1_desc: other5_no1_desc.value ?? "", assign_outputs: Productivity_assign.filter((item) => item !== null), assign_director: assign_director, experimenter_dated: @@ -708,12 +708,12 @@ function putData(id: string) { assign_knowledges: know_ledge, assign_jobs: assign_job.filter((item) => item !== null), - other_desc: other_desc.value, + other_desc: other_desc.value ?? "", assign_skill: allSkills, assign_competency: assign_competencyMain.value, assign_competency_group: assign_competencyGroupMain.value, - other4_desc: other4_desc.value, - other5_no1_desc: other5_no1_desc.value, + other4_desc: other4_desc.value ?? "", + other5_no1_desc: other5_no1_desc.value ?? "", assign_outputs: Productivity_assign.filter((item) => item !== null), assign_director: assign_director, @@ -2249,7 +2249,8 @@ onMounted(async () => {
  • - อุทิศตน และเสียสละเวลาในการปฏิบัติงานอย่างเต็มกำลังความสามารถ + อุทิศตน + และเสียสละเวลาในการปฏิบัติงานอย่างเต็มกำลังความสามารถ
  • มีจิตสำนึกที่ดี ปฏิบัติงานด้วยความซื่อสัตย์ สุจริต @@ -2271,8 +2272,8 @@ onMounted(async () => { แต่งกายในการปฏิบัติงานได้อย่างเหมาะสมกับการเป็นข้าราชการ
  • - ไม่กระทำการใดๆ - อันเป็นการเสื่อมเกียรติ และศักดิ์ศรีของความเป็นข้าราชการ + ไม่กระทำการใดๆ อันเป็นการเสื่อมเกียรติ + และศักดิ์ศรีของความเป็นข้าราชการ
  • ไม่กระทำการใดๆ @@ -2398,8 +2399,9 @@ onMounted(async () => {
    • - ผู้ทดลองปฏิบัติหน้าที่ราชการต้องเข้าร่วมในการปฐมนิเทศ และอบรมหลักสูตรต่าง - ๆ ภายในระยะเวลาทดลองปฏิบัติหน้าที่ราชการ ดังนี้ + ผู้ทดลองปฏิบัติหน้าที่ราชการต้องเข้าร่วมในการปฐมนิเทศ + และอบรมหลักสูตรต่าง ๆ ภายในระยะเวลาทดลองปฏิบัติหน้าที่ราชการ + ดังนี้
    @@ -2479,7 +2481,8 @@ onMounted(async () => {
  • - บันทึกผลการทดลองปฏิบัติหน้าที่ราชการของผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ และผู้บังคับบัญา + บันทึกผลการทดลองปฏิบัติหน้าที่ราชการของผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ + และผู้บังคับบัญา
  • แบบประเมินผลการทดลองปฏิบัติหน้าที่ราชการของผู้บังคับบัญชา From 794f03069b7ac18e52a499d9ab98d8a564dbb5d4 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Sat, 11 Jan 2025 14:45:38 +0700 Subject: [PATCH 5/8] fixing bug --- .../components/probation/FormEvaluation/FormEvaluate.vue | 2 +- .../components/probation/FormEvaluation/FormEvaluateScore.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue index 9a75f92cd..c35fd75c8 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue @@ -164,6 +164,7 @@ async function fetchEvaluate() { training_seminar.value = data.training_seminar.toString(); other_training.value = data.other_training.toString(); dateAutherise.value = data.commander_dated; + evaluate_no.value = data.no; if ( data.achievement_other_desc !== "" && @@ -285,7 +286,6 @@ watch(props, async () => { onMounted(async () => { if (props.tab && props.action == "edit") { - evaluate_no.value = Number(props.tab.charAt(4)); dataArr.value = await props.data; fecthAssign(); fetchEvaluate(); diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue index 30d1bd022..34a4c5c2c 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue @@ -277,6 +277,8 @@ async function fetchEvaluate() { develop_result.value = data.develop_result; evaluate_result.value = data.evaluate_result; dateAutherise.value = data.chairman_dated; + evaluate_no.value = data.no; + director1_dated.value = data.director1_dated; director2_dated.value = data.director2_dated; if ( @@ -408,7 +410,7 @@ watch(props, async () => { onMounted(async () => { if (props.tab && props.action == "edit") { - evaluate_no.value = Number(props.tab.charAt(4)); + // evaluate_no.value = Number(props.tab.charAt(4)); dataArr.value = await props.data; await fetchEvaluate(); await fecthAssign(); From bdb578e71f749a62c9f533997d3b557b73b60013 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 09:59:26 +0700 Subject: [PATCH 6/8] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20colu?= =?UTF-8?q?mns=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Director/Form.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue index a3df356ab..9ca77e7da 100644 --- a/src/modules/12_evaluatePersonal/components/Director/Form.vue +++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue @@ -79,6 +79,7 @@ const rows = ref([]); const visibleColumnsRespondent = ref([ "info", "no", + "citizenId", "name", "position", "organization", @@ -102,6 +103,15 @@ const columnsRespondent = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "citizenId", + align: "left", + label: "เลขประจำตัวประชาชน", + sortable: false, + field: "citizenId", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "name", align: "left", @@ -162,7 +172,7 @@ function searchInput() { showLoader(); const body = { fieldName: type.value, - keyword: search.value, + keyword: search.value ? search.value.trim() : "", }; http .post( @@ -190,6 +200,7 @@ function searchInput() { organization: e.organization ?? "-", phone: e.phone ?? "-", email: e.email ?? "-", + citizenId: e.citizenId ?? "-", })); rows.value = list; @@ -296,7 +307,6 @@ onMounted(async () => { hide-bottom-space dense label="คำค้น" - :rules="[(val:string) => !!val || `กรุณากรอกคำค้น`]" > From a33b3ae340ab65577d0d2c6d1444aec174d9525a Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 13:07:15 +0700 Subject: [PATCH 7/8] fix --- .../detail/Salary/01_PositionSalary.vue | 15 ++++++-- .../components/DialogPreviewCommand.vue | 38 ++----------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index f0472a3cf..76cea8597 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -305,9 +305,15 @@ function onClickOpenDialog(statusEdit: boolean = false, data: any = []) { formDataSalary.positionPathSide = statusEdit ? data.positionPathSide : ""; formDataSalary.positionExecutive = statusEdit ? data.positionExecutive : ""; formDataSalary.salaryCompensation = statusEdit ? data.mouthSalaryAmount : ""; - formDataSalary.salary = statusEdit ? data.amount.toLocaleString() : ""; + formDataSalary.salary = statusEdit + ? data.amount + ? data.amount.toLocaleString() + : "" + : ""; formDataSalary.salaryPos = statusEdit - ? data.positionSalaryAmount.toLocaleString() + ? data.positionSalaryAmount + ? data.positionSalaryAmount.toLocaleString() + : "" : ""; formDataSalary.refCommandNo = statusEdit ? data.refCommandNo : ""; formDataSalary.templateDoc = ""; @@ -712,9 +718,10 @@ onMounted(() => { { v-model="formDataSalary.refCommandNo" hide-bottom-space :label="`${'เลขที่คำสั่ง'}`" - mask="#####################" > +
    • diff --git a/src/modules/18_command/components/DialogPreviewCommand.vue b/src/modules/18_command/components/DialogPreviewCommand.vue index 68aa9a5d9..fba7461de 100644 --- a/src/modules/18_command/components/DialogPreviewCommand.vue +++ b/src/modules/18_command/components/DialogPreviewCommand.vue @@ -125,18 +125,6 @@ async function fetchDataCommand(type: string) { .finally(() => { hideLoader(); }); - // await http - // .get(config.API.commandRegisterByType(commandId.value, type)) - // .then(async (res) => { - // const dataMain = await res.data.result; - // if (type === "cover") { - // dataCover.value = dataMain; - // issue.value = await res.data.result.data.commandTitle; - // await fetchPDF(dataCover.value); - // } else { - // dataAttachment.value = dataMain; - // } - // }); } /** ฟังชั่นกำหนดค่าของ PDF*/ @@ -165,29 +153,6 @@ async function fetchPDF(data: any, type: string = "docx?folder=command") { messageError($q, err); isLoadView.value = true; }); - - // await axios - // .post(config.API.reportTemplate + `/${type}`, data, { - // headers: { - // accept: "application/pdf", - // "content-Type": "application/json", - // }, - // responseType: "blob", - // }) - // .then(async (res) => { - // const blob = new Blob([res.data]); - // const objectUrl = URL.createObjectURL(blob); - // const pdfData = usePDF(`${objectUrl}`); - // setTimeout(() => { - // pdfSrc.value = pdfData.pdf.value; - // numOfPages.value = pdfData.pages.value; - // isLoadView.value = true; - // }, 1500); - // }) - // .catch(async (e) => { - // messageError($q, e); - // isLoadView.value = true; - // }); } watch( @@ -205,6 +170,9 @@ watch( .finally(() => { hideLoader(); }); + } else { + tab.value = "main"; + pdfSrc.value = undefined; } } ); From 02fcc956e782f4d22195bec926c10a0b16e5d813 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 13:50:28 +0700 Subject: [PATCH 8/8] fix --- .../components/detail/Salary/01_PositionSalary.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 76cea8597..5650fe714 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -718,8 +718,8 @@ onMounted(() => {