perf: 产品审核: 价格日志

main
Lei OT 2 months ago
parent 9fc8057b03
commit f94e46bcc1

@ -36,6 +36,8 @@
"Table": { "Table": {
"Total": "Total {{total}} items" "Total": "Total {{total}} items"
}, },
"operator": "Operator",
"time": "Time",
"Login": "Login", "Login": "Login",
"Username": "Username", "Username": "Username",
"Realname": "Realname", "Realname": "Realname",
@ -105,4 +107,4 @@
"Finance_Dept_arrproved": "Finance Dept arrproved", "Finance_Dept_arrproved": "Finance Dept arrproved",
"Paid": "Paid" "Paid": "Paid"
} }
} }

@ -36,6 +36,8 @@
"Table": { "Table": {
"Total": "共 {{total}} 条" "Total": "共 {{total}} 条"
}, },
"operator": "操作",
"time": "时间",
"Login": "登录", "Login": "登录",
"Username": "账号", "Username": "账号",
"Realname": "姓名", "Realname": "姓名",
@ -105,4 +107,4 @@
"Finance_Dept_arrproved": "财务已审核", "Finance_Dept_arrproved": "财务已审核",
"Paid": "已打款" "Paid": "已打款"
} }
} }

@ -28,7 +28,7 @@ const parseJson = (str) => {
return {}; return {};
} }
try { try {
result = JSON.parse(str); result = typeof str === 'string' ? JSON.parse(str) : str;
return Array.isArray(result) ? result.reduce((acc, cur) => ({ ...acc, ...cur }), {}) : result; return Array.isArray(result) ? result.reduce((acc, cur) => ({ ...acc, ...cur }), {}) : result;
} catch (e) { } catch (e) {
return {}; 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 ( return (
<Popover <Popover
placement='bottom' placement='bottom'

Loading…
Cancel
Save