Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
acc05b6c
Commit
acc05b6c
authored
Dec 04, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 添加 会员管理流程规则配置 CN国际化
parent
590850fc
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
194 additions
and
90 deletions
+194
-90
member.ts
src/locales/zh-CN/member.ts
+70
-0
index.tsx
...nents/FlowRuleForm/components/ComingConfigTable/index.tsx
+12
-9
index.tsx
...le/components/FlowRuleForm/components/ComingCtl/index.tsx
+11
-8
schema.ts
...le/components/FlowRuleForm/components/ComingCtl/schema.ts
+6
-3
index.tsx
...onents/FlowRuleForm/components/FlowListFormItem/index.tsx
+5
-2
index.tsx
...ents/FlowRuleForm/components/MemberRoleFormItem/index.tsx
+18
-15
schema.ts
...ents/FlowRuleForm/components/MemberRoleFormItem/schema.ts
+6
-3
index.tsx
...nts/FlowRuleForm/components/PlatformConfigTable/index.tsx
+10
-7
index.tsx
...wRule/components/FlowRuleForm/components/Search/index.tsx
+5
-2
index.tsx
...s/member/memberFlowRule/components/FlowRuleForm/index.tsx
+10
-8
schema.ts
...s/member/memberFlowRule/components/FlowRuleForm/schema.ts
+14
-11
index.tsx
src/pages/member/memberFlowRule/index.tsx
+21
-19
index.tsx
src/pages/member/memberFlowRule/schema/index.tsx
+6
-3
No files found.
src/locales/zh-CN/member.ts
View file @
acc05b6c
...
...
@@ -271,6 +271,76 @@ export default {
'member.management.memberUpgradeRule.login.rules-legal'
:
'请输入整数数值'
,
'member.management.memberUpgradeRule.comment.rules-legal'
:
'请输入整数数值'
,
'member.management.memberUpgradeRule.save'
:
'保存'
,
// 会员管理流程规则配置
'member.management.memberFlowRule.delete.message'
:
'正在删除'
,
'member.management.memberFlowRule.modify.message'
:
'正在修改'
,
'member.management.memberFlowRule.defaultColumns.id'
:
'ID'
,
'member.management.memberFlowRule.defaultColumns.ruleName'
:
'流程规则名称'
,
'member.management.memberFlowRule.defaultColumns.roleName'
:
'会员角色'
,
'member.management.memberFlowRule.defaultColumns.roleTypeName'
:
'角色类型'
,
'member.management.memberFlowRule.defaultColumns.memberTypeName'
:
'会员类型'
,
'member.management.memberFlowRule.defaultColumns.businessTypeName'
:
'业务类型'
,
'member.management.memberFlowRule.defaultColumns.createTime'
:
'操作时间'
,
'member.management.memberFlowRule.defaultColumns.status'
:
'状态'
,
'member.management.memberFlowRule.modify'
:
'编辑'
,
'member.management.memberFlowRule.delete'
:
'删除'
,
'member.management.memberFlowRule.delete.tip'
:
'确定要删除吗?'
,
'member.management.memberFlowRule.delete.yes'
:
'是'
,
'member.management.memberFlowRule.delete.no'
:
'否'
,
'member.management.memberFlowRule.add'
:
'新建'
,
'member.management.memberFlowRule.name.placeholder'
:
'搜索'
,
'member.management.memberFlowRule.name.tip'
:
'输入 流程规则名称 进行搜索'
,
'member.management.memberFlowRule.components.FlowRuleForm.add.message'
:
'正在添加,请稍候...'
,
'member.management.memberFlowRule.components.FlowRuleForm.save.message'
:
'正在保存,请稍候...'
,
'member.management.memberFlowRule.components.FlowRuleForm.back'
:
'返回'
,
'member.management.memberFlowRule.components.FlowRuleForm.title-add'
:
'新增会员管理流程规则'
,
'member.management.memberFlowRule.components.FlowRuleForm.title-edit'
:
'编辑会员管理流程规则会员'
,
'member.management.memberFlowRule.components.FlowRuleForm.title-info'
:
'查看会员管理流程规则'
,
'member.management.memberFlowRule.components.FlowRuleForm.save'
:
'保存'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.basic'
:
'基本信息'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.basic.ruleName'
:
'流程规则名称'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.basic.ruleName.placeholder'
:
'请输入'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.basic.memberRole'
:
'适用会员角色'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.flow'
:
'会员入库流程'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.flow.depositoryProcessId'
:
'流程选择'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.platformConfig'
:
'平台注册资料'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.configIds'
:
'入库资料'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.changed'
:
'会员变更流程'
,
'member.management.memberFlowRule.components.FlowRuleForm.form.changed.changedProcessId'
:
'流程选择'
,
'member.management.memberFlowRule.components.ComingConfigTable.columns.id'
:
'ID'
,
'member.management.memberFlowRule.components.ComingConfigTable.columns.fieldLocalName'
:
'中文名称'
,
'member.management.memberFlowRule.components.ComingConfigTable.columns.groupName'
:
'分组名称'
,
'member.management.memberFlowRule.components.ComingConfigTable.delete'
:
'删除'
,
'member.management.memberFlowRule.components.ComingConfigTable.delete.tip'
:
'确定要删除吗?'
,
'member.management.memberFlowRule.components.ComingConfigTable.delete.yes'
:
'是'
,
'member.management.memberFlowRule.components.ComingConfigTable.delete.no'
:
'否'
,
'member.management.memberFlowRule.components.ComingCtl.columns.id'
:
'ID'
,
'member.management.memberFlowRule.components.ComingCtl.columns.fieldLocalName'
:
'中文名称'
,
'member.management.memberFlowRule.components.ComingCtl.columns.groupName'
:
'分组名称'
,
'member.management.memberFlowRule.components.ComingCtl.add'
:
'新建入库资料'
,
'member.management.memberFlowRule.components.ComingCtl.drawer.title'
:
'选择入库资料'
,
'member.management.memberFlowRule.components.ComingCtl.name.placeholder'
:
'搜索'
,
'member.management.memberFlowRule.components.ComingCtl.name.tip'
:
'输入 中文名称 进行搜索'
,
'member.management.memberFlowRule.components.FlowListFormItem.visible'
:
'显示更多'
,
'member.management.memberFlowRule.components.FlowListFormItem.hide'
:
'隐藏更多'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.roleId'
:
'ID'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.confirm.warning'
:
'请选择会员角色'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.select'
:
'选择'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.roleName'
:
'会员角色'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.roleTypeName'
:
'角色类型'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.memberTypeName'
:
'会员类型'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.businessTypeName'
:
'业务类型'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.drawer.title'
:
'选择会员角色'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.name.placeholder'
:
'搜索'
,
'member.management.memberFlowRule.components.MemberRoleFormItem.name.tip'
:
'输入 中文名称 进行搜索'
,
'member.management.memberFlowRule.components.PlatformConfigTable.columns.id'
:
'ID'
,
'member.management.memberFlowRule.components.PlatformConfigTable.columns.fieldLocalName'
:
'中文名称'
,
'member.management.memberFlowRule.components.PlatformConfigTable.columns.groupName'
:
'分组信息'
,
'member.management.memberFlowRule.components.PlatformConfigTable.title'
:
'平台注册资料'
,
'member.management.memberFlowRule.components.PlatformConfigTable.title-description'
:
'会员在平台注册时已填写的资料'
,
'member.management.memberFlowRule.components.PlatformConfigTable.default'
:
'使用平台注册资料(默认)'
,
'member.management.memberFlowRule.components.Search.reset'
:
'重置'
,
// 会员状态
'member.status.notAaudit'
:
'待审核'
,
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/ComingConfigTable/index.tsx
View file @
acc05b6c
...
...
@@ -2,10 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-28 15:24:56
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
07-03 14:10:53
* @LastEditTime: 2021-
12-04 17:22:19
* @Description:
*/
import
React
,
{
useState
}
from
'react'
;
import
{
useIntl
}
from
'umi'
;
import
{
Popconfirm
,
Button
,
Row
,
Col
}
from
'antd'
;
import
theme
from
'../../../../../../../../config/lingxi.theme.config'
;
import
PolymericTable
from
'@/components/PolymericTable'
;
...
...
@@ -28,6 +29,8 @@ const ComingConfigTable = (props) => {
const
[
page
,
setPage
]
=
useState
(
1
);
const
[
size
,
setSize
]
=
useState
(
PAGE_SIZE
);
const
intl
=
useIntl
();
const
handleDelete
=
(
id
:
number
)
=>
{
const
newData
=
[...
value
];
const
index
=
newData
.
findIndex
((
item
)
=>
item
.
id
===
id
);
...
...
@@ -39,35 +42,35 @@ const ComingConfigTable = (props) => {
const
columns
:
EditableColumns
[]
=
[
{
title
:
'ID'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.columns.id'
})
,
dataIndex
:
'id'
,
},
{
title
:
'中文名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.columns.fieldLocalName'
})
,
dataIndex
:
'fieldLocalName'
,
},
{
title
:
'分组名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.columns.groupName'
})
,
dataIndex
:
'groupName'
,
},
{
title
:
'操作'
,
title
:
intl
.
formatMessage
({
id
:
'common.table.action'
})
,
dataIndex
:
'option'
,
width
:
'20%'
,
render
:
(
_
,
record
:
any
)
=>
(
<>
{
editable
&&
(
<
Popconfirm
title=
"确定要删除吗?"
okText=
"是"
cancelText=
"否"
title=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.delete.tip'
})
}
okText=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.delete.yes'
})
}
cancelText=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.delete.no'
})
}
onConfirm=
{
()
=>
handleDelete
(
record
.
id
)
}
>
<
Button
type=
"link"
danger
>
删除
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingConfigTable.delete'
})
}
</
Button
>
</
Popconfirm
>
)
}
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/ComingCtl/index.tsx
View file @
acc05b6c
...
...
@@ -2,10 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-28 15:19:56
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-1
1-17 11:43:11
* @LastEditTime: 2021-1
2-04 17:26:12
* @Description: 入库资料操作组
*/
import
React
,
{
useState
,
useRef
,
useEffect
}
from
'react'
;
import
{
useIntl
}
from
'umi'
;
import
{
PlusOutlined
}
from
'@ant-design/icons'
;
import
{
Space
,
Button
,
Drawer
}
from
'antd'
;
import
{
StandardTable
}
from
'god'
;
...
...
@@ -63,19 +64,21 @@ const ComingCtl = (props: IProps) => {
const
ref
=
useRef
<
any
>
({});
const
intl
=
useIntl
();
const
[
rowSelection
,
RowCtl
]
=
useRowSelectionTable
({
customKey
:
'id'
});
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'ID'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.columns.id'
})
,
dataIndex
:
'id'
,
},
{
title
:
'中文名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.columns.fieldLocalName'
})
,
dataIndex
:
'fieldLocalName'
,
},
{
title
:
'分组名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.columns.groupName'
})
,
dataIndex
:
'groupName'
,
},
];
...
...
@@ -126,7 +129,7 @@ const ComingCtl = (props: IProps) => {
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
handleVisibleDrawer
(
true
)
}
>
新建入库资料
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.add'
})
}
</
Button
>
)
}
{
/* <Button>
...
...
@@ -135,7 +138,7 @@ const ComingCtl = (props: IProps) => {
</
Space
>
<
Drawer
title=
"选择入库资料"
title=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.drawer.title'
})
}
width=
{
1000
}
onClose=
{
()
=>
handleVisibleDrawer
(
false
)
}
visible=
{
visibleDrawer
}
...
...
@@ -146,10 +149,10 @@ const ComingCtl = (props: IProps) => {
}
}
>
<
Button
onClick=
{
()
=>
handleVisibleDrawer
(
false
)
}
style=
{
{
marginRight
:
16
}
}
>
取 消
{
intl
.
formatMessage
({
id
:
'member.actions.cancel'
})
}
</
Button
>
<
Button
onClick=
{
handleConfirm
}
type=
"primary"
>
确 定
{
intl
.
formatMessage
({
id
:
'member.actions.confirm'
})
}
</
Button
>
</
div
>
}
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/ComingCtl/schema.ts
View file @
acc05b6c
...
...
@@ -2,11 +2,14 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 18:01:56
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
05-28 11:07:1
8
* @LastEditTime: 2021-
12-04 17:27:2
8
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
const
querySchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
...
...
@@ -18,8 +21,8 @@ const querySchema: ISchema = {
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索'
,
tip
:
'输入 中文名称 进行搜索'
,
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.name.placeholder'
})
,
tip
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.ComingCtl.name.tip'
})
,
advanced
:
false
,
align
:
'flex-left'
,
},
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/FlowListFormItem/index.tsx
View file @
acc05b6c
...
...
@@ -2,10 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-28 11:20:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
06-01 13:58:17
* @LastEditTime: 2021-
12-04 17:29:08
* @Description: 流程列表 Form Item
*/
import
React
,
{
useState
}
from
'react'
;
import
{
useIntl
}
from
'umi'
;
import
{
CaretDownOutlined
,
CaretUpOutlined
}
from
'@ant-design/icons'
;
import
classNames
from
'classnames'
;
import
StatusTag
,
{
StatusTagProps
}
from
'@/components/StatusTag'
;
...
...
@@ -69,6 +70,8 @@ const FlowListFormItem = (props: IProps) => {
}
=
props
;
const
[
showMore
,
setShowMore
]
=
useState
(
false
);
const
intl
=
useIntl
();
const
showDataSource
=
!
showMore
&&
!
readOnly
?
[...
dataSource
].
splice
(
0
,
showCount
)
:
dataSource
;
const
handleToogleMore
=
()
=>
{
...
...
@@ -111,7 +114,7 @@ const FlowListFormItem = (props: IProps) => {
className=
{
styles
.
more
}
onClick=
{
handleToogleMore
}
>
{
!
showMore
?
'显示更多'
:
'隐藏更多'
}
{
!
showMore
?
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowListFormItem.visible'
})
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowListFormItem.hide'
})
}
{
!
showMore
?
<
CaretDownOutlined
/>
:
<
CaretUpOutlined
/>
}
</
div
>
)
}
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/MemberRoleFormItem/index.tsx
View file @
acc05b6c
...
...
@@ -2,10 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 17:12:55
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-1
1-17 11:43:19
* @LastEditTime: 2021-1
2-04 17:35:36
* @Description: 适用会员角色 Form Item
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
useIntl
}
from
'umi'
;
import
{
Button
,
Descriptions
,
Drawer
,
message
}
from
'antd'
;
import
{
PlusOutlined
,
...
...
@@ -57,27 +58,29 @@ const MemberRoleFormItem = (props) => {
}
=
props
;
const
[
visibleDrawer
,
setVisibleDrawer
]
=
useState
(
false
);
const
intl
=
useIntl
();
const
[
rowSelection
,
RowCtl
]
=
useRowSelectionTable
({
customKey
:
'roleId'
,
type
:
'radio'
});
const
columns
:
ColumnType
<
ValueType
>
[]
=
[
{
title
:
'ID'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.roleId'
})
,
dataIndex
:
'roleId'
,
},
{
title
:
'会员角色'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.roleName'
})
,
dataIndex
:
'roleName'
,
},
{
title
:
'角色类型'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.roleTypeName'
})
,
dataIndex
:
'roleTypeName'
,
},
{
title
:
'会员类型'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.memberTypeName'
})
,
dataIndex
:
'memberTypeName'
,
},
{
title
:
'业务类型'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.businessTypeName'
})
,
dataIndex
:
'businessTypeName'
,
},
];
...
...
@@ -95,7 +98,7 @@ const MemberRoleFormItem = (props) => {
const
handleConfirm
=
()
=>
{
if
(
!
RowCtl
.
selectRow
.
length
)
{
message
.
warning
(
'请选择会员角色'
);
message
.
warning
(
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.confirm.warning'
})
);
}
mutators
.
change
(
RowCtl
.
selectRow
[
0
]);
handleVisibleDrawer
(
false
);
...
...
@@ -111,19 +114,19 @@ const MemberRoleFormItem = (props) => {
disabled=
{
!
editable
}
block
>
选择
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.select'
})
}
</
Button
>
<
div
className=
{
styles
[
'memberRole-stamp'
]
}
>
<
Descriptions
column=
{
1
}
>
<
Descriptions
.
Item
label=
"会员角色"
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
roleName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"角色类型"
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
roleTypeName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"会员类型"
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
memberTypeName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"业务类型"
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
businessTypeName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.roleName'
})
}
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
roleName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.roleTypeName'
})
}
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
roleTypeName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.memberTypeName'
})
}
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
memberTypeName
||
''
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.businessTypeName'
})
}
labelStyle=
{
{
width
:
104
}
}
>
{
value
?.
businessTypeName
||
''
}
</
Descriptions
.
Item
>
</
Descriptions
>
</
div
>
<
Drawer
title=
"选择会员角色"
title=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.drawer.title'
})
}
width=
{
1000
}
onClose=
{
()
=>
handleVisibleDrawer
(
false
)
}
visible=
{
visibleDrawer
}
...
...
@@ -137,10 +140,10 @@ const MemberRoleFormItem = (props) => {
}
}
>
<
Button
onClick=
{
()
=>
handleVisibleDrawer
(
false
)
}
style=
{
{
marginRight
:
16
}
}
>
取 消
{
intl
.
formatMessage
({
id
:
'member.actions.cancel'
})
}
</
Button
>
<
Button
onClick=
{
handleConfirm
}
type=
"primary"
>
确 定
{
intl
.
formatMessage
({
id
:
'member.actions.confirm'
})
}
</
Button
>
</
div
>
}
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/MemberRoleFormItem/schema.ts
View file @
acc05b6c
...
...
@@ -2,11 +2,14 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 18:01:56
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
07-16 14:52:5
3
* @LastEditTime: 2021-
12-04 17:36:3
3
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
const
querySchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
...
...
@@ -17,8 +20,8 @@ const querySchema: ISchema = {
},
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索'
,
tip
:
'输入 中文名称 进行搜索'
,
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.name.placeholder'
})
,
tip
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.MemberRoleFormItem.name.tip'
})
,
advanced
:
false
,
align
:
'flex-left'
,
},
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/PlatformConfigTable/index.tsx
View file @
acc05b6c
...
...
@@ -2,10 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-28 15:06:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-1
1-17 11:46:25
* @LastEditTime: 2021-1
2-04 17:40:06
* @Description: 平台注册资料
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
useIntl
}
from
'umi'
;
import
{
Row
,
Col
,
Descriptions
,
Checkbox
,
Tooltip
}
from
'antd'
;
import
{
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
theme
from
'../../../../../../../../config/lingxi.theme.config'
;
...
...
@@ -52,17 +53,19 @@ const PlatformConfigTable = (props: IProps) => {
const
[
loading
,
setLoading
]
=
useState
(
false
);
const
[
data
,
setData
]
=
useState
({
data
:
[],
totalCount
:
0
});
const
intl
=
useIntl
();
const
columns
:
EditableColumns
[]
=
[
{
title
:
'ID'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.PlatformConfigTable.columns.id'
})
,
dataIndex
:
'id'
,
},
{
title
:
'中文名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.PlatformConfigTable.columns.fieldLocalName'
})
,
dataIndex
:
'fieldLocalName'
,
},
{
title
:
'分组信息'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.PlatformConfigTable.columns.groupName'
})
,
dataIndex
:
'groupName'
,
},
];
...
...
@@ -120,8 +123,8 @@ const PlatformConfigTable = (props: IProps) => {
<Descriptions.Item
label={(
<div style={{ display: 'flex', alignItems: 'center' }}>
平台注册资料
<Tooltip title=
"会员在平台注册时已填写的资料"
>
{intl.formatMessage({ id: 'member.management.memberFlowRule.components.PlatformConfigTable.title' })}
<Tooltip title=
{intl.formatMessage({ id: 'member.management.memberFlowRule.components.PlatformConfigTable.title-description' })}
>
<QuestionCircleOutlined
style={{ margin: '0 3px', cursor: 'default', marginLeft: 3 }}
size={16}
...
...
@@ -134,7 +137,7 @@ const PlatformConfigTable = (props: IProps) => {
paddingBottom: 0,
}}
>
<Checkbox checked disabled>
使用平台注册资料(默认)
</Checkbox>
<Checkbox checked disabled>
{intl.formatMessage({ id: 'member.management.memberFlowRule.components.PlatformConfigTable.default' })}
</Checkbox>
</Descriptions.Item>
</Descriptions>
</Col>
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/components/Search/index.tsx
View file @
acc05b6c
...
...
@@ -2,10 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-28 14:30:06
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
07-03 14:02:39
* @LastEditTime: 2021-
12-04 17:41:01
* @Description: 搜索组件
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
useIntl
}
from
'umi'
;
import
{
Input
,
Button
}
from
'antd'
;
import
styles
from
'./index.less'
;
...
...
@@ -43,6 +44,8 @@ const MySearch: React.FC<IProps> = (props: IProps) => {
}
=
props
;
const
[
keyword
,
setKeyword
]
=
useState
(
''
);
const
intl
=
useIntl
();
useEffect
(()
=>
{
if
(
'value'
in
props
)
{
setKeyword
(
value
);
...
...
@@ -86,7 +89,7 @@ const MySearch: React.FC<IProps> = (props: IProps) => {
<
Button
onClick=
{
handleReset
}
>
重置
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.Search.reset'
})
}
</
Button
>
</
div
>
);
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/index.tsx
View file @
acc05b6c
...
...
@@ -2,11 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 16:13:05
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-1
1-17 11:42:59
* @LastEditTime: 2021-1
2-04 17:12:53
* @Description:
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
history
,
Prompt
}
from
'umi'
;
import
{
history
,
Prompt
,
useIntl
}
from
'umi'
;
import
{
Button
,
Card
,
Spin
,
Tooltip
,
message
}
from
'antd'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
SaveOutlined
}
from
'@ant-design/icons'
;
...
...
@@ -59,6 +59,8 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
const
[
infoLoading
,
setInfoLoading
]
=
useState
(
false
);
const
[
unsaved
,
setUnsaved
]
=
useState
(
false
);
const
intl
=
useIntl
();
const
getDetailedInfo
=
async
()
=>
{
if
(
!
id
)
{
return
;
...
...
@@ -110,7 +112,7 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
if
(
!
id
&&
isEdit
)
{
setSubmitLoading
(
true
);
const
msg
=
message
.
loading
({
content
:
'正在添加,请稍候...'
,
content
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.add.message'
})
,
duration
:
0
,
});
postMemberProcessRuleAdd
({
...
...
@@ -136,7 +138,7 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
if
(
id
&&
isEdit
)
{
setSubmitLoading
(
true
);
const
msg
=
message
.
loading
({
content
:
'正在保存,请稍候...'
,
content
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.save.message'
})
,
duration
:
0
,
});
postMemberProcessRuleUpdate
({
...
...
@@ -168,8 +170,8 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
padding
:
24
,
}
}
onBack=
{
()
=>
history
.
goBack
()
}
backIcon=
{
<
ReutrnEle
description=
"返回"
/>
}
title=
{
!
id
?
'新增会员管理流程规则'
:
isEdit
?
'编辑会员管理流程规则会员'
:
'查看会员管理流程规则'
}
backIcon=
{
<
ReutrnEle
description=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.back'
})
}
/>
}
title=
{
!
id
?
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.title-add'
})
:
isEdit
?
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.title-edit'
})
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.title-info'
})
}
extra=
{
[
(
isEdit
?
(
<
Button
...
...
@@ -179,7 +181,7 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
loading=
{
submitLoading
}
onClick=
{
()
=>
formActions
.
submit
()
}
>
保存
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.save'
})
}
</
Button
>
)
:
null
),
]
}
...
...
@@ -212,7 +214,7 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
</
Card
>
</
PageHeaderWrapper
>
<
Prompt
when=
{
unsaved
}
message=
"您还有未保存的内容,是否确定要离开?"
/>
<
Prompt
when=
{
unsaved
}
message=
{
intl
.
formatMessage
({
id
:
'common.tip.save.confirm'
})
}
/>
</
Spin
>
);
};
...
...
src/pages/member/memberFlowRule/components/FlowRuleForm/schema.ts
View file @
acc05b6c
...
...
@@ -2,11 +2,14 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 16:13:26
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
08-12 09:36:50
* @LastEditTime: 2021-
12-04 17:18:09
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
const
formSchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
...
...
@@ -21,7 +24,7 @@ const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'TabPane'
,
'x-component-props'
:
{
tab
:
'基本信息'
,
tab
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.basic'
})
,
},
properties
:
{
MEGA_LAYOUT1
:
{
...
...
@@ -36,9 +39,9 @@ const formSchema: ISchema = {
ruleName
:
{
type
:
'string'
,
required
:
true
,
title
:
'流程规则名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.basic.ruleName'
})
,
'x-component-props'
:
{
placeholder
:
'请输入'
,
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.basic.ruleName.placeholder'
})
,
},
'x-rules'
:
[
{
...
...
@@ -50,7 +53,7 @@ const formSchema: ISchema = {
memberRole
:
{
type
:
'string'
,
required
:
true
,
title
:
'适用会员角色'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.basic.memberRole'
})
,
'x-component'
:
'MemberRoleFormItem'
,
'x-component-props'
:
{
...
...
@@ -64,7 +67,7 @@ const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'TabPane'
,
'x-component-props'
:
{
tab
:
'会员入库流程'
,
tab
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.flow'
})
,
},
properties
:
{
MEGA_LAYOUT1
:
{
...
...
@@ -79,7 +82,7 @@ const formSchema: ISchema = {
depositoryProcessId
:
{
type
:
'string'
,
required
:
true
,
title
:
'流程选择'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.flow.depositoryProcessId'
})
,
'x-component'
:
'FlowListFormItem'
,
'x-component-props'
:
{
dataSource
:
[],
...
...
@@ -94,7 +97,7 @@ const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'TabPane'
,
'x-component-props'
:
{
tab
:
'平台注册资料'
,
tab
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.platformConfig'
})
,
},
properties
:
{
// MEGA_LAYOUT1: {
...
...
@@ -141,7 +144,7 @@ const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'TabPane'
,
'x-component-props'
:
{
tab
:
'入库资料'
,
tab
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.configIds'
})
,
},
properties
:
{
configIds
:
{
...
...
@@ -155,7 +158,7 @@ const formSchema: ISchema = {
type
:
'object'
,
'x-component'
:
'TabPane'
,
'x-component-props'
:
{
tab
:
'会员变更流程'
,
tab
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.changed'
})
,
},
properties
:
{
MEGA_LAYOUT1
:
{
...
...
@@ -170,7 +173,7 @@ const formSchema: ISchema = {
changedProcessId
:
{
type
:
'string'
,
required
:
true
,
title
:
'流程选择'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.components.FlowRuleForm.form.changed.changedProcessId'
})
,
'x-component'
:
'FlowListFormItem'
,
'x-component-props'
:
{
dataSource
:
[],
...
...
src/pages/member/memberFlowRule/index.tsx
View file @
acc05b6c
...
...
@@ -2,11 +2,11 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 16:01:23
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-1
1-17 11:47:11
* @LastEditTime: 2021-1
2-04 17:04:10
* @Description: 会员管理流程规则配置
*/
import
React
,
{
useState
,
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
history
,
useIntl
}
from
'umi'
;
import
{
Card
,
Space
,
...
...
@@ -50,9 +50,11 @@ const fetchListData = async (params: any) => {
const
MemberFlowRule
:
React
.
FC
<
[]
>
=
()
=>
{
const
ref
=
useRef
<
any
>
({});
const
intl
=
useIntl
();
const
handleDelete
=
(
id
:
number
)
=>
{
const
mesInstance
=
message
.
loading
({
content
:
'正在删除'
,
content
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.delete.message'
})
,
duration
:
0
,
});
postMemberProcessRuleDelete
({
...
...
@@ -69,7 +71,7 @@ const MemberFlowRule: React.FC<[]> = () => {
const
handleModify
=
(
id
:
number
,
status
:
number
)
=>
{
const
mesInstance
=
message
.
loading
({
content
:
'正在修改'
,
content
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.modify.message'
})
,
duration
:
0
,
});
postMemberProcessRuleUpdateStatus
({
...
...
@@ -87,11 +89,11 @@ const MemberFlowRule: React.FC<[]> = () => {
const
defaultColumns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'ID'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.id'
})
,
dataIndex
:
'id'
,
},
{
title
:
'流程规则名称'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.ruleName'
})
,
dataIndex
:
'ruleName'
,
render
:
(
text
,
record
)
=>
(
<>
...
...
@@ -104,27 +106,27 @@ const MemberFlowRule: React.FC<[]> = () => {
),
},
{
title
:
'会员角色'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.roleName'
})
,
dataIndex
:
'roleName'
,
},
{
title
:
'角色类型'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.roleTypeName'
})
,
dataIndex
:
'roleTypeName'
,
},
{
title
:
'会员类型'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.memberTypeName'
})
,
dataIndex
:
'memberTypeName'
,
},
{
title
:
'业务类型'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.businessTypeName'
})
,
dataIndex
:
'businessTypeName'
,
},
{
title
:
'操作时间'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.createTime'
})
,
dataIndex
:
'createTime'
,
},
{
title
:
'状态'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.defaultColumns.status'
})
,
dataIndex
:
'status'
,
render
:
(
_
,
record
)
=>
(
<
StatusSwitch
...
...
@@ -135,7 +137,7 @@ const MemberFlowRule: React.FC<[]> = () => {
),
},
{
title
:
'操作'
,
title
:
intl
.
formatMessage
({
id
:
'common.table.action'
})
,
dataIndex
:
'option'
,
width
:
'20%'
,
render
:
(
_
,
record
:
any
)
=>
(
...
...
@@ -146,19 +148,19 @@ const MemberFlowRule: React.FC<[]> = () => {
history
.
push
(
`/memberCenter/memberAbility/ruleConfiguration/memberFlowRule/edit?id=${record.id}`
)
}
>
编辑
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.modify'
})
}
</
Button
>
<
Popconfirm
title=
"确定要删除吗?"
okText=
"是"
cancelText=
"否"
title=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.delete.tip'
})
}
okText=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.delete.yes'
})
}
cancelText=
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.delete.no'
})
}
onConfirm=
{
()
=>
handleDelete
(
record
.
id
)
}
>
<
Button
type=
"link"
danger
>
删除
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.delete'
})
}
</
Button
>
</
Popconfirm
>
</>
...
...
@@ -178,7 +180,7 @@ const MemberFlowRule: React.FC<[]> = () => {
}
>
<
PlusOutlined
/>
新建
{
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.add'
})
}
</
Button
>
</
Space
>
</>
...
...
src/pages/member/memberFlowRule/schema/index.tsx
View file @
acc05b6c
...
...
@@ -2,11 +2,14 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 16:04:23
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-
05-27 16:04:24
* @LastEditTime: 2021-
12-04 17:07:10
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
export
const
querySchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
...
...
@@ -32,8 +35,8 @@ export const querySchema: ISchema = {
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'搜索'
,
tip
:
'输入 流程规则名称 进行搜索'
,
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.name.placeholder'
})
,
tip
:
intl
.
formatMessage
({
id
:
'member.management.memberFlowRule.name.tip'
})
,
advanced
:
false
,
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment