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
b4fe3ee0
Commit
b4fe3ee0
authored
May 27, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into dev-srm
parents
ec6f8b6b
22d4e8dc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
153 additions
and
43 deletions
+153
-43
index.tsx
src/components/NiceForm/index.tsx
+10
-1
keepAlive.ts
src/components/NiceForm/utils/keepAlive.ts
+46
-0
session.ts
src/components/NiceForm/utils/session.ts
+38
-0
index.tsx
src/components/ReturnEle/index.tsx
+20
-3
index.tsx
src/pages/authConfig/memberSystem/index.tsx
+1
-1
memberDetail.tsx
src/pages/authConfig/memberSystem/memberDetail.tsx
+2
-2
index.ts
src/pages/authConfig/userSystem/schema/index.ts
+1
-1
userDetail.tsx
src/pages/authConfig/userSystem/userDetail.tsx
+4
-4
index.tsx
src/pages/capitalAccount/accountLists/index.tsx
+2
-2
index.ts
src/pages/capitalAccount/accountLists/schema/index.ts
+1
-1
checkDetails.tsx
src/pages/capitalAccount/checkWithdraw/checkDetails.tsx
+1
-1
paymentDetails.tsx
src/pages/capitalAccount/paymentWithdraw/paymentDetails.tsx
+1
-1
index.tsx
src/pages/member/components/BasicInfo/index.tsx
+0
-0
index.tsx
src/pages/member/memberMaintain/index.tsx
+2
-2
index.tsx
src/pages/member/memberPr1/index.tsx
+3
-3
index.tsx
src/pages/member/memberPr2/index.tsx
+3
-3
index.tsx
src/pages/member/memberPrConfirm/index.tsx
+2
-2
index.tsx
src/pages/member/memberPrSubmit/index.tsx
+3
-3
index.tsx
...System/orderDetail/components/orderProductTable/index.tsx
+1
-1
index.ts
src/pages/orderSystem/orderDetail/effects/index.ts
+1
-1
index.tsx
...ges/returnManage/components/RefundModal/Balance/index.tsx
+1
-1
RuleSetting.tsx
...SettingManage/transactionRules/components/RuleSetting.tsx
+9
-9
index.tsx
...pages/ruleSettingManage/transactionRules/schema/index.tsx
+1
-1
No files found.
src/components/NiceForm/index.tsx
View file @
b4fe3ee0
import
React
from
'react'
;
import
React
,
{
useEffect
}
from
'react'
;
import
SchemaForm
,
{
IAntdSchemaFormProps
,
createVirtualBox
,
registerVirtualBox
,
Schema
,
SchemaField
,
FormButtonGroup
,
Reset
,
createControllerBox
,
registerValidationRules
,
}
from
'@formily/antd'
;
...
...
@@ -28,6 +28,7 @@ import DateRangePickerUnix from './components/DateRangePickerUnix';
import
SmilingFace
from
'./components/SmilingFace'
;
import
AntUpload
from
'./components/AntUpload'
;
import
'./index.less'
import
{
currentStateType
,
getCurrentState
}
from
'./utils/keepAlive'
;
export
interface
NiceFormProps
extends
IAntdSchemaFormProps
{}
...
...
@@ -104,6 +105,14 @@ const NiceForm: React.FC<NiceFormProps> = props => {
const
defineComponents
=
Object
.
assign
(
componentExport
,
components
);
useEffect
(()
=>
{
let
paginationInfo
:
currentStateType
=
getCurrentState
();
// @ts-ignore
reset
.
actions
.
setFormState
(
state
=>
(
state
.
values
=
paginationInfo
.
queryParams
),
);
},
[])
return
(
<
SchemaForm
colon=
{
false
}
components=
{
defineComponents
}
{
...
reset
}
>
{
children
}
...
...
src/components/NiceForm/utils/keepAlive.ts
0 → 100644
View file @
b4fe3ee0
import
{
get
,
set
,
remove
}
from
'./session'
;
const
STATE_KEY
=
'currentState'
;
export
interface
currentStateType
{
pathname
:
string
;
current
:
number
;
pageSize
:
number
;
queryParams
:
any
;
}
/**
* 保存表格状态
* @param current
* @param pageSize
*/
export
const
saveCurrentState
=
(
current
:
number
,
pageSize
:
number
,
queryParams
?:
any
,
)
=>
{
let
currentPage
=
get
(
STATE_KEY
);
set
(
STATE_KEY
,
Object
.
assign
(
currentPage
?
currentPage
:
{},
{
pathname
:
window
.
location
.
pathname
,
current
,
pageSize
,
queryParams
,
}),
);
};
/**
* 获取表格状态数据
*/
export
const
getCurrentState
=
()
=>
{
return
get
(
STATE_KEY
);
};
/**
* 清除表格状态数据
*/
export
const
clearCurrentState
=
()
=>
{
return
remove
(
STATE_KEY
);
};
src/components/NiceForm/utils/session.ts
0 → 100644
View file @
b4fe3ee0
export
const
get
=
key
=>
{
let
result
;
result
=
sessionStorage
.
getItem
(
key
);
if
(
result
)
{
if
(
isJSON
(
result
))
{
result
=
JSON
.
parse
(
result
);
}
return
result
;
}
return
undefined
;
};
export
const
set
=
(
key
,
value
)
=>
{
if
(
typeof
value
===
'object'
)
{
value
=
JSON
.
stringify
(
value
);
}
sessionStorage
.
setItem
(
key
,
value
);
};
export
const
remove
=
key
=>
{
sessionStorage
.
removeItem
(
key
);
};
const
isJSON
=
str
=>
{
if
(
typeof
str
===
'string'
)
{
try
{
var
obj
=
JSON
.
parse
(
str
);
if
(
typeof
obj
===
'object'
&&
obj
)
{
return
true
;
}
else
{
return
false
;
}
}
catch
(
e
)
{
return
false
;
}
}
};
src/components/ReturnEle/index.tsx
View file @
b4fe3ee0
...
...
@@ -11,9 +11,27 @@ interface IProps {
const
ReutrnEle
:
React
.
FC
<
IProps
>
=
(
props
)
=>
{
const
{
description
,
logoSrc
}
=
props
const
bubbles
=
(
e
:
any
)
=>
{
let
ev
=
e
||
window
.
event
;
if
(
ev
&&
ev
.
stopPropagation
)
{
ev
.
stopPropagation
();
}
else
{
ev
.
cancelBubble
=
true
;
}
}
return
<>
<
span
style=
{
{
fontSize
:
15
,
color
:
'#909399FF'
}
}
><
ArrowLeftOutlined
/>
{
logoSrc
?
<
img
src=
{
logoSrc
}
style=
{
{
width
:
48
,
height
:
48
,
margin
:
'0 0 0 14px'
}
}
/>
:
description
}
</
span
>
<
span
style=
{
{
fontSize
:
12
,
color
:
'#909399FF'
}
}
>
<
ArrowLeftOutlined
/>
{
logoSrc
?
<
img
src=
{
logoSrc
}
style=
{
{
width
:
48
,
height
:
48
,
margin
:
'0 0 0 14px'
,
cursor
:
'default'
}
}
onClick=
{
bubbles
}
/>
:
description
}
</
span
>
</>
}
export
default
ReutrnEle
\ No newline at end of file
export
default
ReutrnEle
src/pages/authConfig/memberSystem/index.tsx
View file @
b4fe3ee0
...
...
@@ -27,7 +27,7 @@ const MemberSystem: React.FC<{}> = () => {
const
deleteItem
=
async
(
record
)
=>
{
// 删除该项
await
PublicApi
.
postMemberManageRoleDelete
({
MemberManage
RoleId
:
record
.
id
member
RoleId
:
record
.
id
})
ref
.
current
.
reload
()
}
...
...
src/pages/authConfig/memberSystem/memberDetail.tsx
View file @
b4fe3ee0
...
...
@@ -71,7 +71,7 @@ const MemberDetail: React.FC<{}> = () => {
const
fetchRoleMenuDetail
=
async
(
id
)
=>
{
// 10秒缓存
const
res
=
await
PublicApi
.
getMemberManageRoleGet
({
MemberManage
RoleId
:
id
member
RoleId
:
id
},
{
useCache
:
true
,
ttl
:
10
*
1000
})
return
res
}
...
...
@@ -108,7 +108,7 @@ const MemberDetail: React.FC<{}> = () => {
if
(
pageStatus
===
PageStatus
.
EDIT
)
{
await
PublicApi
.
postMemberManageRoleUpdate
({
...
values
,
MemberManage
RoleId
:
id
,
member
RoleId
:
id
,
menuIds
})
}
else
{
...
...
src/pages/authConfig/userSystem/schema/index.ts
View file @
b4fe3ee0
...
...
@@ -156,7 +156,7 @@ export const UserDetailSchema:ISchema = {
type
:
'string'
,
visible
:
false
},
MemberManage
RoleIds
:
{
member
RoleIds
:
{
type
:
'array:string'
,
"x-component"
:
'tableTagList'
,
"x-component-props"
:
{
...
...
src/pages/authConfig/userSystem/userDetail.tsx
View file @
b4fe3ee0
...
...
@@ -55,7 +55,7 @@ const AddUser: React.FC<{}> = () => {
}).
then
(
async
res
=>
{
const
{
data
}
=
res
fetchOriginTreeData
().
then
(({
data
:
dataSource
})
=>
{
setFormData
({...
data
,
orgName
:
getParentTreeTitles
(
dataSource
,
data
.
orgId
),
MemberManage
RoleIds
:
data
.
memberRoleIds
.
map
((
v
,
i
)
=>
{
setFormData
({...
data
,
orgName
:
getParentTreeTitles
(
dataSource
,
data
.
orgId
),
member
RoleIds
:
data
.
memberRoleIds
.
map
((
v
,
i
)
=>
{
return
{
id
:
v
,
roleName
:
data
.
memberRoleNames
[
i
]
...
...
@@ -67,7 +67,7 @@ const AddUser: React.FC<{}> = () => {
},
[])
const
onFinish
=
async
(
values
:
any
)
=>
{
values
.
MemberManageRoleIds
=
values
.
MemberManage
RoleIds
.
map
(
v
=>
v
.
id
)
values
.
memberRoleIds
=
values
.
member
RoleIds
.
map
(
v
=>
v
.
id
)
values
.
password
=
encryptedByAES
(
values
.
password
)
const
omitValue
=
omit
(
values
,
[
'orgName'
])
const
params
=
id
?
{
...
...
@@ -83,7 +83,7 @@ const AddUser: React.FC<{}> = () => {
// 角色确认弹窗
const
roleConfirm
=
()
=>
{
setRoleVisible
(
false
)
userActions
.
setFieldValue
(
'
MemberManage
RoleIds'
,
roleSelectCtl
.
selectRow
)
userActions
.
setFieldValue
(
'
member
RoleIds'
,
roleSelectCtl
.
selectRow
)
}
const
handleSelectCancel
=
()
=>
{
setRoleVisible
(
false
)
...
...
@@ -91,7 +91,7 @@ const AddUser: React.FC<{}> = () => {
const
handleRoleBtn
=
()
=>
{
setRoleVisible
(
true
)
const
selectRoles
=
userActions
.
getFieldValue
(
'
MemberManage
RoleIds'
)
const
selectRoles
=
userActions
.
getFieldValue
(
'
member
RoleIds'
)
roleSelectCtl
.
setSelectRow
(
selectRoles
)
roleSelectCtl
.
setSelectedRowKeys
(
selectRoles
.
map
(
v
=>
v
.
id
))
}
...
...
src/pages/capitalAccount/accountLists/index.tsx
View file @
b4fe3ee0
...
...
@@ -125,7 +125,7 @@ const AccountLists: React.FC<{}> = () => {
return
{
memberType
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
MemberManage
RoleId
:
roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
member
RoleId
:
roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
memberLevel
:
levels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
}
}
...
...
@@ -169,7 +169,7 @@ const AccountLists: React.FC<{}> = () => {
FORM_FILTER_PATH
,
);
useAsyncInitSelect
(
[
'memberType'
,
'
MemberManage
RoleId'
,
'memberLevel'
],
[
'memberType'
,
'
member
RoleId'
,
'memberLevel'
],
fetchSelectOptions
,
);
}
}
...
...
src/pages/capitalAccount/accountLists/schema/index.ts
View file @
b4fe3ee0
...
...
@@ -48,7 +48,7 @@ export const searchSchema: ISchema = {
}
}
},
MemberManage
RoleId
:
{
member
RoleId
:
{
type
:
'string'
,
enum
:
[],
"x-component-props"
:
{
...
...
src/pages/capitalAccount/checkWithdraw/checkDetails.tsx
View file @
b4fe3ee0
...
...
@@ -43,7 +43,7 @@ const CheckDetail: React.FC<{}> = () => {
if
(
code
===
1000
)
{
let
bankRes
:
any
=
await
PublicApi
.
getSettleAccountsGetMemberAccountConfig
({
memberId
:
data
.
memberId
,
roleId
:
data
.
MemberManage
RoleId
,
roleId
:
data
.
member
RoleId
,
})
setBankDetail
(
bankRes
.
data
)
}
...
...
src/pages/capitalAccount/paymentWithdraw/paymentDetails.tsx
View file @
b4fe3ee0
...
...
@@ -50,7 +50,7 @@ const PaymentDetail: React.FC<{}> = () => {
if
(
code
===
1000
)
{
let
bankRes
:
any
=
await
PublicApi
.
getSettleAccountsGetMemberAccountConfig
({
memberId
:
data
.
memberId
,
roleId
:
data
.
MemberManage
RoleId
,
roleId
:
data
.
member
RoleId
,
})
setBankDetail
(
bankRes
.
data
)
}
...
...
src/pages/member/components/BasicInfo/index.tsx
View file @
b4fe3ee0
This diff is collapsed.
Click to expand it.
src/pages/member/memberMaintain/index.tsx
View file @
b4fe3ee0
...
...
@@ -254,7 +254,7 @@ const memberMaintain: React.FC<[]> = () => {
outerStatus
=
[],
status
=
[],
memberTypes
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -282,7 +282,7 @@ const memberMaintain: React.FC<[]> = () => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
innerStatus
:
innerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
...
...
src/pages/member/memberPr1/index.tsx
View file @
b4fe3ee0
...
...
@@ -157,7 +157,7 @@ const MemberPr1: React.FC<{}> = props => {
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateStep1Batch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -184,7 +184,7 @@ const MemberPr1: React.FC<{}> = props => {
const
{
memberTypes
=
[],
status
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -196,7 +196,7 @@ const MemberPr1: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
};
...
...
src/pages/member/memberPr2/index.tsx
View file @
b4fe3ee0
...
...
@@ -157,7 +157,7 @@ const MemberPr2: React.FC<{}> = props => {
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateStep2Batch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -184,7 +184,7 @@ const MemberPr2: React.FC<{}> = props => {
const
{
memberTypes
=
[],
status
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -196,7 +196,7 @@ const MemberPr2: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
};
...
...
src/pages/member/memberPrConfirm/index.tsx
View file @
b4fe3ee0
...
...
@@ -193,7 +193,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
innerStatus
=
[],
memberTypes
=
[],
status
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -212,7 +212,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
innerStatus
:
innerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})).
filter
(
item
=>
item
.
value
!==
0
),
...
...
src/pages/member/memberPrSubmit/index.tsx
View file @
b4fe3ee0
...
...
@@ -159,7 +159,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateCommitBatch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -186,7 +186,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
const
{
memberTypes
=
[],
memberStatus
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
status
=
[],
...
...
@@ -206,7 +206,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
};
...
...
src/pages/orderSystem/orderDetail/components/orderProductTable/index.tsx
View file @
b4fe3ee0
...
...
@@ -300,7 +300,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
return
await
Promise
.
all
(
asyncData
.
filter
(
v
=>
v
.
memberPrice
===
undefined
).
map
(
async
v
=>
{
const
{
code
,
data
}
=
await
PublicApi
.
getMemberManageUpperCreditParamGet
({
parentMemberId
:
v
.
memberId
,
parentMember
ManageRoleId
:
v
.
MemberManage
RoleId
parentMember
RoleId
:
v
.
member
RoleId
},
{
ttl
:
60
*
1000
,
useCache
:
true
})
return
code
===
1000
?
{
value
:
(
data
.
parameter
*
100
)
+
'%'
,
id
:
v
.
id
}
:
{
value
:
''
,
id
:
0
}
}
...
...
src/pages/orderSystem/orderDetail/effects/index.ts
View file @
b4fe3ee0
...
...
@@ -23,7 +23,7 @@ const asyncPadDataForProduct = async (ctx: ISchemaFormActions | ISchemaFormAsync
const
asyncPriceRequests
:
any
[]
=
await
Promise
.
all
(
productData
.
filter
(
v
=>
v
.
memberPrice
===
undefined
).
map
(
async
v
=>
{
const
{
code
,
data
}
=
await
PublicApi
.
getMemberManageUpperCreditParamGet
({
parentMemberId
:
v
.
memberId
,
parentMember
ManageRoleId
:
v
.
MemberManage
RoleId
parentMember
RoleId
:
v
.
member
RoleId
},
{
ttl
:
60
*
1000
,
useCache
:
true
})
return
code
===
1000
?
{
value
:
(
data
.
parameter
*
100
)
+
'%'
,
id
:
v
.
id
}
:
{
value
:
''
,
id
:
0
}
}
...
...
src/pages/returnManage/components/RefundModal/Balance/index.tsx
View file @
b4fe3ee0
...
...
@@ -47,7 +47,7 @@ const Balance: React.FC<BalanceProps> = ({
setLoading
(
true
);
PublicApi
.
getPayAssetAccountGetChildUserBalance
({
childMemberId
:
`
${
purchaserId
}
`
,
childMember
Manage
RoleId
:
`
${
purchaserRoleId
}
`
,
childMemberRoleId
:
`
${
purchaserRoleId
}
`
,
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
setBalance
(
res
.
data
);
...
...
src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx
View file @
b4fe3ee0
...
...
@@ -34,7 +34,7 @@ export interface RuleSettingProps {
const
RuleSetting
:
React
.
FC
<
RuleSettingProps
>
=
(
props
)
=>
{
const
{
addSchemaAction
,
schema
,
formSubmit
,
onFieldChange
=
()
=>
{}
}
=
props
const
[
visibleChannelRroduct
,
setVisibleChannelRroduct
]
=
useState
(
false
)
const
[
memberRowSelection
,
memberRowCtl
]
=
useRowSelectionTable
({
customKey
:
'
MemberManage
RoleId'
})
const
[
memberRowSelection
,
memberRowCtl
]
=
useRowSelectionTable
({
customKey
:
'
member
RoleId'
})
const
[
initValue
,
setInitialValue
]
=
useState
({})
const
[
membersLength
,
setMembersLength
]
=
useState
(
0
)
...
...
@@ -47,19 +47,19 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
const
fetchMembersList
=
async
(
params
)
=>
{
const
res
=
await
PublicApi
.
getMemberManageAllProviderPage
(
params
)
const
{
code
,
data
}
=
res
let
_data
=
data
.
data
.
map
(
item
=>
({
...
item
,
MemberManage
RoleId
:
item
.
memberId
+
'_'
+
item
.
roleId
}))
let
_data
=
data
.
data
.
map
(
item
=>
({
...
item
,
member
RoleId
:
item
.
memberId
+
'_'
+
item
.
roleId
}))
return
{
totalCount
:
data
.
totalCount
,
data
:
_data
}
}
// table删除商品
const
handleDeleteTable
=
(
id
)
=>
{
const
value
=
addSchemaAction
.
getFieldValue
(
'memberIds'
)
addSchemaAction
.
setFieldValue
(
'memberIds'
,
findItemAndDelete
(
value
,
id
,
'
MemberManage
RoleId'
))
addSchemaAction
.
setFieldValue
(
'memberIds'
,
findItemAndDelete
(
value
,
id
,
'
member
RoleId'
))
}
const
handleAddMemberBtn
=
()
=>
{
const
checkBoxs
=
addSchemaAction
.
getFieldValue
(
'memberIds'
)
memberRowCtl
.
setSelectedRowKeys
(
checkBoxs
.
map
(
v
=>
v
.
MemberManage
RoleId
))
memberRowCtl
.
setSelectedRowKeys
(
checkBoxs
.
map
(
v
=>
v
.
member
RoleId
))
memberRowCtl
.
setSelectRow
(
checkBoxs
)
setVisibleChannelRroduct
(
true
)
}
...
...
@@ -98,7 +98,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
{
dataIndex
:
'ctl'
,
title
:
'操作'
,
render
:
(
_
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleDeleteTable
(
record
.
MemberManage
RoleId
)
}
>
删除
</
Button
>
render
:
(
_
,
record
)
=>
<
Button
type=
'link'
onClick=
{
()
=>
handleDeleteTable
(
record
.
member
RoleId
)
}
>
删除
</
Button
>
}
]
...
...
@@ -120,9 +120,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
const
columnsSetProduct
:
any
[]
=
[
{
dataIndex
:
'
MemberManage
RoleId'
,
dataIndex
:
'
member
RoleId'
,
title
:
'MRID'
,
key
:
'
MemberManage
RoleId'
,
key
:
'
member
RoleId'
,
className
:
'commonHide'
},
{
...
...
@@ -258,7 +258,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
const
getBindingMembers
=
async
({
id
=
'1'
,
current
=
'1'
,
pageSize
=
'10'
})
=>
{
const
res
=
await
PublicApi
.
getOrderTradingRulesBackgroundMember
({
id
,
current
,
pageSize
})
const
{
code
,
data
}
=
res
let
_data
=
data
.
data
.
map
(
item
=>
({
...
item
,
MemberManage
RoleId
:
item
.
memberId
+
'_'
+
item
.
roleId
}))
let
_data
=
data
.
data
.
map
(
item
=>
({
...
item
,
member
RoleId
:
item
.
memberId
+
'_'
+
item
.
roleId
}))
return
{
totalCount
:
data
.
totalCount
,
data
:
_data
}
}
...
...
@@ -325,7 +325,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
}
}
tableProps=
{
{
rowKey
:
'
MemberManage
RoleId'
rowKey
:
'
member
RoleId'
}
}
/>
...
...
src/pages/ruleSettingManage/transactionRules/schema/index.tsx
View file @
b4fe3ee0
...
...
@@ -105,7 +105,7 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
type
:
'array:number'
,
"x-component"
:
'MultTable'
,
"x-component-props"
:
{
rowKey
:
'
MemberManage
RoleId'
,
rowKey
:
'
member
RoleId'
,
columns
:
"{{tableColumns}}"
,
prefix
:
"{{tableAddButton}}"
}
...
...
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