|
|
|
@ -28,7 +28,7 @@ const parseJson = (str) => {
|
|
|
|
|
return {};
|
|
|
|
|
}
|
|
|
|
|
try {
|
|
|
|
|
result = JSON.parse(str);
|
|
|
|
|
result = typeof str === 'string' ? JSON.parse(str) : str;
|
|
|
|
|
return Array.isArray(result) ? result.reduce((acc, cur) => ({ ...acc, ...cur }), {}) : result;
|
|
|
|
|
} catch (e) {
|
|
|
|
|
return {};
|
|
|
|
@ -210,7 +210,10 @@ const ProductQuotationLogPopover = ({ method, triggerProps = {}, onOpenChange, .
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const columns = [...columnsSets(t, false), { title: '时间', dataIndex: 'updatetime', key: 'updatetime' }];
|
|
|
|
|
const columns = [...columnsSets(t, false),
|
|
|
|
|
{ title: t('common:time'), dataIndex: 'updatetime', key: 'updatetime', width: '10rem', },
|
|
|
|
|
{ title: t('common:operator'), dataIndex: 'update_by', key: 'update_by' }
|
|
|
|
|
];
|
|
|
|
|
return (
|
|
|
|
|
<Popover
|
|
|
|
|
placement='bottom'
|
|
|
|
|