Commit 8720c334 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

fix: 修复交易规则翻译BUG

parent fa6b1050
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
'processRuleSetting.caozuo':'Operation', 'processRuleSetting.caozuo':'Operation',
'processRuleSetting.shanchu':'Delete', 'processRuleSetting.shanchu':'Delete',
'processRuleSetting.xiaoshi':'Hour', 'processRuleSetting.xiaoshi':'Hour',
'processRuleSetting.zhifupici:':'Payment batch:', 'processRuleSetting.zhifupici':'Payment batch:',
'processRuleSetting.xuanzeshangpin':'Select product', 'processRuleSetting.xuanzeshangpin':'Select product',
'processRuleSetting.chaxun':'Query', 'processRuleSetting.chaxun':'Query',
'processRuleSetting.qingxuanzepinpai':'Please select a brand', 'processRuleSetting.qingxuanzepinpai':'Please select a brand',
......
...@@ -23,7 +23,7 @@ const Unevaluated: React.FC = () => { ...@@ -23,7 +23,7 @@ const Unevaluated: React.FC = () => {
const defaultColumns: ColumnType<any>[] = [ const defaultColumns: ColumnType<any>[] = [
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.dingdanhao'}), title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanhao' }),
dataIndex: 'orderNo', dataIndex: 'orderNo',
align: 'center', align: 'center',
render: (text, record) => ( render: (text, record) => (
...@@ -35,49 +35,49 @@ const Unevaluated: React.FC = () => { ...@@ -35,49 +35,49 @@ const Unevaluated: React.FC = () => {
), ),
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.dingdanzhaiyao'}), title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanzhaiyao' }),
dataIndex: 'digest', dataIndex: 'digest',
align: 'center', align: 'center',
ellipsis: true, ellipsis: true,
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.gongyinghuiyuan'}), title: intl.formatMessage({ id: 'purchaserEvaluation.gongyinghuiyuan' }),
dataIndex: 'memberName', dataIndex: 'memberName',
align: 'center', align: 'center',
render: (text, record) => <>{text}</>, render: (text, record) => <>{text}</>,
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.xiadanshijian'}), title: intl.formatMessage({ id: 'purchaserEvaluation.xiadanshijian' }),
dataIndex: 'createTime', dataIndex: 'createTime',
align: 'center', align: 'center',
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.dingdanzonge'}), title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanzonge' }),
dataIndex: 'totalAmount', dataIndex: 'totalAmount',
align: 'center', align: 'center',
render: (text) => `¥${text}`, render: (text) => `${intl.formatMessage({ id: 'common.money' })}${text}`,
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.dingdanleixing'}), title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanleixing' }),
dataIndex: 'orderTypeName', dataIndex: 'orderTypeName',
align: 'center', align: 'center',
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.waibuzhuangtai'}), title: intl.formatMessage({ id: 'purchaserEvaluation.waibuzhuangtai' }),
dataIndex: 'outerStatusName', dataIndex: 'outerStatusName',
align: 'center', align: 'center',
render: (text, record) => ( render: (text, record) => (
<StatusTag type="success" title={intl.formatMessage({id: 'purchaserEvaluation.yiwancheng'})} /> <StatusTag type="success" title={intl.formatMessage({ id: 'purchaserEvaluation.yiwancheng' })} />
), ),
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.neibuzhuangtai'}), title: intl.formatMessage({ id: 'purchaserEvaluation.neibuzhuangtai' }),
dataIndex: 'innerStatusName', dataIndex: 'innerStatusName',
align: 'center', align: 'center',
render: (text, record) => <Badge color="#41CC9E" text={intl.formatMessage({id: 'purchaserEvaluation.yiwancheng'})} />, render: (text, record) => <Badge color="#41CC9E" text={intl.formatMessage({ id: 'purchaserEvaluation.yiwancheng' })} />,
}, },
{ {
title: intl.formatMessage({id: 'purchaserEvaluation.caozuo'}), title: intl.formatMessage({ id: 'purchaserEvaluation.caozuo' }),
dataIndex: 'option', dataIndex: 'option',
align: 'center', align: 'center',
render: (text, record) => ( render: (text, record) => (
...@@ -87,7 +87,7 @@ const Unevaluated: React.FC = () => { ...@@ -87,7 +87,7 @@ const Unevaluated: React.FC = () => {
<Button <Button
type="link" type="link"
> >
{intl.formatMessage({id: 'purchaserEvaluation.pingjia'})} {intl.formatMessage({ id: 'purchaserEvaluation.pingjia' })}
</Button> </Button>
)} )}
</Link> </Link>
...@@ -99,7 +99,7 @@ const Unevaluated: React.FC = () => { ...@@ -99,7 +99,7 @@ const Unevaluated: React.FC = () => {
const [columns, setColumns] = useState<any[]>(defaultColumns); const [columns, setColumns] = useState<any[]>(defaultColumns);
const fetchListData = (params: any) => { const fetchListData = (params: any) => {
let { createTimeStart, createTimeEnd , ...rest } = params; let { createTimeStart, createTimeEnd, ...rest } = params;
createTimeStart = createTimeStart ? moment(+createTimeStart).format('YYYY-MM-DD HH:mm:ss') : undefined; createTimeStart = createTimeStart ? moment(+createTimeStart).format('YYYY-MM-DD HH:mm:ss') : undefined;
createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined; createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment