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
69f0dfba
Commit
69f0dfba
authored
Jul 29, 2021
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of 10.0.0.22:lingxi/lingxi-business-system into v2
parents
398c0008
9f4d21ab
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
110 additions
and
110 deletions
+110
-110
addRule.tsx
src/pages/ruleSettingManage/procurementRules/addRule.tsx
+3
-3
RuleSetting.tsx
...SettingManage/procurementRules/components/RuleSetting.tsx
+9
-9
index.tsx
...nage/procurementRules/components/selectProcesss/index.tsx
+6
-6
index.tsx
src/pages/ruleSettingManage/procurementRules/index.tsx
+14
-14
index.tsx
...pages/ruleSettingManage/procurementRules/schema/index.tsx
+7
-7
addRule.tsx
src/pages/ruleSettingManage/transactionRules/addRule.tsx
+7
-7
RuleSetting.tsx
...SettingManage/transactionRules/components/RuleSetting.tsx
+11
-12
index.tsx
...nage/transactionRules/components/selectProcesss/index.tsx
+8
-9
index.tsx
src/pages/ruleSettingManage/transactionRules/index.tsx
+14
-14
ruleDetails.tsx
src/pages/ruleSettingManage/transactionRules/ruleDetails.tsx
+20
-21
index.tsx
...pages/ruleSettingManage/transactionRules/schema/index.tsx
+8
-8
api.ts
src/services/api.ts
+2
-0
ytt.config.ts
ytt.config.ts
+1
-0
No files found.
src/pages/ruleSettingManage/procurementRules/addRule.tsx
View file @
69f0dfba
...
...
@@ -29,15 +29,15 @@ const AddRule:React.FC<{}> = (props) => {
const
formSubmit
=
async
(
values
)
=>
{
setIsDisabled
(
true
)
const
params
=
omit
(
values
,
[
'state'
])
params
.
baseProcessId
=
params
.
baseProcessId
[
0
]
console
.
log
(
params
,
'parmas'
)
// 切割memberId
let
res
:
any
=
{}
if
(
pageStatus
===
PageStatus
.
EDIT
){
res
=
await
PublicApi
.
post
ManagePurchaseRuleConfig
Update
(
params
)
res
=
await
PublicApi
.
post
OrderPlatformPurchaseProcess
Update
(
params
)
}
else
if
(
pageStatus
===
PageStatus
.
ADD
){
res
=
await
PublicApi
.
post
ManagePurchaseRuleConfigAdd
(
params
)
res
=
await
PublicApi
.
post
OrderPlatformPurchaseProcessCreate
(
params
)
}
if
(
res
.
code
===
1000
){
...
...
src/pages/ruleSettingManage/procurementRules/components/RuleSetting.tsx
View file @
69f0dfba
...
...
@@ -48,12 +48,12 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
// table删除商品
const
handleDeleteTable
=
(
id
)
=>
{
const
value
=
addSchemaAction
.
getFieldValue
(
'member
Id
s'
)
addSchemaAction
.
setFieldValue
(
'member
Id
s'
,
findItemAndDelete
(
value
,
id
,
'MemberManageRoleId'
))
const
value
=
addSchemaAction
.
getFieldValue
(
'members'
)
addSchemaAction
.
setFieldValue
(
'members'
,
findItemAndDelete
(
value
,
id
,
'MemberManageRoleId'
))
}
const
handleAddMemberBtn
=
()
=>
{
const
checkBoxs
=
addSchemaAction
.
getFieldValue
(
'member
Id
s'
)
const
checkBoxs
=
addSchemaAction
.
getFieldValue
(
'members'
)
memberRowCtl
.
setSelectedRowKeys
(
checkBoxs
.
map
(
v
=>
v
.
MemberManageRoleId
))
memberRowCtl
.
setSelectRow
(
checkBoxs
)
setVisibleChannelRroduct
(
true
)
...
...
@@ -106,7 +106,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
const
handleOkAddMember
=
async
()
=>
{
setVisibleChannelRroduct
(
false
)
console
.
log
(
memberRowCtl
)
addSchemaAction
.
setFieldValue
(
'member
Id
s'
,
memberRowCtl
.
selectRow
)
addSchemaAction
.
setFieldValue
(
'members'
,
memberRowCtl
.
selectRow
)
}
const
handleCancelAddMember
=
()
=>
{
...
...
@@ -233,15 +233,15 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
useEffect
(()
=>
{
async
function
getInitValue
()
{
// @ts-ignore
const
{
data
}
=
await
PublicApi
.
get
ManagePurchaseRuleConfigDetails
({
i
d
:
id
});
if
(
!
data
.
isApplyMember
)
{
const
{
data
}
=
await
PublicApi
.
get
OrderPlatformPurchaseProcessGet
({
processI
d
:
id
});
if
(
!
data
.
allMembers
)
{
const
res
=
await
getBindingMembers
({
id
:
id
.
toString
(),
current
:
'1'
,
pageSize
:
'10'
})
addSchemaAction
.
setFieldState
(
'member
Id
s'
,
(
state
)
=>
{
addSchemaAction
.
setFieldState
(
'members'
,
(
state
)
=>
{
state
.
value
=
res
.
data
})
setMembersLength
(
res
.
totalCount
);
}
addSchemaAction
.
setFieldValue
(
'
isApplyMember'
,
data
.
isApplyMember
===
1
?
1
:
0
)
addSchemaAction
.
setFieldValue
(
'
allMembers'
,
data
.
allMembers
)
setInitialValue
(
data
)
}
if
(
id
!=
''
)
{
...
...
@@ -251,7 +251,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
// 拿到绑定的会员
const
getBindingMembers
=
async
({
id
=
'1'
,
current
=
'1'
,
pageSize
=
'10'
})
=>
{
const
res
=
await
PublicApi
.
get
ManagePurchaseMemberItemsList
({
id
,
current
,
pageSize
})
const
res
=
await
PublicApi
.
get
OrderPlatformPurchaseProcessMemberPage
({
processId
:
id
,
current
,
pageSize
,
name
:
''
})
const
{
code
,
data
}
=
res
let
_data
=
data
.
data
.
map
(
item
=>
({
...
item
,
MemberManageRoleId
:
item
.
memberId
+
'_'
+
item
.
roleId
}))
return
{
totalCount
:
data
.
totalCount
,
data
:
_data
}
...
...
src/pages/ruleSettingManage/procurementRules/components/selectProcesss/index.tsx
View file @
69f0dfba
...
...
@@ -63,7 +63,7 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
const
value
:
number
[]
=
props
.
value
||
[]
useEffect
(()
=>
{
PublicApi
.
get
ManagePurchaseProcesRespon
seList
().
then
(
res
=>
{
PublicApi
.
get
OrderPlatformPurchaseProcessBa
seList
().
then
(
res
=>
{
setFieldState
({
dataSource
:
res
.
data
,
showMore
...
...
@@ -102,8 +102,8 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
}
const
renderProcessType
=
(
v
:
any
)
=>
{
return
<
Tag
color=
{
ProcessTagColor
[
v
.
t
ype
-
1
]
}
>
{
ProcessTagType
[
v
.
t
ype
-
1
]
}
return
<
Tag
color=
{
ProcessTagColor
[
v
.
processT
ype
-
1
]
}
>
{
ProcessTagType
[
v
.
processT
ype
-
1
]
}
</
Tag
>
}
...
...
@@ -111,17 +111,17 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
<
div
style=
{
{
width
:
'100%'
}
}
>
<
SelectStyles
>
{
showDataSource
.
map
(
v
=>
<
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
.
id
)
}
className=
{
cx
(
'select_style_border'
,
isChecked
(
v
.
id
)
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
div
key=
{
v
.
baseProcessid
}
onClick=
{
()
=>
handleCheck
(
v
.
baseProcessid
)
}
className=
{
cx
(
'select_style_border'
,
isChecked
(
v
.
baseProcess
id
)
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
n
ame
}
</
Col
>
<
Col
>
{
v
.
processN
ame
}
</
Col
>
<
Col
style=
{
{
marginLeft
:
6
}
}
>
{
renderProcessType
(
v
)
}
</
Col
>
</
Row
>
<
div
style=
{
{
color
:
'#909399'
}
}
>
{
v
.
explai
n
}
</
div
>
<
div
style=
{
{
color
:
'#909399'
}
}
>
{
v
.
descriptio
n
}
</
div
>
</
div
>
</
div
>)
}
...
...
src/pages/ruleSettingManage/procurementRules/index.tsx
View file @
69f0dfba
...
...
@@ -18,7 +18,7 @@ const ProcurementRules: React.FC<{}> = () => {
const
fetchData
=
(
params
:
any
)
=>
{
if
(
!
params
?.
name
)
delete
params
.
name
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
get
ManagePurchaseRuleConfigList
(
params
).
then
(
res
=>
{
PublicApi
.
get
OrderPlatformPurchaseProcessPage
(
params
).
then
(
res
=>
{
const
{
data
}
=
res
resolve
(
data
)
})
...
...
@@ -28,8 +28,8 @@ const ProcurementRules: React.FC<{}> = () => {
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'流程规则ID'
,
dataIndex
:
'
i
d'
,
key
:
'
i
d'
,
dataIndex
:
'
processI
d'
,
key
:
'
processI
d'
,
},
{
title
:
'流程规则名称'
,
...
...
@@ -37,21 +37,21 @@ const ProcurementRules: React.FC<{}> = () => {
key
:
'name'
,
className
:
'commonPickColor'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
EyePreview
url=
{
`/ruleSettingManager/procurementRules/ruleDetails?id=${record.
i
d}`
}
url=
{
`/ruleSettingManager/procurementRules/ruleDetails?id=${record.
processI
d}`
}
>
{
text
}
</
EyePreview
>
},
{
title
:
'操作时间'
,
dataIndex
:
'
upd
ateTime'
,
key
:
'
upd
ateTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
dataIndex
:
'
cre
ateTime'
,
key
:
'
cre
ateTime'
,
//
render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss')
},
{
title
:
'状态'
,
dataIndex
:
'stat
e
'
,
key
:
'stat
e
'
,
dataIndex
:
'stat
us
'
,
key
:
'stat
us
'
,
render
:
(
text
:
any
,
record
:
any
)
=>
{
let
component
:
ReactNode
=
null
component
=
(
...
...
@@ -64,7 +64,7 @@ const ProcurementRules: React.FC<{}> = () => {
>
<
Button
type=
"link"
style=
{
record
.
stat
e
?
{
color
:
'#00B37A'
}
:
{
color
:
'red'
}
}
>
{
record
.
state
?
<>
有效
<
PlayCircleOutlined
/></>
:
<>
无效
<
PauseCircleOutlined
/></>
}
</
Button
>
style=
{
record
.
stat
us
?
{
color
:
'#00B37A'
}
:
{
color
:
'red'
}
}
>
{
record
.
status
?
<>
有效
<
PlayCircleOutlined
/></>
:
<>
无效
<
PauseCircleOutlined
/></>
}
</
Button
>
</
Popconfirm
>
)
return
component
...
...
@@ -77,7 +77,7 @@ const ProcurementRules: React.FC<{}> = () => {
return
(
<>
{
(
record
.
stat
e
===
0
)
?
<>
(
record
.
stat
us
===
0
)
?
<>
<
Popconfirm
title=
"确定要执行这个操作?"
onConfirm=
{
()
=>
handelDelete
(
record
)
}
...
...
@@ -87,7 +87,7 @@ const ProcurementRules: React.FC<{}> = () => {
>
<
Button
type=
'link'
>
删除
</
Button
>
</
Popconfirm
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/ruleSettingManager/procurementRules/editRule?id=${record.
i
d}`
)
}
>
修改
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/ruleSettingManager/procurementRules/editRule?id=${record.
processI
d}`
)
}
>
修改
</
Button
>
</>
:
''
}
</>
...
...
@@ -97,7 +97,7 @@ const ProcurementRules: React.FC<{}> = () => {
];
const
confirm
=
(
record
:
any
)
=>
{
PublicApi
.
post
ManagePurchaseRuleConfigStartOrStop
({
id
:
record
.
id
,
state
:
record
.
state
?
0
:
1
}).
then
(
res
=>
{
PublicApi
.
post
OrderPlatformPurchaseProcessStatusUpdate
({
processId
:
record
.
processId
,
status
:
record
.
status
?
0
:
1
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
...
...
@@ -107,7 +107,7 @@ const ProcurementRules: React.FC<{}> = () => {
}
const
handelDelete
=
(
record
:
any
)
=>
{
PublicApi
.
post
ManagePurchaseRuleConfigDelete
({
id
:
record
.
i
d
}).
then
(
res
=>
{
PublicApi
.
post
OrderPlatformPurchaseProcessDelete
({
processId
:
record
.
processI
d
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
ref
.
current
.
reload
()
})
...
...
src/pages/ruleSettingManage/procurementRules/schema/index.tsx
View file @
69f0dfba
...
...
@@ -45,7 +45,7 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
}
]
},
processEnums
:
{
baseProcessId
:
{
type
:
'array:number'
,
title
:
'流程选择'
,
"x-component"
:
'SelectProcesss'
,
...
...
@@ -83,24 +83,24 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
labelAlign
:
'left'
},
properties
:
{
"
isApplyMember
"
:
{
"
allMembers
"
:
{
"type"
:
"radio"
,
enum
:
[
{
label
:
'所有会员(默认)'
,
value
:
1
},
{
label
:
'指定会员'
,
value
:
0
},
{
label
:
'所有会员(默认)'
,
value
:
true
},
{
label
:
'指定会员'
,
value
:
false
},
],
"title"
:
"适用会员"
,
default
:
1
,
default
:
true
,
required
:
true
,
"x-linkages"
:
[
{
type
:
'value:visible'
,
target
:
'member
Id
s'
,
target
:
'members'
,
"condition"
:
"{{!$value}}"
}
]
},
member
Id
s
:
{
members
:
{
type
:
'array:number'
,
"x-component"
:
'MultTable'
,
"x-component-props"
:
{
...
...
src/pages/ruleSettingManage/transactionRules/addRule.tsx
View file @
69f0dfba
...
...
@@ -29,23 +29,23 @@ const AddRule:React.FC<{}> = (props) => {
const
formSubmit
=
async
(
values
)
=>
{
setIsDisabled
(
true
)
const
params
=
omit
(
values
,
[
'state'
])
params
.
baseProcessId
=
params
.
baseProcessId
[
0
]
console
.
log
(
params
,
'parmas'
)
// 切割memberId
let
res
:
any
=
{}
if
(
pageStatus
===
PageStatus
.
EDIT
){
res
=
await
PublicApi
.
postOrder
TradingRulesBackgroundUpdata
(
params
)
res
=
await
PublicApi
.
postOrder
PlatformTradeProcessUpdate
(
params
)
}
else
if
(
pageStatus
===
PageStatus
.
ADD
){
res
=
await
PublicApi
.
postOrder
TradingRulesBackgroundAdd
(
params
)
res
=
await
PublicApi
.
postOrder
PlatformTradeProcessCreate
(
params
)
}
if
(
res
.
code
===
1000
){
setIsDisabled
(
false
)
history
.
goBack
(
-
1
)
history
.
goBack
()
}
}
return
(
<
PageHeaderWrapper
onBack=
{
()
=>
history
.
goBack
()
}
...
...
@@ -54,9 +54,9 @@ const AddRule:React.FC<{}> = (props) => {
className=
"addRule"
extra=
{
[
<
Button
key=
"1"
key=
"1"
onClick=
{
()
=>
addSchemaAction
.
submit
()
}
type=
"primary"
type=
"primary"
icon=
{
<
SaveOutlined
/>
}
disabled=
{
isDisabled
}
>
...
...
src/pages/ruleSettingManage/transactionRules/components/RuleSetting.tsx
View file @
69f0dfba
...
...
@@ -53,12 +53,12 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
// table删除商品
const
handleDeleteTable
=
(
id
)
=>
{
const
value
=
addSchemaAction
.
getFieldValue
(
'member
Id
s'
)
addSchemaAction
.
setFieldValue
(
'member
Id
s'
,
findItemAndDelete
(
value
,
id
,
'memberRoleId'
))
const
value
=
addSchemaAction
.
getFieldValue
(
'members'
)
addSchemaAction
.
setFieldValue
(
'members'
,
findItemAndDelete
(
value
,
id
,
'memberRoleId'
))
}
const
handleAddMemberBtn
=
()
=>
{
const
checkBoxs
=
addSchemaAction
.
getFieldValue
(
'member
Id
s'
)
const
checkBoxs
=
addSchemaAction
.
getFieldValue
(
'members'
)
memberRowCtl
.
setSelectedRowKeys
(
checkBoxs
.
map
(
v
=>
v
.
memberRoleId
))
memberRowCtl
.
setSelectRow
(
checkBoxs
)
setVisibleChannelRroduct
(
true
)
...
...
@@ -74,9 +74,9 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
key
:
'memberId'
},
{
dataIndex
:
'
memberN
ame'
,
dataIndex
:
'
n
ame'
,
title
:
'会员名称'
,
key
:
'
memberN
ame'
,
key
:
'
n
ame'
,
// render: (_, record) => <EyePreview url={`/memberCenter/commodityAbility/commodity/products/viewProducts?id=${record.id}`}>{_}</EyePreview>
},
{
...
...
@@ -111,7 +111,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
const
handleOkAddMember
=
async
()
=>
{
setVisibleChannelRroduct
(
false
)
console
.
log
(
memberRowCtl
)
addSchemaAction
.
setFieldValue
(
'member
Id
s'
,
memberRowCtl
.
selectRow
)
addSchemaAction
.
setFieldValue
(
'members'
,
memberRowCtl
.
selectRow
)
}
const
handleCancelAddMember
=
()
=>
{
...
...
@@ -237,16 +237,15 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
useEffect
(()
=>
{
async
function
getInitValue
()
{
// @ts-ignore
const
{
data
}
=
await
PublicApi
.
getOrderTradingRulesBackgroundDetails
({
id
:
id
});
if
(
data
.
isTacitlyApprove
===
2
)
{
const
{
data
}:
any
=
await
PublicApi
.
getOrderPlatformTradeProcessGet
({
processId
:
id
});
if
(
!
data
.
allMembers
)
{
const
res
=
await
getBindingMembers
({
id
:
id
.
toString
(),
current
:
'1'
,
pageSize
:
'10'
})
addSchemaAction
.
setFieldState
(
'member
Id
s'
,
(
state
)
=>
{
addSchemaAction
.
setFieldState
(
'members'
,
(
state
)
=>
{
state
.
value
=
res
.
data
})
setMembersLength
(
res
.
totalCount
);
}
addSchemaAction
.
setFieldValue
(
'
isTacitlyApprove'
,
data
.
isTacitlyApprove
===
1
?
1
:
2
)
addSchemaAction
.
setFieldValue
(
'
allMembers'
,
data
.
allMembers
)
setInitialValue
(
data
)
}
if
(
id
!=
''
)
{
...
...
@@ -256,7 +255,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
// 拿到绑定的会员
const
getBindingMembers
=
async
({
id
=
'1'
,
current
=
'1'
,
pageSize
=
'10'
})
=>
{
const
res
=
await
PublicApi
.
getOrder
TradingRulesBackgroundMember
({
id
,
current
,
pageSize
})
const
res
=
await
PublicApi
.
getOrder
PlatformTradeProcessMemberPage
({
processId
:
id
,
current
,
pageSize
,
name
:
''
})
const
{
code
,
data
}
=
res
let
_data
=
data
.
data
.
map
(
item
=>
({
...
item
,
memberRoleId
:
item
.
memberId
+
'_'
+
item
.
roleId
}))
return
{
totalCount
:
data
.
totalCount
,
data
:
_data
}
...
...
src/pages/ruleSettingManage/transactionRules/components/selectProcesss/index.tsx
View file @
69f0dfba
...
...
@@ -19,7 +19,7 @@ const SelectStyles = styled((props) => <div className='select-list' {...props}><
line-height: 28px;
position:relative;
}
.select_style_border.active {
border: 1px solid #00B382;
}
...
...
@@ -63,7 +63,7 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
const
value
:
number
[]
=
props
.
value
||
[]
useEffect
(()
=>
{
PublicApi
.
getOrderP
rocessRuleConfig
List
().
then
(
res
=>
{
PublicApi
.
getOrderP
latformTradeProcessBase
List
().
then
(
res
=>
{
setFieldState
({
dataSource
:
res
.
data
,
showMore
...
...
@@ -102,8 +102,8 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
}
const
renderProcessType
=
(
v
:
any
)
=>
{
return
<
Tag
color=
{
ProcessTagColor
[
v
.
t
ype
-
1
]
}
>
{
ProcessTagType
[
v
.
t
ype
-
1
]
}
return
<
Tag
color=
{
ProcessTagColor
[
v
.
processT
ype
-
1
]
}
>
{
ProcessTagType
[
v
.
processT
ype
-
1
]
}
</
Tag
>
}
...
...
@@ -111,17 +111,17 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
<
div
style=
{
{
width
:
'100%'
}
}
>
<
SelectStyles
>
{
showDataSource
.
map
(
v
=>
<
div
key=
{
v
.
id
}
onClick=
{
()
=>
handleCheck
(
v
.
id
)
}
className=
{
cx
(
'select_style_border'
,
isChecked
(
v
.
id
)
?
'active'
:
''
)
}
>
showDataSource
.
map
(
v
=>
<
div
key=
{
v
.
baseProcessid
}
onClick=
{
()
=>
handleCheck
(
v
.
baseProcessid
)
}
className=
{
cx
(
'select_style_border'
,
isChecked
(
v
.
baseProcess
id
)
?
'active'
:
''
)
}
>
<
div
>
<
Row
style=
{
{
color
:
'#303133'
}
}
>
<
Col
>
{
v
.
n
ame
}
</
Col
>
<
Col
>
{
v
.
processN
ame
}
</
Col
>
<
Col
style=
{
{
marginLeft
:
6
}
}
>
{
renderProcessType
(
v
)
}
</
Col
>
</
Row
>
<
div
style=
{
{
color
:
'#909399'
}
}
>
{
v
.
explai
n
}
</
div
>
<
div
style=
{
{
color
:
'#909399'
}
}
>
{
v
.
descriptio
n
}
</
div
>
</
div
>
</
div
>)
}
...
...
@@ -139,4 +139,4 @@ SelectProcesss.defaultProps = {}
SelectProcesss
.
isFieldComponent
=
true
;
export
default
SelectProcesss
\ No newline at end of file
export
default
SelectProcesss
src/pages/ruleSettingManage/transactionRules/index.tsx
View file @
69f0dfba
...
...
@@ -21,7 +21,7 @@ const TransactionRules: React.FC<{}> = () => {
const
fetchData
=
(
params
:
any
)
=>
{
if
(
!
params
?.
name
)
delete
params
.
name
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
getOrder
TradingRulesBackgroundList
(
params
).
then
(
res
=>
{
PublicApi
.
getOrder
PlatformTradeProcessPage
(
params
).
then
(
res
=>
{
const
{
data
}
=
res
resolve
(
data
)
})
...
...
@@ -31,8 +31,8 @@ const TransactionRules: React.FC<{}> = () => {
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'交易规则ID'
,
dataIndex
:
'
i
d'
,
key
:
'
i
d'
,
dataIndex
:
'
processI
d'
,
key
:
'
processI
d'
,
},
{
title
:
'流程规则名称'
,
...
...
@@ -41,7 +41,7 @@ const TransactionRules: React.FC<{}> = () => {
className
:
'commonPickColor'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
EyePreview
// url={`/ruleSettingManager/transactionRules/addRule?id=${record.id}&preview=1`}
url=
{
`/ruleSettingManager/transactionRules/ruleDetails?id=${record.
i
d}`
}
url=
{
`/ruleSettingManager/transactionRules/ruleDetails?id=${record.
processI
d}`
}
>
{
text
}
</
EyePreview
>
...
...
@@ -53,14 +53,14 @@ const TransactionRules: React.FC<{}> = () => {
// },
{
title
:
'操作时间'
,
dataIndex
:
'
operation
Time'
,
key
:
'
operation
Time'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
dataIndex
:
'
create
Time'
,
key
:
'
create
Time'
,
//
render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss')
},
{
title
:
'状态'
,
dataIndex
:
'stat
e
'
,
key
:
'stat
e
'
,
dataIndex
:
'stat
us
'
,
key
:
'stat
us
'
,
render
:
(
text
:
any
,
record
:
any
)
=>
{
let
component
:
ReactNode
=
null
component
=
(
...
...
@@ -73,7 +73,7 @@ const TransactionRules: React.FC<{}> = () => {
>
<
Button
type=
"link"
style=
{
record
.
stat
e
?
{
color
:
'#00B37A'
}
:
{
color
:
'red'
}
}
>
{
record
.
state
?
<>
有效
<
PlayCircleOutlined
/></>
:
<>
无效
<
PauseCircleOutlined
/></>
}
</
Button
>
style=
{
record
.
stat
us
?
{
color
:
'#00B37A'
}
:
{
color
:
'red'
}
}
>
{
record
.
state
?
<>
有效
<
PlayCircleOutlined
/></>
:
<>
无效
<
PauseCircleOutlined
/></>
}
</
Button
>
</
Popconfirm
>
)
return
component
...
...
@@ -86,7 +86,7 @@ const TransactionRules: React.FC<{}> = () => {
return
(
<>
{
(
record
.
stat
e
===
0
)
?
<>
(
record
.
stat
us
===
0
)
?
<>
<
Popconfirm
title=
"确定要执行这个操作?"
onConfirm=
{
()
=>
handelDelete
(
record
)
}
...
...
@@ -96,7 +96,7 @@ const TransactionRules: React.FC<{}> = () => {
>
<
Button
type=
'link'
>
删除
</
Button
>
</
Popconfirm
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/ruleSettingManager/transactionRules/addRule?id=${record.
i
d}`
)
}
>
修改
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/ruleSettingManager/transactionRules/addRule?id=${record.
processI
d}`
)
}
>
修改
</
Button
>
</>
:
''
}
</>
...
...
@@ -106,7 +106,7 @@ const TransactionRules: React.FC<{}> = () => {
];
const
confirm
=
(
record
:
any
)
=>
{
PublicApi
.
postOrder
TradingRulesBackgroundUpdateState
({
id
:
record
.
id
,
state
:
record
.
state
?
0
:
1
}).
then
(
res
=>
{
PublicApi
.
postOrder
PlatformTradeProcessStatusUpdate
({
processId
:
record
.
processId
,
status
:
record
.
status
?
0
:
1
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
...
...
@@ -116,7 +116,7 @@ const TransactionRules: React.FC<{}> = () => {
}
const
handelDelete
=
(
record
:
any
)
=>
{
PublicApi
.
postOrder
TradingRulesBackgroundDelete
({
id
:
record
.
i
d
}).
then
(
res
=>
{
PublicApi
.
postOrder
PlatformTradeProcessDelete
({
processId
:
record
.
processI
d
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
ref
.
current
.
reload
()
})
...
...
src/pages/ruleSettingManage/transactionRules/ruleDetails.tsx
View file @
69f0dfba
...
...
@@ -6,18 +6,17 @@ import ReutrnEle from '@/components/ReturnEle'
import
{
PublicApi
}
from
'@/services/api'
import
EyePreview
from
'@/components/EyePreview'
import
LevelBrand
from
'@/pages/member/components/LevelBrand'
import
{
GetOrderTradingRulesBackgroundDetailsResponse
,
GetOrderTradingRulesBackgroundMemberResponse
}
from
'@/services/OrderApi'
import
{
StandardTable
}
from
'god'
const
AddRule
:
React
.
FC
<
{}
>
=
(
props
)
=>
{
const
[
membersList
,
setMembersList
]
=
useState
<
GetOrderTradingRulesBackgroundMemberResponse
>
()
const
[
ruleDetails
,
setRuleDetails
]
=
useState
<
GetOrderTradingRulesBackgroundDetailsResponse
>
()
const
[
membersList
,
setMembersList
]
=
useState
<
any
>
()
const
[
ruleDetails
,
setRuleDetails
]
=
useState
<
any
>
()
const
{
id
}
=
history
.
location
.
query
const
{
id
}
:
any
=
history
.
location
.
query
useEffect
(()
=>
{
// 获取规则详情
PublicApi
.
getOrder
TradingRulesBackgroundDetails
({
id
,
current
:
'1'
,
pageSize
:
'10'
}).
then
(
res
=>
{
PublicApi
.
getOrder
PlatformTradeProcessGet
({
processId
:
id
}).
then
(
res
=>
{
const
{
data
}
=
res
setRuleDetails
(
data
)
})
...
...
@@ -26,7 +25,7 @@ const AddRule:React.FC<{}> = (props) => {
const
fetchData
=
(
params
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
// 获取绑定的会员列表
PublicApi
.
getOrder
TradingRulesBackgroundMember
({
id
,
...
params
}).
then
(
res
=>
{
PublicApi
.
getOrder
PlatformTradeProcessMemberPage
({
processId
:
id
,
...
params
,
name
:
''
}).
then
(
res
=>
{
const
{
data
}
=
res
resolve
(
data
)
})
...
...
@@ -34,30 +33,30 @@ const AddRule:React.FC<{}> = (props) => {
}
const
tableColumns
=
[
{
{
dataIndex
:
'memberId'
,
title
:
'ID'
,
key
:
'memberId'
},
{
dataIndex
:
'
memberName'
,
title
:
'会员名称'
,
key
:
'
memberN
ame'
,
// render: (_, record) => <EyePreview url={`/memberCenter/commodityAbility/commodity/products/viewProducts?id=${record.id}`}>{_}</EyePreview>
{
dataIndex
:
'
name'
,
title
:
'会员名称'
,
key
:
'
n
ame'
,
// render: (_, record) => <EyePreview url={`/memberCenter/commodityAbility/commodity/products/viewProducts?id=${record.id}`}>{_}</EyePreview>
},
{
dataIndex
:
'memberTypeName'
,
title
:
'会员类型'
,
{
dataIndex
:
'memberTypeName'
,
title
:
'会员类型'
,
key
:
'memberTypeName'
},
{
dataIndex
:
'roleName'
,
title
:
'会员角色'
,
{
dataIndex
:
'roleName'
,
title
:
'会员角色'
,
key
:
'roleName'
},
{
dataIndex
:
'levelTag'
,
title
:
'会员等级'
,
{
dataIndex
:
'levelTag'
,
title
:
'会员等级'
,
key
:
'levelTag'
,
render
:
(
text
,
record
)
=>
<
LevelBrand
level=
{
record
.
level
}
/>
},
...
...
src/pages/ruleSettingManage/transactionRules/schema/index.tsx
View file @
69f0dfba
...
...
@@ -45,7 +45,7 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
}
]
},
transactionProcesssIds
:
{
baseProcessId
:
{
type
:
'array:number'
,
title
:
'流程选择'
,
...
...
@@ -84,24 +84,24 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
labelAlign
:
'left'
},
properties
:
{
"
isTacitlyApprove
"
:
{
"
allMembers
"
:
{
"type"
:
"radio"
,
enum
:
[
{
label
:
'所有会员(默认)'
,
value
:
1
},
{
label
:
'指定会员'
,
value
:
2
},
{
label
:
'所有会员(默认)'
,
value
:
true
},
{
label
:
'指定会员'
,
value
:
false
},
],
"title"
:
"适用会员"
,
default
:
1
,
default
:
true
,
required
:
true
,
"x-linkages"
:
[
{
type
:
'value:visible'
,
target
:
'member
Id
s'
,
"condition"
:
"{{
$value === 2
}}"
target
:
'members'
,
"condition"
:
"{{
!$value
}}"
}
]
},
member
Id
s
:
{
members
:
{
type
:
'array:number'
,
"x-component"
:
'MultTable'
,
"x-component-props"
:
{
...
...
src/services/api.ts
View file @
69f0dfba
...
...
@@ -9,6 +9,7 @@ import * as Template2Api from './Template2Api'
import
*
as
PayApi
from
'./PayApi'
import
*
as
SearchApi
from
'./SearchApi'
import
*
as
OrderApi
from
'./OrderApi'
;
import
*
as
OrderNewApi
from
'./OrderNewApi'
;
import
*
as
SettleApi
from
'./SettleApi'
;
import
*
as
ReportApi
from
'./reportApi'
;
import
*
as
EnhanceApi
from
'./enhanceApi'
;
...
...
@@ -43,6 +44,7 @@ export const PublicApi = {
...
PayApi
,
...
SearchApi
,
...
OrderApi
,
...
OrderNewApi
,
...
SettleApi
,
...
ReportApi
,
...
EnhanceApi
,
...
...
ytt.config.ts
View file @
69f0dfba
...
...
@@ -10,6 +10,7 @@ const tokenList = [
{
name
:
'Pay'
,
token
:
'c789e0e56ee8a8cc2fbd85f930eb2928c58fc1014583c6643acf29cff954da49'
,
categoryIds
:
[
0
]
},
// 支付服务
{
name
:
'Search'
,
token
:
'ca19f532efba91f7773cbfbd526b798c6ac83df670071e97d72c50dca1d53a48'
,
categoryIds
:
[
0
]
},
// 搜索服务
{
name
:
'Order'
,
token
:
'5de0aaeaac12c8d911d86dada6cd128993e34cd6e13135fa79246aa5979a2bcd'
,
categoryIds
:
[
0
]
},
//订单服务,
{
name
:
'OrderNew'
,
token
:
'c11d6e07d958caff4fc5e26feaeb2637e38f1619e850cd2b6e7d5e7072d4989a'
,
categoryIds
:
[
0
]
},
//订单服务新接口,
{
name
:
'Settle'
,
token
:
'fffbeeaaa198c285955997c606bc279fc6950fea118580c786f2c73eecccaa6a'
,
categoryIds
:
[
0
]
},
//结算服务
{
name
:
'report'
,
token
:
'e709e5bd31eb2b84de468944b153a62a05afcc13f0ea880be7333b928c7c0620'
,
categoryIds
:
[
0
]},
//报表服务
{
name
:
'Purchase'
,
token
:
'425043481f605f76064951c72d26c412e5ba1baf2d70158300f560ef58358f41'
,
categoryIds
:
[
0
]},
//采购服务
...
...
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