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
shenshaokai
jinfa-platform
Commits
f17dccde
Commit
f17dccde
authored
Apr 15, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复翻译
parent
215b4721
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
23 deletions
+24
-23
shop.ts
src/locales/zh-CN/shop.ts
+1
-1
add.tsx
src/pages/systemSetting/salesmanManage/salesmanBind/add.tsx
+6
-5
detail.tsx
...ages/systemSetting/salesmanManage/salesmanBind/detail.tsx
+12
-12
index.tsx
...pages/systemSetting/salesmanManage/salesmanBind/index.tsx
+2
-2
index.tsx
...saction/dealAbility/inquiryOffer/waitAllotOrder/index.tsx
+3
-3
No files found.
src/locales/zh-CN/shop.ts
View file @
f17dccde
...
...
@@ -110,7 +110,7 @@ export default {
'channel.form.orgName.placeholder'
:
'请输入所属机构'
,
'channel.form.orgName.jobTitle'
:
'请输入职位'
,
'channel.form.memberName.placeholder'
:
'请搜索会员名称'
,
'channel.member.tab.manage.subordinate'
:
"管理下级
渠道
"
,
'channel.member.tab.manage.subordinate'
:
"管理下级
会员
"
,
'channel.template.modal.title.use'
:
'使用渠道模板'
,
'channel.template.button.mall.edit'
:
'渠道商城装修'
,
'channel.template.button.mall.category.edit'
:
'渠道品类导航装修'
,
...
...
src/pages/systemSetting/salesmanManage/salesmanBind/add.tsx
View file @
f17dccde
...
...
@@ -5,7 +5,7 @@ import CardLayout from '@/pages/transaction/components/card';
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
PageStatus
,
usePageStatus
}
from
'@/hooks/usePageStatus'
;
import
{
useIntl
,
history
}
from
'umi'
;
import
{
history
,
getIntl
}
from
'umi'
;
import
{
getMemberAbilitySalesChannel
,
getMemberAbilitySalesChannelPage
,
getMemberAbilitySalesSelect
,
postMemberAbilitySalesChannelBind
,
postMemberAbilitySalesChannelUnbind
}
from
'@/services/MemberV2Api'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
Search
from
'@/components/NiceForm/components/Search'
;
...
...
@@ -15,9 +15,11 @@ import StandardTable from '@/components/StandardTable';
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
;
import
ModalTable
from
'@/components/ModalTable'
;
const
intl
=
getIntl
()
export
const
Tablink
=
[
{
id
:
'basicLayout'
,
title
:
'基本信息'
},
{
id
:
'manageLayout'
,
title
:
'管理下级会员'
},
{
id
:
'basicLayout'
,
title
:
intl
.
formatMessage
({
id
:
'shop.seo.tab.basic'
})
},
{
id
:
'manageLayout'
,
title
:
intl
.
formatMessage
({
id
:
'channel.member.tab.manage.subordinate'
})
},
]
const
formAction
=
createFormActions
();
...
...
@@ -35,7 +37,6 @@ const SalesmanBindAdded = (props) => {
const
{
pageStatus
,
id
}
=
usePageStatus
()
const
[
tableData
,
setTableData
]
=
useState
<
any
[]
>
([])
const
[
keywordName
,
setKeywordName
]
=
useState
<
string
>
(
''
)
const
intl
=
useIntl
()
const
fliterTableData
=
useMemo
(()
=>
{
if
(
!
keywordName
)
{
...
...
@@ -442,7 +443,7 @@ const SalesmanBindAdded = (props) => {
</
CardLayout
>
<
CardLayout
id=
'manageLayout'
title=
'管理下级会员'
title=
{
intl
.
formatMessage
({
id
:
'channel.member.tab.manage.subordinate'
})
}
>
<
Row
justify=
'space-between'
style=
{
{
marginBottom
:
20
}
}
>
<
Col
>
...
...
src/pages/systemSetting/salesmanManage/salesmanBind/detail.tsx
View file @
f17dccde
...
...
@@ -8,7 +8,7 @@ import NiceForm from '@/components/NiceForm';
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
{
searchSelectGetSelectCategoryOptionEffect
}
from
'@/pages/transaction/effect'
;
import
{
use
Intl
}
from
'umi'
;
import
{
get
Intl
}
from
'umi'
;
import
{
getMemberAbilitySalesChannel
}
from
'@/services/MemberV2Api'
;
import
{
usePageStatus
}
from
'@/hooks/usePageStatus'
;
...
...
@@ -19,16 +19,16 @@ export const layout: any = {
labelCol
:
{
style
:
{
width
:
"144px"
}
},
labelAlign
:
"left"
};
const
intl
=
getIntl
();
export
const
Tablink
=
[
{
id
:
'basicLayout'
,
title
:
'基本信息'
},
{
id
:
'manageLayout'
,
title
:
'管理下级会员'
},
{
id
:
'basicLayout'
,
title
:
intl
.
formatMessage
({
id
:
'shop.seo.tab.basic'
})
},
{
id
:
'manageLayout'
,
title
:
intl
.
formatMessage
({
id
:
'channel.member.tab.manage.subordinate'
})
},
]
const
SalesmanBindDetail
=
(
props
)
=>
{
const
ref
=
React
.
useRef
<
any
>
(
null
);
const
intl
=
useIntl
();
const
{
pageStatus
,
id
}
=
usePageStatus
()
...
...
@@ -133,24 +133,24 @@ const SalesmanBindDetail = (props) => {
<
React
.
Fragment
>
<
CardLayout
id=
'basicLayout'
title=
'基本信息'
title=
{
intl
.
formatMessage
({
id
:
'shop.seo.tab.basic'
})
}
>
<
Row
gutter=
{
[
48
,
24
]
}
>
<
Col
span=
{
12
}
>
<
Form
{
...
layout
}
>
<
Form
.
Item
label=
'业务员'
>
<
Form
.
Item
label=
{
intl
.
formatMessage
({
id
:
'channel.form.salesman'
})
}
>
<
Typography
.
Text
>
{
data
?.
name
}
</
Typography
.
Text
>
</
Form
.
Item
>
<
Form
.
Item
label=
'所属机构'
>
<
Form
.
Item
label=
{
intl
.
formatMessage
({
id
:
'channel.member.table.orgName'
})
}
>
<
Typography
.
Text
>
{
data
?.
orgName
}
</
Typography
.
Text
>
</
Form
.
Item
>
<
Form
.
Item
label=
'职位'
>
<
Form
.
Item
label=
{
intl
.
formatMessage
({
id
:
'channel.member.table.jobTitle'
})
}
>
<
Typography
.
Text
>
{
data
?.
jobTitle
}
</
Typography
.
Text
>
</
Form
.
Item
>
<
Form
.
Item
label=
'所属角色'
>
<
Form
.
Item
label=
{
intl
.
formatMessage
({
id
:
'channel.member.table.memberRoleName'
})
}
>
<
Typography
.
Text
>
{
data
?.
memberRoleName
}
</
Typography
.
Text
>
</
Form
.
Item
>
<
Form
.
Item
label=
'绑定后手机号'
>
<
Form
.
Item
label=
{
intl
.
formatMessage
({
id
:
'cchannel.member.table.bindphone'
})
}
>
<
Typography
.
Text
>
{
data
?.
phone
}
</
Typography
.
Text
>
</
Form
.
Item
>
</
Form
>
...
...
@@ -159,7 +159,7 @@ const SalesmanBindDetail = (props) => {
</
CardLayout
>
<
CardLayout
id=
'manageLayout'
title=
'管理下级会员'
title=
{
intl
.
formatMessage
({
id
:
'channel.member.tab.manage.subordinate'
})
}
>
<
Row
justify=
'space-between'
style=
{
{
marginBottom
:
20
}
}
>
<
Col
style=
{
{
display
:
'flex'
}
}
>
...
...
src/pages/systemSetting/salesmanManage/salesmanBind/index.tsx
View file @
f17dccde
...
...
@@ -108,7 +108,7 @@ const PortalSystem = () => {
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'登录帐号'
,
placeholder
:
intl
.
formatMessage
({
id
:
'channel.member.table.account'
})
,
},
},
}
...
...
@@ -138,7 +138,7 @@ const PortalSystem = () => {
name
:
{
type
:
'string'
,
'x-component-props'
:
{
placeholder
:
'姓名'
,
placeholder
:
intl
.
formatMessage
({
id
:
'channel.member.table.name'
})
,
style
:
{
width
:
160
,
},
...
...
src/pages/transaction/dealAbility/inquiryOffer/waitAllotOrder/index.tsx
View file @
f17dccde
...
...
@@ -36,7 +36,7 @@ const WaitAllotOrder = () => {
setLoading
({})
ref
.
current
.
reload
();
Modal
.
success
({
content
:
'询价单领取成功!'
,
content
:
intl
.
formatMessage
({
id
:
'purchaseOrder.lingquchenggong'
,
defaultMessage
:
'领取成功'
})
,
});
setRowKeys
([])
}
...
...
@@ -93,7 +93,7 @@ const WaitAllotOrder = () => {
title
:
intl
.
formatMessage
({
id
:
'dealAbility.caozuo'
}),
key
:
'options'
,
dataIndex
:
'options'
,
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<
AuthButton
btnCode=
'waitAllotOrder.collect'
><
Button
type=
'link'
loading=
{
loading
[
index
]
}
onClick=
{
()
=>
fetchSubmitBatch
(
record
.
id
,
index
)
}
>
领取
</
Button
></
AuthButton
>
render
:
(
text
:
any
,
record
:
any
,
index
:
number
)
=>
<
AuthButton
btnCode=
'waitAllotOrder.collect'
><
Button
type=
'link'
loading=
{
loading
[
index
]
}
onClick=
{
()
=>
fetchSubmitBatch
(
record
.
id
,
index
)
}
>
{
intl
.
formatMessage
({
id
:
'purchaseOrder.lingqu'
,
defaultMessage
:
'领取'
})
}
</
Button
></
AuthButton
>
},
];
return
(
...
...
@@ -116,7 +116,7 @@ const WaitAllotOrder = () => {
disabled=
{
rowkeys
.
length
===
0
}
onClick=
{
()
=>
fetchSubmitBatch
()
}
>
批量领取
{
intl
.
formatMessage
({
id
:
'purchaseOrder.pilianglingqu'
,
defaultMessage
:
'批量领取'
})
}
</
Button
>
</
AuthButton
>
</
Col
>
...
...
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