From be070ee882e2f67ef7e0d4ba46befce793005898 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Mon, 21 Apr 2025 10:00:38 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9F=E0=B8=B4=E0=B8=A5=20=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/probation/MainProbation.vue | 10 +++++----- .../05_placement/interface/response/Probation.ts | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index 880fa24ae..3e1ef70dc 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -323,7 +323,7 @@ function addPersonalData(data: ResProfileProbation) { lastName: data.lastName, position: data.position, idcard: data.idcard, - order_number: data.refCommandNo ? data.refCommandNo : "", + order_number: data.commandNo ? data.commandNo : "", posLevelName: data.posLevelName, posTypeName: data.posTypeName, posNo: data.posNo, @@ -630,7 +630,7 @@ onMounted(() => { }} -
+
{{ col.value ? col.value : "-" }}
@@ -789,9 +789,9 @@ onMounted(() => {
{{ - props.row.refCommandNo - ? props.row.refCommandNo != "xx/2566" - ? props.row.refCommandNo + props.row.commandNo + ? props.row.commandNo != "xx/2566" + ? props.row.commandNo : "-" : "-" }} diff --git a/src/modules/05_placement/interface/response/Probation.ts b/src/modules/05_placement/interface/response/Probation.ts index 2fe4c39c3..6612c8314 100644 --- a/src/modules/05_placement/interface/response/Probation.ts +++ b/src/modules/05_placement/interface/response/Probation.ts @@ -41,6 +41,7 @@ interface ResProfileProbation { prefix: string; rank: string; refCommandNo: string; + commandNo?: string; root: string; rootDna: string; }