Skip to content

J
jinfa-platform
Commit 7b5b9ac9 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

feat: 营销活动执行

parent 613ea7e0
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 88 deletions
src/pages/transaction/marketingAbility/platformexeCution/search/index.tsx
View file @ 7b5b9ac9
...@@ -13,44 +13,44 @@ const Search = () => { ...@@ -13,44 +13,44 @@ const Search = () => {
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName', dataIndex: 'activityName',
align: 'left', align: 'left',
render: (text) => render: (text) =>
<span style={{ color: '#00B37A' }}>{text}</span> <span style={{ color: '#00B37A' }}>{text}</span>
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityType', dataIndex: 'activityType',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime', dataIndex: 'startTime',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime', dataIndex: 'endTime',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian' })}`,
dataIndex: 'startTime', dataIndex: 'startTime',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'id', dataIndex: 'id',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'id', dataIndex: 'id',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
dataIndex: 'outerStatus', dataIndex: 'outerStatus',
align: 'left', align: 'left',
render: (text) => ( render: (text) => (
...@@ -58,7 +58,7 @@ const Search = () => { ...@@ -58,7 +58,7 @@ const Search = () => {
) )
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' })}`,
dataIndex: 'innerStatus', dataIndex: 'innerStatus',
align: 'left', align: 'left',
}] }]
...@@ -66,29 +66,29 @@ const Search = () => { ...@@ -66,29 +66,29 @@ const Search = () => {
{ {
id: '1', id: '1',
activityName: 'tony', activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`, activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08', startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }), endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe'})}`, outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe'})}`, innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
}, },
{ {
id: '2', id: '2',
activityName: 'tony', activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`, activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08', startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }), endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe'})}`, outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe'})}`, innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
}, },
{ {
id: '3', id: '3',
activityName: 'tony', activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`, activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08', startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }), endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe'})}`, outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe'})}`, innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
} }
] ]
/* 多选返回的 */ /* 多选返回的 */
...@@ -98,7 +98,7 @@ const Search = () => { ...@@ -98,7 +98,7 @@ const Search = () => {
return ( return (
<TableLayout <TableLayout
columns={columns} columns={columns}
effects="name" effects="id"
fetch={mokiData} fetch={mokiData}
selectedRow={true} selectedRow={true}
fetchRowkeys={fetchRowkeys} fetchRowkeys={fetchRowkeys}
...@@ -106,23 +106,19 @@ const Search = () => { ...@@ -106,23 +106,19 @@ const Search = () => {
type: 'object', type: 'object',
properties: { properties: {
mageLayout: { mageLayout: {
type: 'object', type: "object",
'x-component': 'Mega-Layout', "x-component": "flex-layout",
properties: { "x-component-props": {
topLayout: { rowStyle: {
type: 'object', justifyContent: 'space-between'
'x-component': 'Mega-Layout', }
'x-component-props': {
grid: true,
}, },
properties: { properties: {
id: {
name: {
type: 'string', type: 'string',
'x-component': 'Search', 'x-component': 'Search',
'x-component-props': { 'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.sousuo'})}`, placeholder: '活动ID'
tip: intl.formatMessage({ id: 'marketingAbility.shuruhuiyuanming' }),
}, },
}, },
}, },
...@@ -130,54 +126,67 @@ const Search = () => { ...@@ -130,54 +126,67 @@ const Search = () => {
[FORM_FILTER_PATH]: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
'x-component': 'Flex-Layout', 'x-component': 'Flex-Layout',
'x-component-props': { "x-component-props": {
colStyle: { rowStyle: {
marginLeft: 20, justifyContent: "flex-start",
flexWrap: "nowrap"
}, },
colStyle: {//改变间隔
marginRight: 20
}
}, },
properties: { properties: {
subject: { activityName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.kaopingzhuti'})}`, placeholder: `活动名称`,
allowClear: true, allowClear: true,
style: { style: {
width: 160, width: 160,
}, },
}, },
}, },
'[appraisalDayStart,appraisalDayEnd]': { '[startTime,endTime]': {
type: 'daterange', type: 'daterange',
'x-component-props': { 'x-component-props': {
placeholder: [`${intl.formatMessage({ id: 'marketingAbility.kaopingkaishishijian'})}`, `${intl.formatMessage({ id: 'marketingAbility.kaopingwanchengshijian'})}`], placeholder: [`${intl.formatMessage({ id: 'marketingAbility.kaopingkaishishijian' })}`, `${intl.formatMessage({ id: 'marketingAbility.kaopingwanchengshijian' })}`],
allowClear: true, allowClear: true,
style: { style: {
width: 240, width: 240,
}, },
}, },
}, },
status: { activityType: {
type: 'string', type: 'string',
default: undefined, default: undefined,
enum: [], enum: [],
'x-component-props': { 'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai(quanbu)'})}`, placeholder: `活动类型`,
allowClear: true,
style: {
width: 160,
},
},
},
outerStatus: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: `外部状态`,
allowClear: true, allowClear: true,
style: { style: {
width: 160, width: 160,
}, },
}, },
}, },
submit: { submit: {
'x-component': 'Submit', 'x-component': 'Submit',
'x-mega-props': { 'x-mega-props': {
span: 1, span: 1,
}, },
'x-component-props': { 'x-component-props': {
children: `${intl.formatMessage({ id: 'marketingAbility.chaxun'})}`, children: `${intl.formatMessage({ id: 'marketingAbility.chaxun' })}`,
},
},
}, },
}, },
}, },
......
src/pages/transaction/marketingAbility/selfbuiltexeCution/search/index.tsx
View file @ 7b5b9ac9
...@@ -13,44 +13,44 @@ const Search = () => { ...@@ -13,44 +13,44 @@ const Search = () => {
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName', dataIndex: 'activityName',
align: 'left', align: 'left',
render: (text) => render: (text) =>
<span style={{ color: '#00B37A' }}>{text}</span> <span style={{ color: '#00B37A' }}>{text}</span>
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityType', dataIndex: 'activityType',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime', dataIndex: 'startTime',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime', dataIndex: 'endTime',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian' })}`,
dataIndex: 'startTime', dataIndex: 'startTime',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'id', dataIndex: 'id',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'id', dataIndex: 'id',
align: 'left', align: 'left',
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
dataIndex: 'outerStatus', dataIndex: 'outerStatus',
align: 'left', align: 'left',
render: (text) => ( render: (text) => (
...@@ -58,7 +58,7 @@ const Search = () => { ...@@ -58,7 +58,7 @@ const Search = () => {
) )
}, },
{ {
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai'})}`, title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' })}`,
dataIndex: 'innerStatus', dataIndex: 'innerStatus',
align: 'left', align: 'left',
}] }]
...@@ -66,39 +66,40 @@ const Search = () => { ...@@ -66,39 +66,40 @@ const Search = () => {
{ {
id: '1', id: '1',
activityName: 'tony', activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`, activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08', startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }), endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe'})}`, outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe'})}`, innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
}, },
{ {
id: '2', id: '2',
activityName: 'tony', activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`, activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08', startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }), endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe'})}`, outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe'})}`, innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
}, },
{ {
id: '3', id: '3',
activityName: 'tony', activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`, activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha' })}`,
startTime: '2020-05-12 08:08', startTime: '2020-05-12 08:08',
endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }), endTime: intl.formatMessage({ id: 'marketingAbility.haisheng59miao' }),
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe'})}`, outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe'})}`, innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
} }
] ]
/* 多选返回的 */ /* 多选返回的 */
const fetchRowkeys = (row) => { const fetchRowkeys = (row) => {
console.log(row); console.log(row);
} }
return ( return (
<TableLayout <TableLayout
columns={columns} columns={columns}
effects="name" effects="id"
fetch={mokiData} fetch={mokiData}
selectedRow={true} selectedRow={true}
fetchRowkeys={fetchRowkeys} fetchRowkeys={fetchRowkeys}
...@@ -106,23 +107,19 @@ const Search = () => { ...@@ -106,23 +107,19 @@ const Search = () => {
type: 'object', type: 'object',
properties: { properties: {
mageLayout: { mageLayout: {
type: 'object', type: "object",
'x-component': 'Mega-Layout', "x-component": "flex-layout",
properties: { "x-component-props": {
topLayout: { rowStyle: {
type: 'object', justifyContent: 'space-between'
'x-component': 'Mega-Layout', }
'x-component-props': {
grid: true,
}, },
properties: { properties: {
id: {
name: {
type: 'string', type: 'string',
'x-component': 'Search', 'x-component': 'Search',
'x-component-props': { 'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.sousuo'})}`, placeholder: '活动ID'
tip: intl.formatMessage({ id: 'marketingAbility.shuruhuiyuanming' }),
}, },
}, },
}, },
...@@ -130,54 +127,67 @@ const Search = () => { ...@@ -130,54 +127,67 @@ const Search = () => {
[FORM_FILTER_PATH]: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
'x-component': 'Flex-Layout', 'x-component': 'Flex-Layout',
'x-component-props': { "x-component-props": {
colStyle: { rowStyle: {
marginLeft: 20, justifyContent: "flex-start",
flexWrap: "nowrap"
}, },
colStyle: {//改变间隔
marginRight: 20
}
}, },
properties: { properties: {
subject: { activityName: {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.kaopingzhuti'})}`, placeholder: `活动名称`,
allowClear: true, allowClear: true,
style: { style: {
width: 160, width: 160,
}, },
}, },
}, },
'[appraisalDayStart,appraisalDayEnd]': { '[startTime,endTime]': {
type: 'daterange', type: 'daterange',
'x-component-props': { 'x-component-props': {
placeholder: [`${intl.formatMessage({ id: 'marketingAbility.kaopingkaishishijian'})}`, `${intl.formatMessage({ id: 'marketingAbility.kaopingwanchengshijian'})}`], placeholder: [`${intl.formatMessage({ id: 'marketingAbility.kaopingkaishishijian' })}`, `${intl.formatMessage({ id: 'marketingAbility.kaopingwanchengshijian' })}`],
allowClear: true, allowClear: true,
style: { style: {
width: 240, width: 240,
}, },
}, },
}, },
status: { activityType: {
type: 'string', type: 'string',
default: undefined, default: undefined,
enum: [], enum: [],
'x-component-props': { 'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai(quanbu)'})}`, placeholder: `活动类型`,
allowClear: true,
style: {
width: 160,
},
},
},
outerStatus: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: `外部状态`,
allowClear: true, allowClear: true,
style: { style: {
width: 160, width: 160,
}, },
}, },
}, },
submit: { submit: {
'x-component': 'Submit', 'x-component': 'Submit',
'x-mega-props': { 'x-mega-props': {
span: 1, span: 1,
}, },
'x-component-props': { 'x-component-props': {
children: `${intl.formatMessage({ id: 'marketingAbility.chaxun'})}`, children: `${intl.formatMessage({ id: 'marketingAbility.chaxun' })}`,
},
},
}, },
}, },
}, },
......
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