Commit a41cfa88 authored by xiexiuxing's avatar xiexiuxing
parents 8a6eb04a 840c932c
......@@ -7,12 +7,14 @@ import { getIntl } from 'umi';
export interface BasicInfoProps {
effect?: any,
/** 栅格 */
span?: number
}
const count = 0;
const intl = getIntl();
const BasicLayout: React.FC<BasicInfoProps> = (props: any) => {
const { effect } = props;
const { effect, span } = props;
console.log(effect)
......@@ -23,7 +25,7 @@ const BasicLayout: React.FC<BasicInfoProps> = (props: any) => {
>
<Row gutter={[8, 8]}>
{effect.length > count && effect.map((item, index) => (
<Col key={`effect_${index + 1}`} span={8}>
<Col key={`effect_${index + 1}`} span={span}>
{ item.col.map((it, idx) => (
<div className={style.cell} key={`effect_col_${idx + 1}`}>
<h5 className={style.label}>{it.label}: </h5>
......@@ -36,5 +38,9 @@ const BasicLayout: React.FC<BasicInfoProps> = (props: any) => {
</Card>
)
}
BasicLayout.defaultProps = {
span: 8,
}
export default BasicLayout
......@@ -15,12 +15,14 @@ export interface GeneraInfoProps {
extra?: ReactNode,
/** 是否开启没数据不显示字段 */
visible?: boolean,
/** 栅格 */
span?: number
}
const count = 0;
const GeneralLayout: React.FC<GeneraInfoProps> = (props: any) => {
const { effect, anchor, title, extra, visible } = props;
const { effect, anchor, title, extra, visible, span } = props;
return (
<Card
......@@ -30,7 +32,7 @@ const GeneralLayout: React.FC<GeneraInfoProps> = (props: any) => {
>
<Row gutter={[8, 8]}>
{effect.length > count && effect.map((item, index) => (
<Col key={`effect_${index + 1}`} span={8}>
<Col key={`effect_${index + 1}`} span={span}>
{item.col.map((it, idx) => (
<Fragment key={`effect_col_${idx + 1}`}>
{visible ? <>
......@@ -56,5 +58,7 @@ const GeneralLayout: React.FC<GeneraInfoProps> = (props: any) => {
</Card>
)
}
GeneralLayout.defaultProps = {
span: 8
}
export default GeneralLayout
......@@ -33,7 +33,7 @@ interface Iprops {
rowKey: string | ((record) => any)
},
mode: 'checkbox' | 'radio',
mode?: 'checkbox' | 'radio',
customizeRadio?: boolean,
/**
* rowSelection
......@@ -52,11 +52,13 @@ interface Iprops {
onClose: () => void,
onOk: (selectRow: number[] | string[], selectedRows: { [key: string]: any }[]) => void,
/** customKey */
customKey?: string
customKey?: string,
/** 宽度 */
width?: number
}
const TableModal: React.FC<Iprops> = (props: Iprops) => {
const { title, visible, schema, columns, effects, tableProps, mode, expressionScope, fetchData, onClose, onOk, value, format, customizeRadio, modalType, footer, customKey } = props;
const { title, visible, schema, columns, effects, tableProps, mode, expressionScope, fetchData, onClose, onOk, value, format, customizeRadio, modalType, footer, customKey, width } = props;
const ref = useRef<any>({});
const [rowSelection, RowCtl] = useRowSelectionTable({ type: customizeRadio && mode === 'radio' ? 'checkbox' : mode, customKey: customKey });
const isFirstLoad = useRef<boolean>(true);
......@@ -102,10 +104,10 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
return (
<div style={{ textAlign: 'right' }}>
<Button onClick={handleOnClose} style={{ marginRight: 8 }}>
{intl.formatMessage({id: 'transaction_components.quxiao'})}
{intl.formatMessage({ id: 'transaction_components.quxiao' })}
</Button>
<Button onClick={handleOk} type="primary">
{intl.formatMessage({id: 'transaction_components.tijiao'})}
{intl.formatMessage({ id: 'transaction_components.tijiao' })}
</Button>
</div>
)
......@@ -121,7 +123,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
onClose={handleOnClose}
onCancel={handleOnClose}
// onOk={handleOk}
width={900}
width={width}
{...otherProps}
>
<StandardTable
......@@ -169,7 +171,8 @@ TableModal.defaultProps = {
format: null,
customizeRadio: false,
modalType: "Modal",
footer: null
footer: null,
width: 900
}
export default TableModal;
import { useIntl } from 'umi';
import React from 'react';
import { Image, Button, Typography } from 'antd';
import { getIntl } from 'umi'
const intl = getIntl();
const columns_10 = ({
value,
handlCollocation,
showExecution,
toggle
}) => {
return (
[
{
title: `${intl.formatMessage({ id: 'marketingAbility.productID' })}`,
key: 'productId',
dataIndex: 'productId',
render: (text) => <Typography.Link target="_blank" href={`/memberCenter/commodityAbility/commodity/products/detail?id=${text}`}>{text}</Typography.Link>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.commodityImages' })}`,
key: 'productImgUrl',
dataIndex: 'productImgUrl',
render: (text) => <Image width={32} height={32} src={text} />
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.nameOfCommodity' })}`,
key: 'productName',
dataIndex: 'productName'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.category' })}`,
key: 'category',
dataIndex: 'category'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.brand' })}`,
key: 'brand',
dataIndex: 'brand'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.unit' })}`,
key: 'unit',
dataIndex: 'unit'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.commodityPrices' })}`,
key: 'price',
dataIndex: 'price',
render: (text) => `¥${Number(text).toFixed(2)}`
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.individualPurchaseQuantity' })}`,
key: 'restrictNum',
dataIndex: 'restrictNum',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.numberPurchasingActivities' })}`,
key: 'restrictTotalNum',
dataIndex: 'restrictTotalNum',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.operation' })}`,
key: 'operation',
dataIndex: 'operation',
render: (_text, _record) => (
<>
{(value === 6) && (
<Button type='link' onClick={() => handlCollocation(_record)}>{intl.formatMessage({ id: 'marketingAbility.viewTheGift' })}</Button>
)}
{(value === 13) && (
<Button type='link' onClick={() => handlCollocation(_record)}>{intl.formatMessage({ id: 'marketingAbility.checkForGoods' })}</Button>
)}
{(value === 15) && (
<Button type='link' onClick={() => handlCollocation(_record)}>{intl.formatMessage({ id: 'marketingAbility.viewTheCollocationOfGoods' })}</Button>
)}
{showExecution && <Button type='link' style={{ padding: 0 }} onClick={() => toggle(true, _record)}>执行明细</Button>}
</>
)
},
]
)
}
export default columns_10
import { useIntl } from 'umi';
import React from 'react';
import { Image, Button, Typography } from 'antd';
import { getIntl} from 'umi'
import { getIntl } from 'umi'
const intl = getIntl();
const columns_4 = ({
value,
handlCollocation
handlCollocation,
showExecution
}) => {
return (
[
{
title: `${intl.formatMessage({ id: 'marketingAbility.productID'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.productID' })}`,
key: 'productId',
dataIndex: 'productId',
render: (text) => <Typography.Link target="_blank" href={`/memberCenter/commodityAbility/commodity/products/detail?id=${text}`}>{text}</Typography.Link>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.commodityImages'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.commodityImages' })}`,
key: 'productImgUrl',
dataIndex: 'productImgUrl',
render: (text) => <Image width={32} height={32} src={text} />
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.nameOfCommodity'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.nameOfCommodity' })}`,
key: 'productName',
dataIndex: 'productName'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.category'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.category' })}`,
key: 'category',
dataIndex: 'category'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.brand'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.brand' })}`,
key: 'brand',
dataIndex: 'brand'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.unit'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.unit' })}`,
key: 'unit',
dataIndex: 'unit'
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.commodityPrices'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.commodityPrices' })}`,
key: 'price',
dataIndex: 'price',
render: (text) => `¥${Number(text).toFixed(2)}`
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.individualPurchaseQuantity'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.individualPurchaseQuantity' })}`,
key: 'restrictNum',
dataIndex: 'restrictNum',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.numberPurchasingActivities'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.numberPurchasingActivities' })}`,
key: 'restrictTotalNum',
dataIndex: 'restrictTotalNum',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.operation'})}`,
key: 'operation',
dataIndex: 'operation',
render: (_text, _record) => (
<>
{(value === 6) && (
<Button type='link' onClick={() => handlCollocation(_record)}>{ intl.formatMessage({ id: 'marketingAbility.viewTheGift'}) }</Button>
)}
{(value === 13) && (
<Button type='link' onClick={() => handlCollocation(_record)}>{ intl.formatMessage({ id: 'marketingAbility.checkForGoods'}) }</Button>
)}
{(value === 15) && (
<Button type='link' onClick={() => handlCollocation(_record)}>{ intl.formatMessage({ id: 'marketingAbility.viewTheCollocationOfGoods'}) }</Button>
)}
</>
)
},
]
)
}
......
......@@ -9,6 +9,7 @@ const columns_5 = ({
handleDelete,
form,
}) => {
return (
[
{
......
......@@ -3,33 +3,49 @@ import columns_2 from './columns_2';
import columns_3 from './columns_3';
import columns_4 from './columns_4';
import columns_5 from './columns_4';
import columns_6 from './columns_4';
import columns_6 from './columns_10';
import columns_7 from './columns_4';
import columns_8 from './columns_4';
import columns_9 from './columns_5';
import columns_10 from './columns_9';
import columns_11 from './columns_6';
import columns_12 from './columns_7';
import columns_13 from './columns_4';
import columns_13 from './columns_10';
import columns_14 from './columns_8';
import columns_15 from './columns_4';
import columns_15 from './columns_10';
import columns_16 from './columns_4';
export const Columns = {
/** 特价促销 */
1: columns_1,
/** 直降促销 */
2: columns_2,
/** 折价促销 */
3: columns_3,
/** 满量促销 */
4: columns_4,
/** 满额促销 */
5: columns_5,
/** 赠送促销 */
6: columns_6,
/** 多件促销 */
7: columns_7,
/** 组合促销 */
8: columns_8,
/** 拼团 */
9: columns_9,
/** 抽奖 */
10: columns_10,
/** 砍价 */
11: columns_11,
/** 秒杀 */
12: columns_12,
/** 换购 */
13: columns_13,
/** 预售 */
14: columns_14,
/** 套餐 */
15: columns_15,
/** 试用 */
16: columns_16,
}
......@@ -15,19 +15,34 @@ import columns_15 from './columns_4';
import columns_16 from './columns_4';
export const Columns = {
1: columns_1,
2: columns_2,
3: columns_3,
4: columns_4,
5: columns_5,
6: columns_6,
7: columns_7,
8: columns_8,
9: columns_9,
11: columns_11,
12: columns_12,
13: columns_13,
14: columns_14,
15: columns_15,
16: columns_16,
/** 特价促销 */
1: columns_1,
/** 直降促销 */
2: columns_2,
/** 折价促销 */
3: columns_3,
/** 满量促销 */
4: columns_4,
/** 满额促销 */
5: columns_5,
/** 赠送促销 */
6: columns_6,
/** 多件促销 */
7: columns_7,
/** 组合促销 */
8: columns_8,
/** 拼团 */
9: columns_9,
/** 砍价 */
11: columns_11,
/** 秒杀 */
12: columns_12,
/** 换购 */
13: columns_13,
/** 预售 */
14: columns_14,
/** 套餐 */
15: columns_15,
/** 试用 */
16: columns_16,
}
......@@ -4,7 +4,6 @@ import React from 'react';
import TableLayout from '../../../components/tableLayout';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { ColumnType } from 'antd/lib/table/interface';
import StatusTag from '@/components/StatusTag';
import EyePreview from '@/components/EyePreview';
import { format } from '@/pages/transaction/common/dateFormat';
import { useLinkageUtils } from '@/utils/formEffectUtils';
......
import { getIntl} from 'umi'
const intl = getIntl();
/**
* 活动类型
*/
export enum ACTIVITYTYPE {
/** 特价促销 */
SALE = 1,
/** 直降促销 */
DOWNSALE,
/** 折扣促销 */
DISCOUNT,
/** 满量促销 */
FULLCAPACITY,
/** 满额促销 */
FULFILTHEQUOTA,
/** 赠送促销 */
PRESENTED,
/** 多件促销 */
EXCESSIVEPARTS,
/** 组合促销 */
GROUPS,
/** 拼团 */
TOURDIY,
/** 抽奖 */
LOTTERY,
/** 砍价 */
BARGAIN,
/** 秒杀 */
SECKILL,
/** 换购 */
GIFT,
/** 预售 */
PRESELL,
/** 套餐 */
SETMEAL,
/** 试用 */
TRYOUT,
}
/**
* 活动类型文字
*/
export const ACTIVITYTYPENAME = {
1: `${intl.formatMessage({ id: 'marketingAbility.tejiacuxiao'})}`,
2: `${intl.formatMessage({ id: 'marketingAbility.zhijiangcuxiao'})}`,
3: `${intl.formatMessage({ id: 'marketingAbility.zhekoucuxiao'})}`,
4: `${intl.formatMessage({ id: 'marketingAbility.manliangcuxiao'})}`,
5: `${intl.formatMessage({ id: 'marketingAbility.manecuxiao'})}`,
6: `${intl.formatMessage({ id: 'marketingAbility.zengsongcuxiao'})}`,
7: `${intl.formatMessage({ id: 'marketingAbility.duojiancuxiao'})}`,
8: `${intl.formatMessage({ id: 'marketingAbility.zuhecuxiao'})}`,
9: `${intl.formatMessage({ id: 'marketingAbility.pintuan'})}`,
10: `${intl.formatMessage({ id: 'marketingAbility.choujiang'})}`,
11: `${intl.formatMessage({ id: 'marketingAbility.kanjia'})}`,
12: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
13: `${intl.formatMessage({ id: 'marketingAbility.huangou'})}`,
14: `${intl.formatMessage({ id: 'marketingAbility.yushou'})}`,
15: `${intl.formatMessage({ id: 'marketingAbility.taocan'})}`,
16: `${intl.formatMessage({ id: 'marketingAbility.shiyong'})}`,
}
import { getIntl} from 'umi'
const intl = getIntl();
export const _data = {
id: 1,
activityId: 888,
activityName: `${intl.formatMessage({ id: 'marketingAbility.zijianyingxiaohuodongguanli'})}`,
marketingNo: 'XJBX888888',
externalState: 5,
externalStateName: `${intl.formatMessage({ id: 'marketingAbility.yijieshu'})}`,
interiorState: 5,
interiorStateName: `${intl.formatMessage({ id: 'marketingAbility.yijieshu'})}`,
activityType: 1,
orderModal: `${intl.formatMessage({ id: 'marketingAbility.xunjiabaojiaxiadan'})}`,
membersName: `${intl.formatMessage({ id: 'marketingAbility.wenzhoulongchangshoudaiyouxiangongsi'})}`,
creationTime: 1624603001552,
activityStartTime: 1624603001552,
activityEndTime: 1624603001552,
externalLogStates: [
{
isExecute: 1,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.gongyingshang'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.pingtai'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shangxianyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.gongyingshang'})}`,
state: 1,
stateName: null,
},
],
externalLogs: [
{
auditOpinion: "",
createMemberId: 20,
createMemberRoleId: 11,
createTime: 1624600139800,
id: 1,
operation: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
purchaseInquiryId: 956,
roleName: `${intl.formatMessage({ id: 'marketingAbility.gongyingshang'})}`,
state: 2,
stateName: `${intl.formatMessage({ id: 'marketingAbility.daipingtaishenhe'})}`,
},
{
auditOpinion: `${intl.formatMessage({ id: 'marketingAbility.tongyi'})}`,
createMemberId: 20,
createMemberRoleId: 11,
createTime: 1624600139800,
id: 2,
operation: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong'})}`,
purchaseInquiryId: 956,
roleName: `${intl.formatMessage({ id: 'marketingAbility.pingtai'})}`,
state: 2,
stateName: `${intl.formatMessage({ id: 'marketingAbility.daishangxianhuodong'})}`,
},
],
interiorLogStates: [
{
isExecute: 1,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.xinzengyingxiaohuodong'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong(yiji)'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong(erji)'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.yunyingzongjian'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.yunyingrenyuan'})}`,
state: 1,
stateName: null,
},
],
interiorLogs: [
{
auditOpinion: "",
createMemberId: 20,
createRoleId: 11,
createTime: 1624600137942,
department: `${intl.formatMessage({ id: 'marketingAbility.yunyingrenyuan'})}`,
id: 3968,
memberId: null,
memberRoleId: null,
operation: `${intl.formatMessage({ id: 'marketingAbility.xinzengyingxiaohuodong'})}`,
position: `${intl.formatMessage({ id: 'marketingAbility.yunyingbu'})}`,
purchaseInquiryId: 956,
roleName: `${intl.formatMessage({ id: 'marketingAbility.zhangsan'})}`,
state: 1,
stateName: `${intl.formatMessage({ id: 'marketingAbility.daishenhe(yiji)'})}`,
step: 1,
},
],
}
import { useIntl } from 'umi';
import React from 'react';
import TableLayout from '../../../components/tableLayout';
import { useIntl } from 'umi';
import { Button, Tag, Typography } from 'antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { format } from '@/pages/transaction/common/dateFormat';
import { ColumnType } from 'antd/lib/table/interface';
import StatusTag from '@/components/StatusTag';
import { getMarketingAbilityActivityExecutePlatformPage, getMarketingPlatformActivitySignupGetActivityTypeList, getMarketingPlatformActivitySignupGetOuterStatusList } from '@/services/MarketingV2Api';
import TableLayout from '../../../components/tableLayout';
import { OuterStatusColor } from '../../common/tagColor';
import { PATTERN_MAPS } from '@/constants/regExp';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
const { onFormMount$ } = FormEffectHooks;
const Search = () => {
const intl = useIntl();
const columns: ColumnType<any>[] = [{
title: 'ID',
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName',
align: 'left',
render: (text) =>
<span style={{ color: '#00B37A' }}>{text}</span>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityType',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
dataIndex: 'outerStatus',
align: 'left',
render: (text) => (
<StatusTag type="danger" title={text} />
)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' })}`,
dataIndex: 'innerStatus',
align: 'left',
}]
const mokiData = [
const columns: ColumnType<any>[] = [
{
title: 'ID',
dataIndex: 'id',
render: (text) => <Button type='link' style={{ padding: 0 }}>{text}</Button>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityTypeName',
},
{
id: '1',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime',
render: (text) => format(text)
},
{
id: '2',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime',
render: (text) => format(text)
},
{
id: '3',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
title: `报名时间`,
dataIndex: 'signupTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'customerCount',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'orderCount',
},
{
title: `已执行订单金额`,
dataIndex: 'orderAmount',
render: (text) => (
<Typography.Text>{Number(text).toFixed(2)}</Typography.Text>
)
},
{
title: `外部状态`,
dataIndex: 'statusName',
render: (text, _) => (
<Tag color={OuterStatusColor(_.status)}>{text}</Tag>
)
},
{
title: '操作',
dataIndex: 'opertion',
render: (text, _) => (
<Button type='link'>查看</Button>
)
}
]
/* 多选返回的 */
const fetchRowkeys = (row) => {
console.log(row);
const useStateEffects = () => {
const linkage = useLinkageUtils();
onFormMount$().subscribe(() => {
/** 活动类型 */
getMarketingPlatformActivitySignupGetActivityTypeList().then(res => {
const _enum = res.data.map((item) => { return { label: item.name, value: item.status } });
linkage.enum('activityType', _enum);
}).catch(err => {
console.warn(err)
})
/** 外部状态 */
getMarketingPlatformActivitySignupGetOuterStatusList().then(res => {
const _enum = res.data.map((item) => { return { label: item.name, value: item.status } });
linkage.enum('outerStatus', _enum);
}).catch(err => {
console.warn(err)
})
})
}
return (
<TableLayout
columns={columns}
effects="id"
fetch={mokiData}
selectedRow={true}
fetchRowkeys={fetchRowkeys}
fetch={getMarketingAbilityActivityExecutePlatformPage}
useStateEffects={useStateEffects}
schema={{
type: 'object',
properties: {
......@@ -120,6 +119,12 @@ const Search = () => {
'x-component-props': {
placeholder: '活动ID'
},
'x-rules': [
{
pattern: PATTERN_MAPS.quantity,
message: `${intl.formatMessage({ id: 'selfManagement.qingshuruId' })}`,
},
],
},
},
},
......
......@@ -67,14 +67,14 @@ const ReadyExamineOne = () => {
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
// {
// title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
// key: 'outerStatus',
// dataIndex: 'outerStatus',
// render: (_text, record) => (
// <Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
// )
// },
{
title: `${intl.formatMessage({ id: 'selfManagement.internalState' })}`,
key: 'innerStatus',
......
......@@ -67,14 +67,14 @@ const ReadyExamineTwo = () => {
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
// {
// title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
// key: 'outerStatus',
// dataIndex: 'outerStatus',
// render: (_text, record) => (
// <Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
// )
// },
{
title: `${intl.formatMessage({ id: 'selfManagement.internalState' })}`,
key: 'innerStatus',
......
......@@ -68,14 +68,14 @@ const ReadyLive = () => {
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
// {
// title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
// key: 'outerStatus',
// dataIndex: 'outerStatus',
// render: (_text, record) => (
// <Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
// )
// },
{
title: `${intl.formatMessage({ id: 'selfManagement.internalState' })}`,
key: 'innerStatus',
......
......@@ -67,14 +67,14 @@ const ReadySubmit = () => {
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
// {
// title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
// key: 'outerStatus',
// dataIndex: 'outerStatus',
// render: (_text, record) => (
// <Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
// )
// },
{
title: `${intl.formatMessage({ id: 'selfManagement.internalState' })}`,
key: 'innerStatus',
......
......@@ -94,14 +94,14 @@ const ReadySubmitExamine = () => {
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
// {
// title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
// key: 'outerStatus',
// dataIndex: 'outerStatus',
// render: (_text, record) => (
// <Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
// )
// },
{
title: `${intl.formatMessage({ id: 'selfManagement.internalState' })}`,
key: 'innerStatus',
......
......@@ -80,14 +80,14 @@ const Search = () => {
dataIndex: 'endTime',
render: (text) => format(text)
},
{
title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
key: 'outerStatus',
dataIndex: 'outerStatus',
render: (_text, record) => (
<Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
)
},
// {
// title: `${intl.formatMessage({ id: 'selfManagement.externalState' })}`,
// key: 'outerStatus',
// dataIndex: 'outerStatus',
// render: (_text, record) => (
// <Tag color={OuterStatusColor(_text)}>{record.outerStatusName}</Tag>
// )
// },
{
title: `${intl.formatMessage({ id: 'selfManagement.internalState' })}`,
key: 'innerStatus',
......
import { getIntl} from 'umi'
const intl = getIntl();
/**
* 活动类型
*/
export enum ACTIVITYTYPE {
/** 特价促销 */
SALE = 1,
/** 直降促销 */
DOWNSALE,
/** 折扣促销 */
DISCOUNT,
/** 满量促销 */
FULLCAPACITY,
/** 满额促销 */
FULFILTHEQUOTA,
/** 赠送促销 */
PRESENTED,
/** 多件促销 */
EXCESSIVEPARTS,
/** 组合促销 */
GROUPS,
/** 拼团 */
TOURDIY,
/** 抽奖 */
LOTTERY,
/** 砍价 */
BARGAIN,
/** 秒杀 */
SECKILL,
/** 换购 */
GIFT,
/** 预售 */
PRESELL,
/** 套餐 */
SETMEAL,
/** 试用 */
TRYOUT,
}
/**
* 活动类型文字
*/
export const ACTIVITYTYPENAME = {
1: `${intl.formatMessage({ id: 'marketingAbility.tejiacuxiao'})}`,
2: `${intl.formatMessage({ id: 'marketingAbility.zhijiangcuxiao'})}`,
3: `${intl.formatMessage({ id: 'marketingAbility.zhekoucuxiao'})}`,
4: `${intl.formatMessage({ id: 'marketingAbility.manliangcuxiao'})}`,
5: `${intl.formatMessage({ id: 'marketingAbility.manecuxiao'})}`,
6: `${intl.formatMessage({ id: 'marketingAbility.zengsongcuxiao'})}`,
7: `${intl.formatMessage({ id: 'marketingAbility.duojiancuxiao'})}`,
8: `${intl.formatMessage({ id: 'marketingAbility.zuhecuxiao'})}`,
9: `${intl.formatMessage({ id: 'marketingAbility.pintuan'})}`,
10: `${intl.formatMessage({ id: 'marketingAbility.choujiang'})}`,
11: `${intl.formatMessage({ id: 'marketingAbility.kanjia'})}`,
12: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
13: `${intl.formatMessage({ id: 'marketingAbility.huangou'})}`,
14: `${intl.formatMessage({ id: 'marketingAbility.yushou'})}`,
15: `${intl.formatMessage({ id: 'marketingAbility.taocan'})}`,
16: `${intl.formatMessage({ id: 'marketingAbility.shiyong'})}`,
}
import { getIntl} from 'umi'
const intl = getIntl();
export const _data = {
id: 1,
activityId: 888,
activityName: `${intl.formatMessage({ id: 'marketingAbility.zijianyingxiaohuodongguanli'})}`,
marketingNo: 'XJBX888888',
externalState: 5,
externalStateName: `${intl.formatMessage({ id: 'marketingAbility.yijieshu'})}`,
interiorState: 5,
interiorStateName: `${intl.formatMessage({ id: 'marketingAbility.yijieshu'})}`,
activityType: 1,
orderModal: `${intl.formatMessage({ id: 'marketingAbility.xunjiabaojiaxiadan'})}`,
membersName: `${intl.formatMessage({ id: 'marketingAbility.wenzhoulongchangshoudaiyouxiangongsi'})}`,
creationTime: 1624603001552,
activityStartTime: 1624603001552,
activityEndTime: 1624603001552,
externalLogStates: [
{
isExecute: 1,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.gongyingshang'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.pingtai'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shangxianyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.gongyingshang'})}`,
state: 1,
stateName: null,
},
],
externalLogs: [
{
auditOpinion: "",
createMemberId: 20,
createMemberRoleId: 11,
createTime: 1624600139800,
id: 1,
operation: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
purchaseInquiryId: 956,
roleName: `${intl.formatMessage({ id: 'marketingAbility.gongyingshang'})}`,
state: 2,
stateName: `${intl.formatMessage({ id: 'marketingAbility.daipingtaishenhe'})}`,
},
{
auditOpinion: `${intl.formatMessage({ id: 'marketingAbility.tongyi'})}`,
createMemberId: 20,
createMemberRoleId: 11,
createTime: 1624600139800,
id: 2,
operation: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong'})}`,
purchaseInquiryId: 956,
roleName: `${intl.formatMessage({ id: 'marketingAbility.pingtai'})}`,
state: 2,
stateName: `${intl.formatMessage({ id: 'marketingAbility.daishangxianhuodong'})}`,
},
],
interiorLogStates: [
{
isExecute: 1,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.xinzengyingxiaohuodong'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong(yiji)'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.shenheyingxiaohuodong(erji)'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.yunyingzongjian'})}`,
state: 1,
stateName: null,
},
{
isExecute: 0,
operationalProcess: `${intl.formatMessage({ id: 'marketingAbility.tijiaoyingxiaohuodong'})}`,
roleName: `${intl.formatMessage({ id: 'marketingAbility.yunyingrenyuan'})}`,
state: 1,
stateName: null,
},
],
interiorLogs: [
{
auditOpinion: "",
createMemberId: 20,
createRoleId: 11,
createTime: 1624600137942,
department: `${intl.formatMessage({ id: 'marketingAbility.yunyingrenyuan'})}`,
id: 3968,
memberId: null,
memberRoleId: null,
operation: `${intl.formatMessage({ id: 'marketingAbility.xinzengyingxiaohuodong'})}`,
position: `${intl.formatMessage({ id: 'marketingAbility.yunyingbu'})}`,
purchaseInquiryId: 956,
roleName: `${intl.formatMessage({ id: 'marketingAbility.zhangsan'})}`,
state: 1,
stateName: `${intl.formatMessage({ id: 'marketingAbility.daishenhe(yiji)'})}`,
step: 1,
},
],
}
import { useIntl } from 'umi';
import React from 'react';
import TableLayout from '../../../components/tableLayout';
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';
import StatusTag from '@/components/StatusTag';
import { format } from '@/pages/transaction/common/dateFormat';
import { getMarketingAbilityActivityExecuteMerchantPage, getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityGetInnerStatusList } from '@/services/MarketingV2Api';
import TableLayout from '../../../components/tableLayout';
import { InnerStatusColor } from '../../common/tagColor';
import { PATTERN_MAPS } from '@/constants/regExp';
import { useLinkageUtils } from '@/utils/formEffectUtils';
import { FormEffectHooks } from '@formily/antd';
const { onFormMount$ } = FormEffectHooks;
const Search = () => {
const intl = useIntl();
const columns: ColumnType<any>[] = [{
title: 'ID',
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName',
align: 'left',
render: (text) =>
<span style={{ color: '#00B37A' }}>{text}</span>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityType',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
dataIndex: 'outerStatus',
align: 'left',
render: (text) => (
<StatusTag type="danger" title={text} />
)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' })}`,
dataIndex: 'innerStatus',
align: 'left',
}]
const mokiData = [
const columns: ColumnType<any>[] = [
{
title: 'ID',
dataIndex: 'id',
render: (text) =>
<Button type='link' style={{ padding: 0 }} onClick={() => history.push(`/memberCenter/marketingAbility/selfManagement/search/preview?id=${text}`)}>{text}</Button>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityTypeName',
},
{
id: '1',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime',
render: (text) => format(text)
},
{
id: '2',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime',
render: (text) => format(text)
},
{
id: '3',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'customerCount',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'orderCount',
},
{
title: `已执行订单金额`,
dataIndex: 'orderAmount',
render: (text) => (
<Typography.Text>{Number(text).toFixed(2)}</Typography.Text>
)
},
{
title: `内部状态`,
dataIndex: 'statusName',
render: (text, _) => (
<Badge status={InnerStatusColor(_.status)} text={text} />
)
},
{
title: '操作',
dataIndex: 'opertion',
render: (_text, _) => (
<Button type='link' onClick={() => history.push(`/memberCenter/marketingAbility/selfbuiltexeCution/search/detail?id=${_.id}`)}>查看</Button>
)
}
]
/* 多选返回的 */
const fetchRowkeys = (row) => {
console.log(row);
const useStateEffects = () => {
const linkage = useLinkageUtils();
onFormMount$().subscribe(() => {
/** 活动类型 */
getMarketingMerchantActivityGetActivityTypeList().then(res => {
const _enum = res.data.map((item) => { return { label: item.name, value: item.status } });
linkage.enum('activityType', _enum);
}).catch(err => {
console.warn(err)
})
/** 内部状态 */
getMarketingMerchantActivityGetInnerStatusList().then(res => {
const _enum = res.data.map((item) => { return { label: item.name, value: item.status } })
linkage.enum('innerStatus', _enum);
}).catch(err => {
console.warn(err)
})
})
}
return (
<TableLayout
columns={columns}
effects="id"
fetch={mokiData}
selectedRow={true}
fetchRowkeys={fetchRowkeys}
fetch={getMarketingAbilityActivityExecuteMerchantPage}
useStateEffects={useStateEffects}
schema={{
type: 'object',
properties: {
......@@ -121,6 +114,12 @@ const Search = () => {
'x-component-props': {
placeholder: '活动ID'
},
'x-rules': [
{
pattern: PATTERN_MAPS.quantity,
message: `${intl.formatMessage({ id: 'selfManagement.qingshuruId' })}`,
},
],
},
},
},
......@@ -169,12 +168,12 @@ const Search = () => {
},
},
},
outerStatus: {
innerStatus: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: `部状态`,
placeholder: `部状态`,
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