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 = () => {
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName',
align: 'left',
render: (text) =>
<span style={{ color: '#00B37A' }}>{text}</span>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityType',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
dataIndex: 'outerStatus',
align: 'left',
render: (text) => (
......@@ -58,7 +58,7 @@ const Search = () => {
)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' })}`,
dataIndex: 'innerStatus',
align: 'left',
}]
......@@ -66,29 +66,29 @@ const Search = () => {
{
id: '1',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
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'})}`,
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
},
{
id: '2',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
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'})}`,
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
},
{
id: '3',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
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'})}`,
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
}
]
/* 多选返回的 */
......@@ -98,7 +98,7 @@ const Search = () => {
return (
<TableLayout
columns={columns}
effects="name"
effects="id"
fetch={mokiData}
selectedRow={true}
fetchRowkeys={fetchRowkeys}
......@@ -106,23 +106,19 @@ const Search = () => {
type: 'object',
properties: {
mageLayout: {
type: 'object',
'x-component': 'Mega-Layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
grid: true,
type: "object",
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'space-between'
}
},
properties: {
name: {
id: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.sousuo'})}`,
tip: intl.formatMessage({ id: 'marketingAbility.shuruhuiyuanming' }),
placeholder: '活动ID'
},
},
},
......@@ -130,54 +126,67 @@ const Search = () => {
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'Flex-Layout',
'x-component-props': {
colStyle: {
marginLeft: 20,
"x-component-props": {
rowStyle: {
justifyContent: "flex-start",
flexWrap: "nowrap"
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
subject: {
activityName: {
type: 'string',
'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.kaopingzhuti'})}`,
placeholder: `活动名称`,
allowClear: true,
style: {
width: 160,
},
},
},
'[appraisalDayStart,appraisalDayEnd]': {
'[startTime,endTime]': {
type: 'daterange',
'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,
style: {
width: 240,
},
},
},
status: {
activityType: {
type: 'string',
default: undefined,
enum: [],
'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,
style: {
width: 160,
},
},
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'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 = () => {
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongmingcheng' })}`,
dataIndex: 'activityName',
align: 'left',
render: (text) =>
<span style={{ color: '#00B37A' }}>{text}</span>
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongleixing' })}`,
dataIndex: 'activityType',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongkaishishijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.huodongjieshushijian' })}`,
dataIndex: 'endTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.baomingshijian' })}`,
dataIndex: 'startTime',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.canyukehushu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.yizhixingdingdanshu' })}`,
dataIndex: 'id',
align: 'left',
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.waibuzhuangtai' })}`,
dataIndex: 'outerStatus',
align: 'left',
render: (text) => (
......@@ -58,7 +58,7 @@ const Search = () => {
)
},
{
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai'})}`,
title: `${intl.formatMessage({ id: 'marketingAbility.neibuzhuangtai' })}`,
dataIndex: 'innerStatus',
align: 'left',
}]
......@@ -66,39 +66,40 @@ const Search = () => {
{
id: '1',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
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'})}`,
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
},
{
id: '2',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
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'})}`,
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
},
{
id: '3',
activityName: 'tony',
activityType: `${intl.formatMessage({ id: 'marketingAbility.miaosha'})}`,
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'})}`,
outerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaobaopingtaishenhe' })}`,
innerStatus: `${intl.formatMessage({ id: 'marketingAbility.daitijiaoshenhe' })}`,
}
]
/* 多选返回的 */
const fetchRowkeys = (row) => {
console.log(row);
}
return (
<TableLayout
columns={columns}
effects="name"
effects="id"
fetch={mokiData}
selectedRow={true}
fetchRowkeys={fetchRowkeys}
......@@ -106,23 +107,19 @@ const Search = () => {
type: 'object',
properties: {
mageLayout: {
type: 'object',
'x-component': 'Mega-Layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
grid: true,
type: "object",
"x-component": "flex-layout",
"x-component-props": {
rowStyle: {
justifyContent: 'space-between'
}
},
properties: {
name: {
id: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.sousuo'})}`,
tip: intl.formatMessage({ id: 'marketingAbility.shuruhuiyuanming' }),
placeholder: '活动ID'
},
},
},
......@@ -130,54 +127,67 @@ const Search = () => {
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'Flex-Layout',
'x-component-props': {
colStyle: {
marginLeft: 20,
"x-component-props": {
rowStyle: {
justifyContent: "flex-start",
flexWrap: "nowrap"
},
colStyle: {//改变间隔
marginRight: 20
}
},
properties: {
subject: {
activityName: {
type: 'string',
'x-component-props': {
placeholder: `${intl.formatMessage({ id: 'marketingAbility.kaopingzhuti'})}`,
placeholder: `活动名称`,
allowClear: true,
style: {
width: 160,
},
},
},
'[appraisalDayStart,appraisalDayEnd]': {
'[startTime,endTime]': {
type: 'daterange',
'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,
style: {
width: 240,
},
},
},
status: {
activityType: {
type: 'string',
default: undefined,
enum: [],
'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,
style: {
width: 160,
},
},
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'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