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

fix: 修改营销活动执行翻译

parent 43eab8d0
......@@ -424,4 +424,24 @@ export default {
'marketingAbility.huodongshangpinliebiao':'Activity product list (28)',
'marketingAbility.xinhuiyuanpingtaihuiyuan':'New Member (Platform Member)',
'marketingAbility.laohuiyuanpingtaihuiyuan':'Old Member (Platform Member)',
'marketingAbility.orderAmount': 'orderAmount',
'marketingAbility.salesNum': 'salesNum',
'marketingAbility.amount': 'amount',
'marketingAbility.zhixingmingxi': 'enumeration',
'marketingAbility.true': 'yes',
'marketingAbility.false': 'no',
'marketingAbility.orderId': 'orderId',
'marketingAbility.recordTypeName': 'recordTypeName',
'marketingAbility.shopName': 'shopName',
'marketingAbility.memberName': 'memberName',
'marketingAbility.orderTime': 'orderTime',
'marketingAbility.statusName': 'statusName',
'marketingAbility.isHasTax': 'Tax/Tax rate',
'marketingAbility.quantity': 'purchase amount',
'marketingAbility.skuPrice': 'amount payable',
'marketingAbility.amountP': 'salesNum',
'marketingAbility.discountPrice': 'discountPrice',
'marketingAbility.order': 'order',
'marketingAbility.returned': 'return of goods',
}
......@@ -425,4 +425,24 @@ export default {
'marketingAbility.huodongshangpinliebiao': '이벤트 상품 목록(28)',
'marketingAbility.xinhuiyuanpingtaihuiyuan': '신규 회원(플랫폼 회원)',
'marketingAbility.laohuiyuanpingtaihuiyuan': '구회원(플랫폼 회원)',
'marketingAbility.orderAmount': '실행된 주문 금액',
'marketingAbility.salesNum': '실제 구매 수량',
'marketingAbility.amount': '실구매 금액',
'marketingAbility.zhixingmingxi': '실행 상세내역',
'marketingAbility.true': '예',
'marketingAbility.false': '아니오',
'marketingAbility.orderId': '문서 번호',
'marketingAbility.recordTypeName': '문서 유형',
'marketingAbility.shopName': '상가',
'marketingAbility.memberName': '고객 이름',
'marketingAbility.orderTime': '문서 시간',
'marketingAbility.statusName': '문서 상태',
'marketingAbility.isHasTax': '세금 포함/세율',
'marketingAbility.quantity': '구매 수량',
'marketingAbility.skuPrice': '미수금',
'marketingAbility.amountP': '실불 금액',
'marketingAbility.discountPrice': '혜택 금액',
'marketingAbility.order': '주문서',
'marketingAbility.returned': '반품 요청서',
}
......@@ -123,4 +123,5 @@ export default {
'common.huanhuofahuodan': '换货发货单',
'common.huanhuorukudan': '换货入库单',
'common.fiebiao': '废标',
}
......@@ -425,4 +425,24 @@ export default {
'marketingAbility.huodongshangpinliebiao': '活动商品列表 (28)',
'marketingAbility.xinhuiyuanpingtaihuiyuan': '新会员(平台会员)',
'marketingAbility.laohuiyuanpingtaihuiyuan': '老会员(平台会员)',
'marketingAbility.orderAmount': '已执行订单金额',
'marketingAbility.salesNum': '实购数量',
'marketingAbility.amount': '实购金额',
'marketingAbility.zhixingmingxi': '执行明细',
'marketingAbility.true': '是',
'marketingAbility.false': '否',
'marketingAbility.orderId': '单据号',
'marketingAbility.recordTypeName': '单据类型',
'marketingAbility.shopName': '商城',
'marketingAbility.memberName': '客户名称',
'marketingAbility.orderTime': '单据时间',
'marketingAbility.statusName': '单据状态',
'marketingAbility.isHasTax': '含税/税率',
'marketingAbility.quantity': '购买数量',
'marketingAbility.skuPrice': '应付金额',
'marketingAbility.amountP': '实付金额',
'marketingAbility.discountPrice': '优惠金额',
'marketingAbility.order': '订单',
'marketingAbility.returned': '退货申请单',
}
......@@ -23,55 +23,55 @@ const Search = () => {
<Button type='link' style={{ padding: 0 }} onClick={() => history.push(`/memberCenter/marketingAbility/paltformSign/search/preview?activityId=${text}&signUpId=${record.signupId}`)}>{text}</Button>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
title: intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' }),
dataIndex: 'activityName',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
title: intl.formatMessage({ id: 'marketingAbility.huodongleixing' }),
dataIndex: 'activityTypeName',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
title: intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' }),
dataIndex: 'startTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
title: intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' }),
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `报名时间`,
title: intl.formatMessage({ id: 'marketingAbility.baomingshijian' }),
dataIndex: 'signupTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
title: intl.formatMessage({ id: 'marketingAbility.canyukehushu' }),
dataIndex: 'customerCount',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
title: intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' }),
dataIndex: 'orderCount',
},
{
title: `已执行订单金额`,
title: intl.formatMessage({ id: 'marketingAbility.orderAmount' }),
dataIndex: 'orderAmount',
render: (text) => (
<Typography.Text>{Number(text).toFixed(2)}</Typography.Text>
<Typography.Text>{intl.formatMessage({ id: 'common.money' })}{Number(text).toFixed(2)}</Typography.Text>
)
},
{
title: `外部状态`,
title: intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' }),
dataIndex: 'statusName',
render: (text, _) => (
<Tag color={OuterStatusColor(_.status)}>{text}</Tag>
)
},
{
title: '操作',
title: intl.formatMessage({ id: 'marketingAbility.operation' }),
dataIndex: 'opertion',
render: (_text, _) => (
<Button type='link' onClick={() => history.push(`/memberCenter/marketingAbility/platformexeCution/search/detail?id=${_.id}`)}>查看</Button>
<Button type='link' onClick={() => history.push(`/memberCenter/marketingAbility/platformexeCution/search/detail?id=${_.id}`)}>{intl.formatMessage({id: 'balance.accountsReceivable.invoice.columns.operation.1'})}</Button>
)
}
]
......@@ -118,7 +118,7 @@ const Search = () => {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '活动ID'
placeholder: `${intl.formatMessage({ id: 'marketingAbility.huodongID' })}`
},
'x-rules': [
{
......@@ -145,7 +145,7 @@ const Search = () => {
activityName: {
type: 'string',
'x-component-props': {
placeholder: `活动名称`,
placeholder: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
allowClear: true,
style: {
width: 160,
......@@ -167,7 +167,7 @@ const Search = () => {
default: undefined,
enum: [],
'x-component-props': {
placeholder: `活动类型`,
placeholder: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
allowClear: true,
style: {
width: 160,
......@@ -179,7 +179,7 @@ const Search = () => {
default: undefined,
enum: [],
'x-component-props': {
placeholder: `外部状态`,
placeholder: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
allowClear: true,
style: {
width: 160,
......
import React from 'react';
import { Badge, Button, Typography } from 'antd';
import { Badge, Button, Typography } from 'antd';
import { useIntl, history } from 'umi';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ColumnType } from 'antd/lib/table/interface';
......@@ -48,24 +48,24 @@ const Search = () => {
dataIndex: 'orderCount',
},
{
title: `已执行订单金额`,
title: intl.formatMessage({ id: 'marketingAbility.orderAmount' }),
dataIndex: 'orderAmount',
render: (text) => (
<Typography.Text>{Number(text).toFixed(2)}</Typography.Text>
<Typography.Text>{intl.formatMessage({ id: 'common.money' })}{Number(text).toFixed(2)}</Typography.Text>
)
},
{
title: `内部状态`,
title: intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' }),
dataIndex: 'statusName',
render: (text, _) => (
<Badge status={InnerStatusColor(_.status)} text={text} />
)
},
{
title: '操作',
title: intl.formatMessage({ id: 'marketingAbility.operation' }),
dataIndex: 'opertion',
render: (_text, _) => (
<Button type='link' onClick={() => history.push(`/memberCenter/marketingAbility/selfbuiltexeCution/search/detail?id=${_.id}`)}>查看</Button>
<Button type='link' onClick={() => history.push(`/memberCenter/marketingAbility/selfbuiltexeCution/search/detail?id=${_.id}`)}>{intl.formatMessage({id: 'balance.accountsReceivable.invoice.columns.operation.1'})}</Button>
)
}
]
......@@ -112,7 +112,7 @@ const Search = () => {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: '活动ID'
placeholder: intl.formatMessage({ id: 'marketingAbility.huodongID' })
},
'x-rules': [
{
......@@ -139,7 +139,7 @@ const Search = () => {
activityName: {
type: 'string',
'x-component-props': {
placeholder: `活动名称`,
placeholder: intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' }),
allowClear: true,
style: {
width: 160,
......@@ -161,7 +161,7 @@ const Search = () => {
default: undefined,
enum: [],
'x-component-props': {
placeholder: `活动类型`,
placeholder: intl.formatMessage({ id: 'marketingAbility.huodongleixing' }),
allowClear: true,
style: {
width: 160,
......@@ -173,7 +173,7 @@ const Search = () => {
default: undefined,
enum: [],
'x-component-props': {
placeholder: `内部状态`,
placeholder: intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' }),
allowClear: true,
style: {
width: 160,
......
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