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
黄庭坚
jinfa-platform
Commits
0771cd72
Commit
0771cd72
authored
Dec 11, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 会员能力翻译补漏
parent
0b727a6d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
147 additions
and
146 deletions
+147
-146
member.ts
src/locales/zh-CN/member.ts
+3
-0
index.tsx
src/pages/member/memberImport/index.tsx
+18
-18
schema.ts
src/pages/member/memberMaintain/eliminate/schema.ts
+63
-64
schema.ts
src/pages/member/memberMaintain/unfreeze/schema.ts
+63
-64
index.tsx
src/pages/member/memberPrVerifyChange2/index.tsx
+0
-0
No files found.
src/locales/zh-CN/member.ts
View file @
0771cd72
...
...
@@ -945,4 +945,7 @@ export default {
'member.caozuoren'
:
'操作人'
,
'member.bumen'
:
'部门'
,
'member.zhiwei'
:
'职位'
,
'member.xinjian'
:
'新建'
,
'member.huiyuanziliao'
:
'会员资料'
,
'member.qingxuanze'
:
'请选择'
,
}
src/pages/member/memberImport/index.tsx
View file @
0771cd72
...
...
@@ -6,7 +6,7 @@ import {
Button
,
Menu
,
Popconfirm
,
message
,
message
,
}
from
'antd'
;
import
{
PlusOutlined
,
...
...
@@ -42,7 +42,7 @@ const fetchListData = async (params: any) => {
payload
.
endDate
=
moment
(
+
endDate
).
format
(
'YYYY-MM-DD'
);
}
const
res
=
await
getMemberAbilitySubPage
(
payload
);
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
...
...
@@ -59,10 +59,10 @@ const MemberMaintain: React.FC<[]> = () => {
const
handleDelete
=
(
memberId
:
number
,
validateId
:
number
)
=>
{
const
mesInstance
=
message
.
loading
({
content
:
intl
.
formatMessage
({
id
:
'member.management.import.query.delete-deleting'
}),
duration
:
0
,
duration
:
0
,
});
postMemberAbilitySubDelete
({
memberId
,
memberId
,
validateId
,
}).
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
...
...
@@ -73,14 +73,14 @@ const MemberMaintain: React.FC<[]> = () => {
mesInstance
();
});
};
const
handleCommit
=
(
memberId
:
number
,
validateId
:
number
)
=>
{
const
mesInstance
=
message
.
loading
({
content
:
intl
.
formatMessage
({
id
:
'member.management.import.query.commit-committing'
}),
duration
:
0
,
duration
:
0
,
});
postMemberAbilitySubCommit
({
memberId
,
memberId
,
validateId
,
}).
then
(
res
=>
{
if
(
res
.
code
!==
1000
)
{
...
...
@@ -166,13 +166,13 @@ const MemberMaintain: React.FC<[]> = () => {
)
}
{
/* 外部审核状态不等于 审核通过 可进行删除操作 */
}
{
record
.
showDelete
&&
(
<
Popconfirm
<
Popconfirm
title=
{
intl
.
formatMessage
({
id
:
'member.management.import.query.delete-description'
})
}
okText=
{
intl
.
formatMessage
({
id
:
'common.button.yes'
})
}
cancelText=
{
intl
.
formatMessage
({
id
:
'common.button.no'
})
}
onConfirm=
{
()
=>
handleDelete
(
record
.
memberId
,
record
.
validateId
)
}
>
<
Button
<
Button
type=
"link"
danger
>
...
...
@@ -202,20 +202,20 @@ const MemberMaintain: React.FC<[]> = () => {
// 初始化高级筛选选项
const
fetchSelectOptions
=
async
()
=>
{
const
res
=
await
getMemberAbilitySubPageitems
();
if
(
res
.
code
===
1000
)
{
const
{
data
=
{}
}:
any
=
res
;
const
{
outerStatus
=
[],
memberTypes
=
[],
memberRoles
=
[],
status
=
[],
const
{
outerStatus
=
[],
memberTypes
=
[],
memberRoles
=
[],
status
=
[],
}
=
data
;
return
{
outerStatus
:
outerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
roleId
:
memberRoles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
memberRoles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
};
}
return
{};
...
...
@@ -252,7 +252,7 @@ const MemberMaintain: React.FC<[]> = () => {
}
>
<
PlusOutlined
/>
新建
{
intl
.
formatMessage
({
id
:
'member.xinjian'
})
}
</
Button
>
{
/* <Button onClick={() => setVisibleModal(true)}>导入</Button> */
}
{
/* <Dropdown.Button
...
...
@@ -301,7 +301,7 @@ const MemberMaintain: React.FC<[]> = () => {
<
UploadModal
visibleModal=
{
visibleModal
}
fileText=
"会员资料"
fileText=
{
intl
.
formatMessage
({
id
:
'member.huiyuanziliao'
})
}
onCancel=
{
()
=>
setVisibleModal
(
false
)
}
/>
</
Card
>
...
...
src/pages/member/memberMaintain/eliminate/schema.ts
View file @
0771cd72
/*
* @Author: XieZhiXiong
* @Date: 2021-06-04 10:39:42
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-29 18:13:35
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
export
const
unfriendModalSchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
MEGA_LAYOUT
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
labelAlign
:
'top'
,
},
properties
:
{
date
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.date'
}),
'x-component'
:
'DatePicker'
,
'x-component-props'
:
{
placeholder
:
'请选择'
,
style
:
{
width
:
'100%'
,
},
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.date.rules-required'
}),
},
],
},
reason
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.reason'
}),
'x-component'
:
'Textarea'
,
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.reason.placeholder'
}),
maxLength
:
60
,
rows
:
5
,
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.reason.rules-required'
}),
},
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
120
,
}
],
},
},
},
},
};
\ No newline at end of file
/*
* @Author: XieZhiXiong
* @Date: 2021-06-04 10:39:42
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-29 18:13:35
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
export
const
unfriendModalSchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
MEGA_LAYOUT
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
labelAlign
:
'top'
,
},
properties
:
{
date
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.date'
}),
'x-component'
:
'DatePicker'
,
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'member.qingxuanze'
}),
style
:
{
width
:
'100%'
,
},
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.date.rules-required'
}),
},
],
},
reason
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.reason'
}),
'x-component'
:
'Textarea'
,
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.reason.placeholder'
}),
maxLength
:
60
,
rows
:
5
,
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.eliminate.remove.form.reason.rules-required'
}),
},
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
120
,
}
],
},
},
},
},
};
src/pages/member/memberMaintain/unfreeze/schema.ts
View file @
0771cd72
/*
* @Author: XieZhiXiong
* @Date: 2021-06-04 10:39:42
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-29 19:42:56
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
export
const
unfriendModalSchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
MEGA_LAYOUT
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
labelAlign
:
'top'
,
},
properties
:
{
date
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.date'
}),
'x-component'
:
'DatePicker'
,
'x-component-props'
:
{
placeholder
:
'请选择'
,
style
:
{
width
:
'100%'
,
},
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.date.rules-required'
}),
},
],
},
reason
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.reason'
}),
'x-component'
:
'Textarea'
,
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.placeholder-reason'
}),
maxLength
:
60
,
rows
:
5
,
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.reason.rules-required'
}),
},
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
120
,
}
],
},
},
},
},
};
\ No newline at end of file
/*
* @Author: XieZhiXiong
* @Date: 2021-06-04 10:39:42
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-29 19:42:56
* @Description:
*/
import
{
getIntl
}
from
'umi'
;
import
{
ISchema
}
from
'@formily/antd'
;
const
intl
=
getIntl
();
export
const
unfriendModalSchema
:
ISchema
=
{
type
:
'object'
,
properties
:
{
MEGA_LAYOUT
:
{
type
:
'object'
,
'x-component'
:
'mega-layout'
,
'x-component-props'
:
{
labelAlign
:
'top'
,
},
properties
:
{
date
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.date'
}),
'x-component'
:
'DatePicker'
,
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'member.qingxuanze'
}),
style
:
{
width
:
'100%'
,
},
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.date.rules-required'
}),
},
],
},
reason
:
{
type
:
'string'
,
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.reason'
}),
'x-component'
:
'Textarea'
,
'x-component-props'
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.placeholder-reason'
}),
maxLength
:
60
,
rows
:
5
,
},
'x-rules'
:
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'member.management.maintain.unfreeze.unfreeze.form.reason.rules-required'
}),
},
{
limitByte
:
true
,
// 自定义校验规则
maxByte
:
120
,
}
],
},
},
},
},
};
src/pages/member/memberPrVerifyChange2/index.tsx
View file @
0771cd72
This diff is collapsed.
Click to expand it.
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