From 990b0cd62c2d8a39ae75e7a91b191eb94082d2d1 Mon Sep 17 00:00:00 2001 From: yoution Date: Tue, 2 Mar 2021 17:07:43 +0800 Subject: [PATCH 1/2] fix: issue #4300 --- src/projects/detail/components/BillingAccountField/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/projects/detail/components/BillingAccountField/index.js b/src/projects/detail/components/BillingAccountField/index.js index f906a2927..12789085c 100644 --- a/src/projects/detail/components/BillingAccountField/index.js +++ b/src/projects/detail/components/BillingAccountField/index.js @@ -1,4 +1,5 @@ import React from 'react' +import moment from 'moment' import {HOC as hoc} from 'formsy-react' import Select from '../../../../components/Select/Select' @@ -14,7 +15,7 @@ import styles from './styles.module.scss' * @returns {{ label: string, value: number }} option for Select */ const buildOption = (billingAccountObj) => ({ - label: `${billingAccountObj.name} (${billingAccountObj.tcBillingAccountId})`, + label: `${billingAccountObj.name} (${billingAccountObj.tcBillingAccountId}) - ${moment(billingAccountObj.endDate).format('DD MMM YYYY')}`, value: billingAccountObj.tcBillingAccountId }) From e9361c3eda5bba14d6401c626beaf04309df5398 Mon Sep 17 00:00:00 2001 From: yoution Date: Thu, 4 Mar 2021 08:50:47 +0800 Subject: [PATCH 2/2] fix: issue #4300 --- src/projects/detail/components/BillingAccountField/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/projects/detail/components/BillingAccountField/index.js b/src/projects/detail/components/BillingAccountField/index.js index 12789085c..400b5222c 100644 --- a/src/projects/detail/components/BillingAccountField/index.js +++ b/src/projects/detail/components/BillingAccountField/index.js @@ -15,7 +15,7 @@ import styles from './styles.module.scss' * @returns {{ label: string, value: number }} option for Select */ const buildOption = (billingAccountObj) => ({ - label: `${billingAccountObj.name} (${billingAccountObj.tcBillingAccountId}) - ${moment(billingAccountObj.endDate).format('DD MMM YYYY')}`, + label: `${billingAccountObj.name} (${billingAccountObj.tcBillingAccountId}) ${billingAccountObj.endDate ? ' - '+ moment(billingAccountObj.endDate).format('DD MMM YYYY'): ''}`, value: billingAccountObj.tcBillingAccountId })