From 664871b00d7c8ee310dba13c3190b5b4131b490d Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 22 Jan 2025 10:25:25 +0700 Subject: [PATCH] =?UTF-8?q?fix=20/=20=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/probation/MainProbation.vue | 8 ++++---- .../components/04_salaryLists/TableTypePending.vue | 8 ++++---- .../05_salaryListsEmployee/TableTypePending.vue | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index 4b1c54a1b..8e456569f 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -801,19 +801,19 @@ onMounted(async () => { {{ `${ props.row.orgChild4Name - ? props.row.orgChild4Name + "/" + ? props.row.orgChild4Name + " " : "" }${ props.row.orgChild3Name - ? props.row.orgChild3Name + "/" + ? props.row.orgChild3Name + " " : "" }${ props.row.orgChild2Name - ? props.row.orgChild2Name + "/" + ? props.row.orgChild2Name + " " : "" }${ props.row.orgChild1Name - ? props.row.orgChild1Name + "/" + ? props.row.orgChild1Name + " " : "" }${props.row.orgRootName ? props.row.orgRootName : ""}` }} diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue index ba5262688..3d980aed8 100644 --- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue +++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue @@ -464,10 +464,10 @@ function onClickViewInfo(type: string, id: string) { - {{ - `${props.row.child4 ? props.row.child4 + "/" : ""}${ - props.row.child3 ? props.row.child3 + "/" : "" - }${props.row.child2 ? props.row.child2 + "-" : ""}${ - props.row.child1 ? props.row.child1 + "/" : "" + `${props.row.child4 ? props.row.child4 + " " : ""}${ + props.row.child3 ? props.row.child3 + " " : "" + }${props.row.child2 ? props.row.child2 + " " : ""}${ + props.row.child1 ? props.row.child1 + " " : "" }${props.row.root ? props.row.root : ""}` }} diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue index dcbaf8ccb..aee02168c 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue @@ -481,10 +481,10 @@ watch( - {{ - `${props.row.child4 ? props.row.child4 + "/" : ""}${ - props.row.child3 ? props.row.child3 + "/" : "" - }${props.row.child2 ? props.row.child2 + "-" : ""}${ - props.row.child1 ? props.row.child1 + "/" : "" + `${props.row.child4 ? props.row.child4 + " " : ""}${ + props.row.child3 ? props.row.child3 + " " : "" + }${props.row.child2 ? props.row.child2 + " " : ""}${ + props.row.child1 ? props.row.child1 + " " : "" }${props.row.root ? props.row.root : ""}` }}