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
4b623892
Commit
4b623892
authored
Dec 11, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 会员能力国际化补漏
parent
c7ddef39
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
35 deletions
+51
-35
member.ts
src/locales/zh-CN/member.ts
+32
-18
constant.tsx
src/pages/member/constant.tsx
+19
-17
No files found.
src/locales/zh-CN/member.ts
View file @
4b623892
/*
* @Author: XieZhiXiong
* @Date: 2021-11-29 11:33:12
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-12-04 18:43:01
* @Description:
*/
export
default
{
export
default
{
// 会员管理 - 会员导入
// 会员管理 - 会员导入
'member.management.import.query.memberId'
:
'会员Id'
,
'member.management.import.query.memberId'
:
'会员Id'
,
...
@@ -90,7 +83,8 @@ export default {
...
@@ -90,7 +83,8 @@ export default {
'member.management.maintain.black.getBlocked.form.reason.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
'member.management.maintain.black.getBlocked.form.reason.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
'member.management.maintain.eliminate.remove'
:
'解除关系'
,
'member.management.maintain.eliminate.remove'
:
'解除关系'
,
'member.management.maintain.eliminate.remove.title'
:
'会员关系解除'
,
'member.management.maintain.eliminate.remove.title'
:
'会员关系解除'
,
'member.management.maintain.eliminate.remove.title-description'
:
'解除当前会员关系,不在享用会员权益;可重新申请会员关系'
,
'member.management.maintain.eliminate.remove.title-description'
:
'解除当前会员关系,不在享用会员权益;可重新申请会员关系'
,
'member.management.maintain.eliminate.remove.form.select.placeholder'
:
'请选择'
,
'member.management.maintain.eliminate.remove.form.select.placeholder'
:
'请选择'
,
'member.management.maintain.eliminate.remove.form.date'
:
'解除日期'
,
'member.management.maintain.eliminate.remove.form.date'
:
'解除日期'
,
'member.management.maintain.eliminate.remove.form.date.rules-required'
:
'请选择解除日期'
,
'member.management.maintain.eliminate.remove.form.date.rules-required'
:
'请选择解除日期'
,
...
@@ -99,7 +93,8 @@ export default {
...
@@ -99,7 +93,8 @@ export default {
'member.management.maintain.eliminate.remove.form.reason.rules-required'
:
'请填写原因'
,
'member.management.maintain.eliminate.remove.form.reason.rules-required'
:
'请填写原因'
,
'member.management.maintain.freeze.freeze'
:
'冻结'
,
'member.management.maintain.freeze.freeze'
:
'冻结'
,
'member.management.maintain.freeze.freeze.title'
:
'会员冻结'
,
'member.management.maintain.freeze.freeze.title'
:
'会员冻结'
,
'member.management.maintain.freeze.freeze.title-description'
:
'解除当前会员关系,不在享用会员权益;可重新申请会员关系'
,
'member.management.maintain.freeze.freeze.title-description'
:
'解除当前会员关系,不在享用会员权益;可重新申请会员关系'
,
'member.management.maintain.freeze.freeze.form.reason'
:
'会员冻结原因'
,
'member.management.maintain.freeze.freeze.form.reason'
:
'会员冻结原因'
,
'member.management.maintain.freeze.freeze.form.reason.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
'member.management.maintain.freeze.freeze.form.reason.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
'member.management.maintain.freeze.freeze.form.reason.rules-required'
:
'请填写原因'
,
'member.management.maintain.freeze.freeze.form.reason.rules-required'
:
'请填写原因'
,
...
@@ -171,7 +166,8 @@ export default {
...
@@ -171,7 +166,8 @@ export default {
'member.management.memberPrComingInvestigate.drawer.form.inspect.score'
:
'考察评分'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.score'
:
'考察评分'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.score.rules-money'
:
'请输入两位小数'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.score.rules-money'
:
'请输入两位小数'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.result'
:
'考察结果'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.result'
:
'考察结果'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.result-placeholder'
:
'在此输入你的内容,最长60个字符,30个汉字'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.result-placeholder'
:
'在此输入你的内容,最长60个字符,30个汉字'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.reports'
:
'考察报告'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.reports'
:
'考察报告'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.reports.rules-required'
:
'请上传考察报告'
,
'member.management.memberPrComingInvestigate.drawer.form.inspect.reports.rules-required'
:
'请上传考察报告'
,
'member.management.memberPrComingInvestigate.drawer.form.verify'
:
'单据审核'
,
'member.management.memberPrComingInvestigate.drawer.form.verify'
:
'单据审核'
,
...
@@ -179,7 +175,8 @@ export default {
...
@@ -179,7 +175,8 @@ export default {
'member.management.memberPrComingInvestigate.drawer.form.verify.agree.pass'
:
'审核通过'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.agree.pass'
:
'审核通过'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.agree.noPass'
:
'审核不通过'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.agree.noPass'
:
'审核不通过'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.reason'
:
'不通过原因'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.reason'
:
'不通过原因'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
'member.management.memberPrComingInvestigate.drawer.form.verify.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
// 待入库分类
// 待入库分类
'member.management.memberPrComingClassify.verify.commiting'
:
'正在提交,请稍候...'
,
'member.management.memberPrComingClassify.verify.commiting'
:
'正在提交,请稍候...'
,
...
@@ -188,18 +185,22 @@ export default {
...
@@ -188,18 +185,22 @@ export default {
'member.management.memberPrComingClassify.drawer.form.classify'
:
'入库分类信息'
,
'member.management.memberPrComingClassify.drawer.form.classify'
:
'入库分类信息'
,
'member.management.memberPrComingClassify.drawer.form.classify.code'
:
'会员编码'
,
'member.management.memberPrComingClassify.drawer.form.classify.code'
:
'会员编码'
,
'member.management.memberPrComingClassify.drawer.form.classify.code.description-1'
:
'长度最多10位,不可重复'
,
'member.management.memberPrComingClassify.drawer.form.classify.code.description-1'
:
'长度最多10位,不可重复'
,
'member.management.memberPrComingClassify.drawer.form.classify.code.description-2'
:
'不支持特殊符号(除英文"_-";下划线和中划线)'
,
'member.management.memberPrComingClassify.drawer.form.classify.code.description-2'
:
'member.management.memberPrComingClassify.drawer.form.classify.code.rules-legal'
:
'请输入数字、英文、_-,最多支持10个字符'
,
'不支持特殊符号(除英文"_-";下划线和中划线)'
,
'member.management.memberPrComingClassify.drawer.form.classify.code.rules-legal'
:
'请输入数字、英文、_-,最多支持10个字符'
,
'member.management.memberPrComingClassify.drawer.form.classify.partnerType'
:
'合作关系'
,
'member.management.memberPrComingClassify.drawer.form.classify.partnerType'
:
'合作关系'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount'
:
'单次合作金额'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount'
:
'单次合作金额'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.description-1'
:
'允许单次采购最大金额'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.description-1'
:
'允许单次采购最大金额'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.rules-legal'
:
'请输入数值,最多支持小数点后两位'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.rules-legal'
:
'请输入数值,最多支持小数点后两位'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.rules-max'
:
'最多支持8个字符'
,
'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.rules-max'
:
'最多支持8个字符'
,
'member.management.memberPrComingClassify.drawer.form.classify.areaCodes'
:
'适用区域'
,
'member.management.memberPrComingClassify.drawer.form.classify.areaCodes'
:
'适用区域'
,
'member.management.memberPrComingClassify.drawer.form.classify.categories'
:
'主营品类'
,
'member.management.memberPrComingClassify.drawer.form.classify.categories'
:
'主营品类'
,
'member.management.memberPrComingClassify.drawer.form.classify.category'
:
'品类'
,
'member.management.memberPrComingClassify.drawer.form.classify.category'
:
'品类'
,
'member.management.memberPrComingClassify.drawer.form.classify.paymentDay'
:
'付款周期(天)'
,
'member.management.memberPrComingClassify.drawer.form.classify.paymentDay'
:
'付款周期(天)'
,
'member.management.memberPrComingClassify.drawer.form.classify.paymentDay.rules-legal'
:
'请输入0 或 正整数,最多8位数'
,
'member.management.memberPrComingClassify.drawer.form.classify.paymentDay.rules-legal'
:
'请输入0 或 正整数,最多8位数'
,
'member.management.memberPrComingClassify.drawer.form.classify.invoiceTypeName'
:
'发票类型'
,
'member.management.memberPrComingClassify.drawer.form.classify.invoiceTypeName'
:
'发票类型'
,
'member.management.memberPrComingClassify.drawer.form.classify.taxPoint'
:
'税点'
,
'member.management.memberPrComingClassify.drawer.form.classify.taxPoint'
:
'税点'
,
'member.management.memberPrComingClassify.drawer.form.verify'
:
'单据审核'
,
'member.management.memberPrComingClassify.drawer.form.verify'
:
'单据审核'
,
...
@@ -207,7 +208,8 @@ export default {
...
@@ -207,7 +208,8 @@ export default {
'member.management.memberPrComingClassify.drawer.form.verify.agree.pass'
:
'审核通过'
,
'member.management.memberPrComingClassify.drawer.form.verify.agree.pass'
:
'审核通过'
,
'member.management.memberPrComingClassify.drawer.form.verify.agree.noPass'
:
'审核不通过'
,
'member.management.memberPrComingClassify.drawer.form.verify.agree.noPass'
:
'审核不通过'
,
'member.management.memberPrComingClassify.drawer.form.verify.reason'
:
'不通过原因'
,
'member.management.memberPrComingClassify.drawer.form.verify.reason'
:
'不通过原因'
,
'member.management.memberPrComingClassify.drawer.form.verify.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
'member.management.memberPrComingClassify.drawer.form.verify.placeholder'
:
'在此输入你的内容,最长120个字符,60个汉字'
,
// 待审核入库(一级)
// 待审核入库(一级)
'member.management.memberPrVerifyComing1.query.verify-tip'
:
'确定要审核通过选中的会员吗?'
,
'member.management.memberPrVerifyComing1.query.verify-tip'
:
'确定要审核通过选中的会员吗?'
,
...
@@ -930,5 +932,17 @@ export default {
...
@@ -930,5 +932,17 @@ export default {
'member.memberQuery.rectificationQuery.index.isConfirmRectify'
:
'是否确认整改?'
,
'member.memberQuery.rectificationQuery.index.isConfirmRectify'
:
'是否确认整改?'
,
'member.memberQuery.rectificationQuery.schema.plzUploadAppendix'
:
'请上传附件'
,
'member.memberQuery.rectificationQuery.schema.plzUploadAppendix'
:
'请上传附件'
,
'member.memberQuery.suggest.common.schema.supMemberId'
:
'上级会员id'
,
'member.memberQuery.suggest.common.schema.supMemberId'
:
'上级会员id'
,
'member.memberQuery.suggest.common.schema.supMemberRoleId'
:
'上级会员角色Id'
'member.memberQuery.suggest.common.schema.supMemberRoleId'
:
'上级会员角色Id'
,
};
'member.daishenhe'
:
'待审核'
,
'member.shenhetongguo'
:
'审核通过'
,
'member.dongjie'
:
'冻结'
,
'member.xuhao'
:
'序号'
,
'member.caozuojuese'
:
'操作角色'
,
'member.zhuangtai'
:
'状态'
,
'member.caozuo'
:
'操作'
,
'member.caozuoshijian'
:
'操作时间'
,
'member.shenheyijian'
:
'审核意见'
,
'member.caozuoren'
:
'操作人'
,
'member.bumen'
:
'部门'
,
'member.zhiwei'
:
'职位'
,
}
src/pages/member/constant.tsx
View file @
4b623892
...
@@ -50,6 +50,8 @@ import {
...
@@ -50,6 +50,8 @@ import {
}
from
'@/constants/member'
;
}
from
'@/constants/member'
;
import
{
EditableColumns
}
from
'@/components/PolymericTable/interface'
;
import
{
EditableColumns
}
from
'@/components/PolymericTable/interface'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
getIntl
}
from
'umi'
;
const
intl
=
getIntl
();
export
const
STATUS_COLOR_MAP
=
{
export
const
STATUS_COLOR_MAP
=
{
0
:
'#669EDE'
,
0
:
'#669EDE'
,
...
@@ -58,9 +60,9 @@ export const STATUS_COLOR_MAP = {
...
@@ -58,9 +60,9 @@ export const STATUS_COLOR_MAP = {
};
};
export
const
STATUS_COLOR_TXT
=
{
export
const
STATUS_COLOR_TXT
=
{
0
:
'待审核'
,
0
:
intl
.
formatMessage
({
id
:
'member.daishenhe'
})
,
1
:
'审核通过'
,
1
:
intl
.
formatMessage
({
id
:
'member.shenhetongguo'
})
,
2
:
'冻结'
,
2
:
intl
.
formatMessage
({
id
:
'member.dongjie'
})
,
};
};
// 会员状态 StatusTag map
// 会员状态 StatusTag map
...
@@ -121,32 +123,32 @@ export const MEMBER_INNER_STATUS_BADGE_COLOR = {
...
@@ -121,32 +123,32 @@ export const MEMBER_INNER_STATUS_BADGE_COLOR = {
export
const
MEMBER_OUTER_COLUMNS
:
EditableColumns
[]
=
[
export
const
MEMBER_OUTER_COLUMNS
:
EditableColumns
[]
=
[
{
{
title
:
'序号'
,
title
:
intl
.
formatMessage
({
id
:
'member.xuhao'
})
,
dataIndex
:
'index'
,
dataIndex
:
'index'
,
render
:
(
text
,
record
,
index
)
=>
index
+
1
,
render
:
(
text
,
record
,
index
)
=>
index
+
1
,
},
},
{
{
title
:
'操作角色'
,
title
:
intl
.
formatMessage
({
id
:
'member.caozuojuese'
})
,
dataIndex
:
'operatorRoleName'
,
dataIndex
:
'operatorRoleName'
,
},
},
{
{
title
:
'状态'
,
title
:
intl
.
formatMessage
({
id
:
'member.zhuangtai'
})
,
dataIndex
:
'outerStatusName'
,
dataIndex
:
'outerStatusName'
,
render
:
(
text
,
record
)
=>
(
render
:
(
text
,
record
)
=>
(
<
StatusTag
type=
{
MEMBER_OUTER_STATUS_TYPE
[
record
.
outerStatus
]
}
title=
{
text
}
/>
<
StatusTag
type=
{
MEMBER_OUTER_STATUS_TYPE
[
record
.
outerStatus
]
}
title=
{
text
}
/>
),
),
},
},
{
{
title
:
'操作'
,
title
:
intl
.
formatMessage
({
id
:
'member.caozuo'
})
,
dataIndex
:
'operation'
,
dataIndex
:
'operation'
,
},
},
{
{
title
:
'操作时间'
,
title
:
intl
.
formatMessage
({
id
:
'member.caozuoshijian'
})
,
dataIndex
:
'createTime'
,
dataIndex
:
'createTime'
,
ellipsis
:
true
,
ellipsis
:
true
,
},
},
{
{
title
:
'审核意见'
,
title
:
intl
.
formatMessage
({
id
:
'member.shenheyijian'
})
,
dataIndex
:
'remark'
,
dataIndex
:
'remark'
,
ellipsis
:
true
,
ellipsis
:
true
,
},
},
...
@@ -154,40 +156,40 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
...
@@ -154,40 +156,40 @@ export const MEMBER_OUTER_COLUMNS: EditableColumns[] = [
export
const
MEMBER_INNER_COLUMNS
:
EditableColumns
[]
=
[
export
const
MEMBER_INNER_COLUMNS
:
EditableColumns
[]
=
[
{
{
title
:
'序号'
,
title
:
intl
.
formatMessage
({
id
:
'member.xuhao'
})
,
dataIndex
:
'index'
,
dataIndex
:
'index'
,
render
:
(
text
,
record
,
index
)
=>
index
+
1
,
render
:
(
text
,
record
,
index
)
=>
index
+
1
,
},
},
{
{
title
:
'操作人'
,
title
:
intl
.
formatMessage
({
id
:
'member.caozuoren'
})
,
dataIndex
:
'operatorName'
,
dataIndex
:
'operatorName'
,
},
},
{
{
title
:
'部门'
,
title
:
intl
.
formatMessage
({
id
:
'member.bumen'
})
,
dataIndex
:
'operatorOrgName'
,
dataIndex
:
'operatorOrgName'
,
},
},
{
{
title
:
'职位'
,
title
:
intl
.
formatMessage
({
id
:
'member.zhiwei'
})
,
dataIndex
:
'operatorJobTitle'
,
dataIndex
:
'operatorJobTitle'
,
},
},
{
{
title
:
'状态'
,
title
:
intl
.
formatMessage
({
id
:
'member.zhuangtai'
})
,
dataIndex
:
'innerStatusName'
,
dataIndex
:
'innerStatusName'
,
render
:
(
text
,
record
)
=>
(
render
:
(
text
,
record
)
=>
(
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
record
.
innerStatus
]
}
text=
{
text
}
/>
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
record
.
innerStatus
]
}
text=
{
text
}
/>
),
),
},
},
{
{
title
:
'操作'
,
title
:
intl
.
formatMessage
({
id
:
'member.caozuo'
})
,
dataIndex
:
'operation'
,
dataIndex
:
'operation'
,
},
},
{
{
title
:
'操作时间'
,
title
:
intl
.
formatMessage
({
id
:
'member.caozuoshijian'
})
,
dataIndex
:
'createTime'
,
dataIndex
:
'createTime'
,
ellipsis
:
true
,
ellipsis
:
true
,
},
},
{
{
title
:
'审核意见'
,
title
:
intl
.
formatMessage
({
id
:
'member.shenheyijian'
})
,
dataIndex
:
'remark'
,
dataIndex
:
'remark'
,
ellipsis
:
true
,
ellipsis
:
true
,
},
},
...
...
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