diff --git a/src/views/products/Audit.jsx b/src/views/products/Audit.jsx index 3df9410..d93de56 100644 --- a/src/views/products/Audit.jsx +++ b/src/views/products/Audit.jsx @@ -109,21 +109,23 @@ const PriceTable = ({ productType, dataSource, refresh }) => { key: 'action', render: (_, r, ri) => [-1, 0, 3].includes(Number(r.audit_state_id)) ? ( - + <> - {Number(r.audit_state_id) === 0 && ( - <> - - - - )} + + {Number(r.audit_state_id) === 0 && ( +
+ + +
+ )} +
setLogOpenPriceRow(open ? r.id : null)} />
-
+ ) : null, }, // { @@ -183,11 +185,11 @@ const TypesPanels = (props) => { r.concat( c.quotation.map((q, i) => ({ ...q, - weekdays: q.weekdays - .split(',') - .filter(Boolean) - .map((w) => t(`weekdaysShort.${w}`)) - .join(', '), + // weekdays: q.weekdays + // .split(',') + // .filter(Boolean) + // .map((w) => t(`weekdaysShort.${w}`)) + // .join(', '), info: c.info, lgc_details: c.lgc_details.reduce((rlgc, clgc) => ({...rlgc, [clgc.lgc]: clgc}), {}), rowSpan: i === 0 ? c.quotation.length : 0, diff --git a/src/views/products/Detail/ProductQuotationLogPopover.jsx b/src/views/products/Detail/ProductQuotationLogPopover.jsx index d5f58cc..9991f93 100644 --- a/src/views/products/Detail/ProductQuotationLogPopover.jsx +++ b/src/views/products/Detail/ProductQuotationLogPopover.jsx @@ -141,10 +141,15 @@ export const columnsSets = (t, colorize = true) => [ : ''; const preValue = ifCompare && ifData ?
{_weekdays}
: null; const editCls = ifCompare && ifData ? 'text-danger' : ''; + const weekdaysTxt = weekdays + .split(',') + .filter(Boolean) + .map((w) => t(`common:weekdaysShort.${w}`)) + .join(', '); return (
{preValue} - {text || t('Unlimited')} + {weekdaysTxt || t('Unlimited')}
); },