From 61d8e40fc2f55cacff68cd226186536baea397ec Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 24 Jan 2024 16:22:39 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?= =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=A7=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/2_InvestigateFacts/Form.vue | 16 +++++++-------- .../3_InvestigateDisciplinary/Form.vue | 20 +++++++++---------- .../store/InvestigateDisStore.ts | 4 ++-- .../Detail/viewTab2/CardDirector.vue | 14 ++++++------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index e920ac519..b9959df10 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -281,14 +281,14 @@ watch(props.data, async () => { id: item.id ? item.id : "-", directorId: item.directorId ? item.directorId : "-", name: `${item.prefix}${item.firstName} ${item.lastName}`, - prefix: item.prefix ? item.prefix : "-", - firstName: item.firstName ? item.firstName : "-", - lastName: item.lastName ? item.lastName : "-", - position: item.position ? item.position : "-", - email: item.email ? item.email : "-", - phone: item.phone ? item.phone : "-", - commandNo: item.commandNo ? item.commandNo : "-", - duty: item.duty ? item.duty : "-", + prefix: item.prefix, + firstName: item.firstName, + lastName: item.lastName, + position: item.position == '' ? "-" : item.position, + email: item.email == '' ? '-' : item.email, + phone: item.phone == '' ? '-' : item.phone, + commandNo: item.commandNo == '' ? '-' : item.commandNo, + duty: item.duty == '' ? '-' : item.duty, check: "props", })); diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 2841a3cfe..36ec4a343 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -374,14 +374,14 @@ async function fetchDatadetail() { idRaw: item.id ? item.id : "-", id: item.directorId ? item.directorId : "-", name: `${item.prefix}${item.firstName} ${item.lastName}`, - prefix: item.prefix ? item.prefix : "-", - firstName: item.firstName ? item.firstName : "-", - lastName: item.lastName ? item.lastName : "-", - position: item.position ? item.position : "-", - email: item.email ? item.email : "-", - phone: item.phone ? item.phone : "-", - duty: item.duty ? item.duty : "-", - commandNo: item.commandNo ? item.commandNo : "-", + prefix: item.prefix, + firstName: item.firstName, + lastName: item.lastName, + position: item.position == '' ? "-" : item.position, + email: item.email == '' ? '-' : item.email, + phone: item.phone == '' ? '-' : item.phone, + commandNo: item.commandNo == '' ? '-' : item.commandNo, + duty: item.duty == '' ? '-' : item.duty, check: "props", })); @@ -475,8 +475,8 @@ async function fetchDListDirector() { firstName: e.firstName, lastName: e.lastName, position: e.position, - email: e.email, - phone: e.phone, + email: e.email == '' ? '-' : e.email, + phone: e.phone == '' ? '-' : e.phone, total: e.total, duty: e.duty, })); diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts index 44a34c694..60e98a22d 100644 --- a/src/modules/11_discipline/store/InvestigateDisStore.ts +++ b/src/modules/11_discipline/store/InvestigateDisStore.ts @@ -295,8 +295,8 @@ export const useInvestigateDisStore = defineStore( firstName: e.firstName, lastName: e.lastName, position: e.position, - email: e.email, - phone: e.phone, + email: e.email == '' ? '-' : e.email, + phone: e.phone == '' ? '-' : e.phone, })); rows2.value = datalistDirector; selected.value = rows2.value; diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue index 03f234f61..84cdd1d48 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue @@ -155,9 +155,9 @@ async function getList() { prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, - phone: item.phone, - email: item.email, - position: item.position, + phone: item.phone == '' ? '-' : item.phone, + email: item.email == '' ? '-' : item.email, + position: item.position == '' ? '-' : item.position, })); }) .catch((e) => { @@ -177,10 +177,10 @@ watch( prefix: item.prefix, firstName: item.firstName, lastName: item.lastName, - position: item.position, - positionName: item.positionName, - email: item.email, - phone: item.phone, + phone: item.phone == '' ? '-' : item.phone, + email: item.email == '' ? '-' : item.email, + position: item.position == '' ? '-' : item.position, + positionName: item.positionName == '-' ? '-' : item.positionName, })); } }