From 101158d6a11e4b6ad37ee041891094bda6ed6340 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Mon, 4 Sep 2023 11:34:21 +0700 Subject: [PATCH 1/2] =?UTF-8?q?step2=20=E0=B8=96=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=81?= =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=81=20=E0=B9=80=E0=B8=87=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?= =?UTF-8?q?=E0=B8=81=E0=B8=AA=E0=B9=88=E0=B8=87=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/1_Proposals/listProposals.vue | 9 +++++--- .../07_insignia/interface/request/Main.ts | 1 + .../10_order/components/step/step02.vue | 21 +++++++++++-------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/modules/07_insignia/components/1_Proposals/listProposals.vue b/src/modules/07_insignia/components/1_Proposals/listProposals.vue index 23ec979d9..519e1ca46 100644 --- a/src/modules/07_insignia/components/1_Proposals/listProposals.vue +++ b/src/modules/07_insignia/components/1_Proposals/listProposals.vue @@ -80,7 +80,7 @@ const columns = ref([ align: "center", label: "สถานะราชกิจจานุเบกษา", sortable: true, - field: "institution", + field: "statusRoyal", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -110,8 +110,11 @@ const fetchData = async () => { period_end: e.period_end == null ? null : date2Thai(new Date(e.period_end)), period_isActive: e.period_isActive, period_doc: e.period_doc, + period_status: e.period_status.result }) + ); + console.log(rows.value) }) .catch((e) => { messageError($q, e); @@ -122,7 +125,7 @@ const fetchData = async () => { }; const clickEdit = (col: any) => { - router.push(`/insignia/round-add/${col.id}`); + router.push(`/insignia/round-add/${col.period_id}`); }; const clickDelete = (id: string) => { @@ -301,7 +304,7 @@ const paginationLabel = (start: string, end: string, total: string) => { {{ props.row.period_end }} - + ({ - salaryAmount: null, - positionSalaryAmount: null, - monthSalaryAmount: null, + salaryAmount: 0, + positionSalaryAmount: 0, + monthSalaryAmount: 0, }); const myForm = ref(null); const myFormAdd = ref(null); @@ -293,14 +293,17 @@ const fetchSalary = async (personalId: string) => { }; const putSalary = async (salary: any) => { - // modalData.value = { - // salaryAmount: Number(salary.salaryAmount), - // positionSalaryAmount: Number(salary.positionSalaryAmount), - // monthSalaryAmount: Number(salary.monthSalaryAmount), - // }; - dialogConfirm($q, async () => { showLoader(); + if (modalData.value.salaryAmount === null) { + modalData.value.salaryAmount = 0; + } + if (modalData.value.positionSalaryAmount === null) { + modalData.value.positionSalaryAmount = 0; + } + if (modalData.value.monthSalaryAmount === null) { + modalData.value.monthSalaryAmount = 0; + } await http .put(config.API.salaryOrder(personalId.value), modalData.value) .then((res: any) => { From 467fa1aa2eb7f0285137ed7556d3be768e6a09c3 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Mon, 4 Sep 2023 11:38:43 +0700 Subject: [PATCH 2/2] =?UTF-8?q?report/probation/16,17=20=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20/no?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/reports/api.report.ts | 4 ++-- .../components/probation/FormEvaluation/Template2.vue | 2 +- .../components/probation/FormEvaluation/Template2Format2.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts index 940e15765..b7c32d839 100644 --- a/src/api/reports/api.report.ts +++ b/src/api/reports/api.report.ts @@ -29,8 +29,8 @@ export default { reportAssign:(type:string, id:string) => `${reportProbation}/13/${type}/${id}`, reportEvaluateRecord1:(type:string, id:string) => `${reportProbation}/14/${type}/${id}`, reportEvaluateRecord2:(type:string, id:string) => `${reportProbation}/15/${type}/${id}`, - reportEvaluate:(type:string, id:string) => `${reportProbation}/16/${type}/${id}`, - reportEvaluateChairman:(type:string, id:string) => `${reportProbation}/17/${type}/${id}`, + reportEvaluate:(type:string, id:string,no:number) => `${reportProbation}/16/${type}/${id}/${no}`, + reportEvaluateChairman:(type:string, id:string,no:number) => `${reportProbation}/17/${type}/${id}/${no}`, reportEvaluateResult:(type:string, id:string) => `${reportProbation}/18/${type}/${id}`, reportSurvey:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`, diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue index 23ff1d94b..e068a83b8 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue @@ -76,7 +76,7 @@ const FileDownload = async (type: string) => { let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value); showLoader(); await http - .get(config.API.reportEvaluate(type, numTab.id), { + .get(config.API.reportEvaluate(type, numTab.id,numTab.no), { responseType: "blob", }) .then(async (res) => { diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue index 2ebee1e93..c7c4609a1 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue @@ -72,7 +72,7 @@ const FileDownload = async (type: string) => { let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value); showLoader(); await http - .get(config.API.reportEvaluateChairman(type, numTab.id), { + .get(config.API.reportEvaluateChairman(type, numTab.id,numTab.no), { responseType: "blob", }) .then(async (res) => {