Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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-admin
Commits
ddfb49e2
Commit
ddfb49e2
authored
Dec 17, 2020
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改结算策略bug
parent
2c4fccea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
47 deletions
+46
-47
index.tsx
...leSettingManage/platformSettlementStrategy/info/index.tsx
+43
-43
schema.tsx
...eSettingManage/platformSettlementStrategy/info/schema.tsx
+3
-4
No files found.
src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx
View file @
ddfb49e2
...
...
@@ -40,26 +40,26 @@ const formActions = createFormActions();
const
common_columns
:
any
=
[
{
title
:
'ID'
,
dataIndex
:
'memberId'
},
{
title
:
'会员名称'
,
dataIndex
:
'name'
,
{
title
:
'会员名称'
,
dataIndex
:
'name'
,
render
:
(
text
:
string
,
record
:
any
)
=>
{
return
record
.
name
||
record
.
memberName
}
},
{
title
:
'会员类型'
,
dataIndex
:
'memberTypeName'
},
{
title
:
'会员角色'
,
dataIndex
:
'roleName'
},
{
title
:
'会员等级'
,
dataIndex
:
'levelTag'
,
{
title
:
'会员等级'
,
dataIndex
:
'levelTag'
,
render
:
(
text
:
string
,
record
:
any
)
=>
{
return
record
.
levelTag
||
record
.
levelName
}
}
},
]
const
MemberSettleAdd
:
React
.
FC
=
()
=>
{
const
[
visible
,
setVisible
]
=
useState
(
false
)
const
[
memberRowSelection
,
memberRowCtl
]
=
useRowSelectionTable
({
customKey
:
'
member
Id'
});
const
[
memberRowSelection
,
memberRowCtl
]
=
useRowSelectionTable
({
customKey
:
'
unique
Id'
});
const
[
initialValue
,
setInitialValue
]
=
useState
({});
const
[
cacheMember
,
setCacheMember
]
=
useState
([]);
const
{
id
,
preview
}
=
usePageStatus
();
...
...
@@ -69,28 +69,28 @@ const MemberSettleAdd: React.FC = () => {
const
tableAddButton
=
()
=>
{
return
(
<
div
>
<
Button
onClick=
{
()
=>
setVisible
(
true
)
}
style=
{
{
marginBottom
:
16
}
}
block
icon=
{
<
PlusOutlined
/>
}
<
Button
onClick=
{
()
=>
setVisible
(
true
)
}
style=
{
{
marginBottom
:
16
}
}
block
icon=
{
<
PlusOutlined
/>
}
type=
'dashed'
>
选择适用会员
</
Button
>
</
Button
>
</
div
>
)
}
const
columns
=
common_columns
.
concat
(
[
{
title
:
'操作'
,
{
title
:
'操作'
,
render
:
(
text
,
record
)
=>
{
return
(
<
a
onClick=
{
()
=>
handleRemove
(
record
.
member
Id
)
}
>
删除
</
a
>
<
a
onClick=
{
()
=>
handleRemove
(
record
.
unique
Id
)
}
>
删除
</
a
>
)
}
}
}
]
);
...
...
@@ -102,17 +102,19 @@ const MemberSettleAdd: React.FC = () => {
// 获取适用会员
const
fetchMemberData
=
async
(
params
:
any
)
=>
{
///member/manage/all/provider/page
const
{
data
,
code
}
=
await
PublicApi
.
getMemberManageAllProviderPage
(
params
);
if
(
code
===
1000
)
{
return
data
const
{
data
}
=
await
PublicApi
.
getMemberManageAllProviderPage
(
params
);
console
.
log
(
data
);
return
{
...
data
,
data
:
data
.
data
.
map
((
v
)
=>
({...
v
,
uniqueId
:
v
.
memberId
+
"_"
+
v
.
roleId
})),
totalCount
:
data
.
totalCount
}
return
[];
}
// 获取适用会员下拉搜索框
const
fetchMemberSearchFilter
=
()
=>
{
const
linkage
=
useLinkageUtils
();
onFormInit$
().
subscribe
(()
=>
{
PublicApi
.
getMemberManagePageitems
({
roleTypeEnum
:
'1'
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -135,8 +137,8 @@ const MemberSettleAdd: React.FC = () => {
// 提交
const
handleSubmit
=
(
value
)
=>
{
const
memberList
=
value
.
someLists
.
map
((
item
)
=>
(
{
memberId
:
item
.
memberId
,
{
memberId
:
item
.
memberId
,
roleId
:
item
.
roleId
,
}
)
...
...
@@ -153,8 +155,8 @@ const MemberSettleAdd: React.FC = () => {
const
serviceActions
=
isAdd
?
PublicApi
.
postSettleAccountsPlatformConfigAddPlatformSettlementStrategy
:
PublicApi
.
postSettleAccountsPlatformConfigUpdatePlatformSettlementStrategy
const
postData
=
{...
tempData
,
id
:
id
||
0
}
const
postData
=
{...
tempData
,
id
:
id
||
0
}
console
.
log
(
postData
)
setSubmitLoading
(
true
);
setUnsaved
(
false
);
...
...
@@ -175,14 +177,14 @@ const MemberSettleAdd: React.FC = () => {
const
handleRemove
=
(
id
:
number
)
=>
{
const
string
=
'Tabs.memberTab.someLists'
;
const
chooseList
=
formActions
.
getFieldValue
(
string
);
const
res
=
chooseList
.
filter
((
item
)
=>
item
.
member
Id
!==
id
);
const
res
=
chooseList
.
filter
((
item
)
=>
item
.
unique
Id
!==
id
);
formActions
.
setFieldValue
(
string
,
res
);
// 必须设置key
memberRowCtl
.
setSelectRow
(
res
);
memberRowCtl
.
setSelectedRowKeys
(
res
.
map
((
item
)
=>
item
.
member
Id
))
memberRowCtl
.
setSelectedRowKeys
(
res
.
map
((
item
)
=>
item
.
unique
Id
))
}
// 从PAAS平台--规则配置--平台规则配置取已勾选的结算方式决定是否显示结算方式
const
fetchBalancedMethods
=
async
()
=>
{
const
{
data
}
=
await
PublicApi
.
getManageRuleConfigurationList
({
platformType
:
'5'
});
...
...
@@ -218,18 +220,17 @@ const MemberSettleAdd: React.FC = () => {
active
:
res
.
data
.
settlementWay
,
otherValues
:
[
res
.
data
.
settlementDays
,
res
.
data
.
settlementDate
],
},
})
formActions
.
setFieldValue
(
'Tabs.memberTab.layout.isDefault'
,
res
.
data
.
isDefault
)
formActions
.
setFieldValue
(
'Tabs.memberTab.someLists'
,
res
.
data
.
memberList
);
const
list
=
res
.
data
.
memberList
.
map
((
item
)
=>
({...
item
,
uniqueId
:
item
.
memberId
+
"_"
+
item
.
roleId
}))
formActions
.
setFieldValue
(
'Tabs.memberTab.someLists'
,
list
);
// 必须设置key
memberRowCtl
.
setSelectRow
(
res
.
data
.
memberL
ist
);
memberRowCtl
.
setSelectedRowKeys
(
res
.
data
.
memberList
.
map
((
item
)
=>
item
.
memberId
))
memberRowCtl
.
setSelectRow
(
l
ist
);
memberRowCtl
.
setSelectedRowKeys
(
res
.
data
.
memberList
.
map
((
item
)
=>
item
.
memberId
+
"_"
+
item
.
roleId
))
}
else
{
message
.
error
({
content
:
res
.
message
})
}
}
getInfo
();
}
...
...
@@ -256,13 +257,13 @@ const MemberSettleAdd: React.FC = () => {
schema=
{
addSchema
}
effects=
{
()
=>
{
// 获取单据类型
useAsyncSelect
(
"settlementOrderType"
,
useAsyncSelect
(
"settlementOrderType"
,
fetchOptions
(
PublicApi
.
getSettleAccountsCommonGetPlatformStrategySettlementOrderType
)
)
}
}
/>
<
ModalTable
modalTitle=
'选择适用会员'
confirm=
{
handleOkAddMember
}
...
...
@@ -272,12 +273,12 @@ const MemberSettleAdd: React.FC = () => {
rowSelection=
{
memberRowSelection
}
fetchTableData=
{
params
=>
fetchMemberData
(
params
)
}
tableProps=
{
{
rowKey
:
'
member
Id'
,
rowKey
:
'
unique
Id'
,
}
}
width=
{
1000
}
formilyProps=
{
{
ctx
:
{
ctx
:
{
schema
:
memberSchema
,
actions
:
formActions
,
components
:
{
ModalSearch
:
Search
,
SearchSelect
,
Submit
}
,
...
...
@@ -300,4 +301,4 @@ const MemberSettleAdd: React.FC = () => {
)
}
export
default
MemberSettleAdd
\ No newline at end of file
export
default
MemberSettleAdd
src/pages/ruleSettingManage/platformSettlementStrategy/info/schema.tsx
View file @
ddfb49e2
...
...
@@ -2,7 +2,7 @@ import { ISchema } from '@formily/antd'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
/**
* 新增会员结算策略schema
*
*
*/
export
const
addSchema
:
ISchema
=
{
...
...
@@ -114,7 +114,7 @@ export const addSchema: ISchema = {
},
'x-component'
:
'MultTable'
,
'x-component-props'
:
{
rowKey
:
'
member
Id'
,
rowKey
:
'
unique
Id'
,
prefix
:
"{{tableAddButton}}"
,
columns
:
"{{tableColumns}}"
// columns: "{{tableColumns}}",
...
...
@@ -192,4 +192,4 @@ export const memberSchema: ISchema = {
}
}
}
}
\ No newline at end of file
}
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