diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 5fc92b0..4e8321a 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -36,6 +36,8 @@ "Table": { "Total": "Total {{total}} items" }, + "operator": "Operator", + "time": "Time", "Login": "Login", "Username": "Username", "Realname": "Realname", @@ -105,4 +107,4 @@ "Finance_Dept_arrproved": "Finance Dept arrproved", "Paid": "Paid" } -} \ No newline at end of file +} diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json index d749ecd..0a57df9 100644 --- a/public/locales/zh/common.json +++ b/public/locales/zh/common.json @@ -36,6 +36,8 @@ "Table": { "Total": "共 {{total}} 条" }, + "operator": "操作", + "time": "时间", "Login": "登录", "Username": "账号", "Realname": "姓名", @@ -105,4 +107,4 @@ "Finance_Dept_arrproved": "财务已审核", "Paid": "已打款" } -} \ No newline at end of file +} diff --git a/src/views/products/Detail/ProductQuotationLogPopover.jsx b/src/views/products/Detail/ProductQuotationLogPopover.jsx index c1ed6be..e1f59fb 100644 --- a/src/views/products/Detail/ProductQuotationLogPopover.jsx +++ b/src/views/products/Detail/ProductQuotationLogPopover.jsx @@ -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 (