分开展示每次变更确认内容

release
Jimmy Liow 2 years ago
parent fb01252c11
commit bfdc60f3a9

@ -24,7 +24,7 @@ function Detail() {
}, },
{ {
title: 'Confirmation Details', title: 'Confirmation Details',
dataIndex: 'PCI_ConfirmText', render: detailTextRender
}, },
{ {
title: 'Attachments', title: 'Attachments',
@ -39,6 +39,15 @@ function Detail() {
render: confirmRender render: confirmRender
}, },
]; ];
function detailTextRender(text, confirm) {
const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, "\n\n");
return (
<div style={{whiteSpace: 'pre-line'}}>
{formattedText}
</div>
);
}
function attachmentRender(text, confirm) { function attachmentRender(text, confirm) {
return ( return (
@ -82,13 +91,14 @@ function Detail() {
const showConfirmModal = (confirm) => { const showConfirmModal = (confirm) => {
setIsModalOpen(true); setIsModalOpen(true);
setConfirmText(confirm.PCI_ConfirmText); const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, "\n\n");
setConfirmText(formattedText);
reservationStore.editConfirmation(confirm); reservationStore.editConfirmation(confirm);
}; };
const handleOk = () => { const handleOk = () => {
setConfirmLoading(true); setConfirmLoading(true);
reservationStore.submitConfirmation(confirmText + ';' +newConfirmText) reservationStore.submitConfirmation(confirmText + '\n——————————————————————\n' +newConfirmText)
.finally(() => { .finally(() => {
setNewConfirmText(''); setNewConfirmText('');
setIsModalOpen(false); setIsModalOpen(false);
@ -124,8 +134,13 @@ function Detail() {
> >
<Title level={4}>Confirm</Title> <Title level={4}>Confirm</Title>
<Paragraph> <Paragraph>
<blockquote>{confirmText}</blockquote> <blockquote>
<div style={{whiteSpace: 'pre-line'}}>
{confirmText}
</div>
</blockquote>
</Paragraph> </Paragraph>
<TextArea <TextArea
value={newConfirmText} value={newConfirmText}
onChange={(e) => setNewConfirmText(e.target.value)} onChange={(e) => setNewConfirmText(e.target.value)}
@ -168,4 +183,4 @@ function Detail() {
); );
} }
export default observer(Detail); export default observer(Detail);

Loading…
Cancel
Save