Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
84605861
Commit
84605861
authored
Mar 15, 2023
by
杨鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20230109_business_abutment' into 'master'
Feature/20230109 business abutment See merge request
!79
parents
3581b8d6
44575281
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
data.js
src/pages/AfterSaleManage/data.js
+2
-1
data.js
src/pages/cancelBillManage/data.js
+1
-0
No files found.
src/pages/AfterSaleManage/data.js
View file @
84605861
...
@@ -263,11 +263,12 @@ export const getColumns = props => {
...
@@ -263,11 +263,12 @@ export const getColumns = props => {
{
{
title
:
'
售后单ID
'
,
title
:
'
售后单ID
'
,
dataIndex
:
'
serviceNo
'
,
dataIndex
:
'
serviceNo
'
,
width
:
3
0
0
,
width
:
3
1
0
,
render
:
(
serviceNo
,
r
)
=>
(
render
:
(
serviceNo
,
r
)
=>
(
<
div
>
<
div
>
{
r
.
timeout
?
<
Tag
color
=
"
red
"
>
{
serviceNo
}
<
/Tag> : serviceNo
}
{
r
.
timeout
?
<
Tag
color
=
"
red
"
>
{
serviceNo
}
<
/Tag> : serviceNo
}
{
<
Badge
count
=
{
r
.
reminderFlag
?
'
催
'
:
''
}
size
=
"
default
"
/>
}
{
<
Badge
count
=
{
r
.
reminderFlag
?
'
催
'
:
''
}
size
=
"
default
"
/>
}
{
<
Badge
count
=
{
+
r
.
autoCancelTimeType
===
1
?
'
大额支付
'
:
''
}
size
=
"
default
"
/>
}
<
/div
>
<
/div
>
),
),
},
},
...
...
src/pages/cancelBillManage/data.js
View file @
84605861
...
@@ -14,6 +14,7 @@ export const column = [
...
@@ -14,6 +14,7 @@ export const column = [
<
div
>
<
div
>
{
r
.
auditTimeOut
?
<
Tag
color
=
"
red
"
>
{
orderId
}
<
/Tag> : orderId
}
{
r
.
auditTimeOut
?
<
Tag
color
=
"
red
"
>
{
orderId
}
<
/Tag> : orderId
}
{
<
Badge
count
=
{
r
.
reminderFlag
?
'
催
'
:
''
}
size
=
"
small
"
/>
}
{
<
Badge
count
=
{
r
.
reminderFlag
?
'
催
'
:
''
}
size
=
"
small
"
/>
}
{
<
Badge
count
=
{
+
r
.
autoCancelTimeType
===
1
?
'
大额支付
'
:
''
}
size
=
"
default
"
/>
}
<
/div
>
<
/div
>
),
),
},
},
...
...
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