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
526c3c57
Commit
526c3c57
authored
Jan 20, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改营销活动执行明细列表单号显示
parent
728672c8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
index.tsx
src/pages/transaction/components/tableModal/index.tsx
+8
-5
index.tsx
...ction/marketingAbility/platformexeCution/detail/index.tsx
+2
-1
index.tsx
...tion/marketingAbility/selfbuiltexeCution/detail/index.tsx
+2
-1
No files found.
src/pages/transaction/components/tableModal/index.tsx
View file @
526c3c57
...
@@ -54,11 +54,13 @@ interface Iprops {
...
@@ -54,11 +54,13 @@ interface Iprops {
/** customKey */
/** customKey */
customKey
?:
string
,
customKey
?:
string
,
/** 宽度 */
/** 宽度 */
width
?:
number
width
?:
number
,
/** 是否可选 */
ctl
?:
boolean
}
}
const
TableModal
:
React
.
FC
<
Iprops
>
=
(
props
:
Iprops
)
=>
{
const
TableModal
:
React
.
FC
<
Iprops
>
=
(
props
:
Iprops
)
=>
{
const
{
title
,
visible
,
schema
,
columns
,
effects
,
tableProps
,
mode
,
expressionScope
,
fetchData
,
onClose
,
onOk
,
value
,
format
,
customizeRadio
,
modalType
,
footer
,
customKey
,
width
}
=
props
;
const
{
title
,
visible
,
schema
,
columns
,
effects
,
tableProps
,
mode
,
expressionScope
,
fetchData
,
onClose
,
onOk
,
value
,
format
,
customizeRadio
,
modalType
,
footer
,
customKey
,
width
,
ctl
}
=
props
;
const
ref
=
useRef
<
any
>
({});
const
ref
=
useRef
<
any
>
({});
const
[
rowSelection
,
RowCtl
]
=
useRowSelectionTable
({
type
:
customizeRadio
&&
mode
===
'radio'
?
'checkbox'
:
mode
,
customKey
:
customKey
});
const
[
rowSelection
,
RowCtl
]
=
useRowSelectionTable
({
type
:
customizeRadio
&&
mode
===
'radio'
?
'checkbox'
:
mode
,
customKey
:
customKey
});
const
isFirstLoad
=
useRef
<
boolean
>
(
true
);
const
isFirstLoad
=
useRef
<
boolean
>
(
true
);
...
@@ -113,7 +115,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
...
@@ -113,7 +115,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
)
)
}
}
const
otherProps
=
modalType
===
'Drawer'
?
{
footer
:
renderFooter
()
}
:
{
onOk
:
handleOk
}
const
otherProps
=
(
modalType
===
'Drawer'
&&
ctl
)
&&
{
footer
:
renderFooter
()
}
return
(
return
(
...
@@ -136,7 +138,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
...
@@ -136,7 +138,7 @@ const TableModal: React.FC<Iprops> = (props: Iprops) => {
tableType=
"small"
tableType=
"small"
fetchTableData=
{
fetchData
}
fetchTableData=
{
fetchData
}
currentRef=
{
ref
}
currentRef=
{
ref
}
rowSelection=
{
{
rowSelection=
{
ctl
&&
{
...
rowSelection
,
...
rowSelection
,
hideSelectAll
:
customizeRadio
,
hideSelectAll
:
customizeRadio
,
}
}
}
}
...
@@ -172,7 +174,8 @@ TableModal.defaultProps = {
...
@@ -172,7 +174,8 @@ TableModal.defaultProps = {
customizeRadio
:
false
,
customizeRadio
:
false
,
modalType
:
"Modal"
,
modalType
:
"Modal"
,
footer
:
null
,
footer
:
null
,
width
:
900
width
:
900
,
ctl
:
true
,
}
}
export
default
TableModal
;
export
default
TableModal
;
src/pages/transaction/marketingAbility/platformexeCution/detail/index.tsx
View file @
526c3c57
...
@@ -243,7 +243,7 @@ const DetialLayout = () => {
...
@@ -243,7 +243,7 @@ const DetialLayout = () => {
dataIndex
:
'orderId'
,
dataIndex
:
'orderId'
,
render
:
(
_text
,
_r
)
=>
(
render
:
(
_text
,
_r
)
=>
(
<>
<>
{
_r
.
recordType
===
1
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${_r.skuId}`
)
}
>
{
_r
.
skuId
}
</
Button
>
}
{
_r
.
recordType
===
1
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${_r.skuId}`
)
}
>
{
_r
.
orderNo
}
</
Button
>
}
{
_r
.
recordType
===
2
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/afterService/returnManage/returnQuery/detail?id=${_text}`
)
}
>
{
_r
.
orderNo
}
</
Button
>
}
{
_r
.
recordType
===
2
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/afterService/returnManage/returnQuery/detail?id=${_text}`
)
}
>
{
_r
.
orderNo
}
</
Button
>
}
</>
</>
)
)
...
@@ -407,6 +407,7 @@ const DetialLayout = () => {
...
@@ -407,6 +407,7 @@ const DetialLayout = () => {
tableProps=
{
{
tableProps=
{
{
rowKey
:
'orderId'
,
rowKey
:
'orderId'
,
}
}
}
}
ctl=
{
false
}
effects=
{
(
$
,
actions
)
=>
{
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"orderNo"
,
FORM_FILTER_PATH
)
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"orderNo"
,
FORM_FILTER_PATH
)
useStateEffects
()
useStateEffects
()
...
...
src/pages/transaction/marketingAbility/selfbuiltexeCution/detail/index.tsx
View file @
526c3c57
...
@@ -241,7 +241,7 @@ const DetialLayout = () => {
...
@@ -241,7 +241,7 @@ const DetialLayout = () => {
dataIndex
:
'orderId'
,
dataIndex
:
'orderId'
,
render
:
(
_text
,
_r
)
=>
(
render
:
(
_text
,
_r
)
=>
(
<>
<>
{
_r
.
recordType
===
1
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${_r.skuId}`
)
}
>
{
_r
.
skuId
}
</
Button
>
}
{
_r
.
recordType
===
1
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${_r.skuId}`
)
}
>
{
_r
.
orderNo
}
</
Button
>
}
{
_r
.
recordType
===
2
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/afterService/returnManage/returnQuery/detail?id=${_text}`
)
}
>
{
_r
.
orderNo
}
</
Button
>
}
{
_r
.
recordType
===
2
&&
<
Button
type=
'link'
target=
'_blank'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/afterService/returnManage/returnQuery/detail?id=${_text}`
)
}
>
{
_r
.
orderNo
}
</
Button
>
}
</>
</>
)
)
...
@@ -405,6 +405,7 @@ const DetialLayout = () => {
...
@@ -405,6 +405,7 @@ const DetialLayout = () => {
tableProps=
{
{
tableProps=
{
{
rowKey
:
'orderId'
,
rowKey
:
'orderId'
,
}
}
}
}
ctl=
{
false
}
effects=
{
(
$
,
actions
)
=>
{
effects=
{
(
$
,
actions
)
=>
{
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"orderNo"
,
FORM_FILTER_PATH
)
useStateFilterSearchLinkageEffect
(
$
,
actions
,
"orderNo"
,
FORM_FILTER_PATH
)
useStateEffects
()
useStateEffects
()
...
...
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