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
project
jinfa-admin
Commits
46551319
Commit
46551319
authored
Sep 14, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
dbc188ee
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
12 deletions
+14
-12
index.tsx
src/pages/commodity/productWillCheck/index.tsx
+1
-1
checkProducts.tsx
src/pages/commodity/products/checkProducts.tsx
+0
-0
index.tsx
src/pages/commodity/products/index.tsx
+1
-1
viewProducts.tsx
src/pages/commodity/products/viewProducts.tsx
+0
-0
checkBrand.tsx
src/pages/trademark/trademarkSearch/checkBrand.tsx
+8
-6
index.tsx
src/pages/trademark/trademarkSearch/index.tsx
+1
-1
viewBrand.tsx
src/pages/trademark/trademarkSearch/viewBrand.tsx
+3
-3
No files found.
src/pages/commodity/productWillCheck/index.tsx
View file @
46551319
...
...
@@ -106,7 +106,7 @@ const Products: React.FC<{}> = () => {
}
},
{
title
:
'审核时间'
,
title
:
'
申请
审核时间'
,
dataIndex
:
'applyTime'
,
key
:
'applyTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
...
...
src/pages/commodity/products/checkProducts.tsx
View file @
46551319
This diff is collapsed.
Click to expand it.
src/pages/commodity/products/index.tsx
View file @
46551319
...
...
@@ -120,7 +120,7 @@ const Products: React.FC<{}> = () => {
}
},
{
title
:
'审核时间'
,
title
:
'
申请
审核时间'
,
dataIndex
:
'applyTime'
,
key
:
'applyTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
...
...
src/pages/commodity/products/viewProducts.tsx
View file @
46551319
This diff is collapsed.
Click to expand it.
src/pages/trademark/trademarkSearch/checkBrand.tsx
View file @
46551319
...
...
@@ -70,11 +70,11 @@ const CheckBrand: React.FC<{}> = () => {
render
:
(
text
:
any
,
record
:
any
)
=>
{
let
component
:
ReactNode
=
null
if
(
record
.
operation
===
1
)
component
=
(<>
新增
</>)
component
=
(<>
提价审核
</>)
else
if
(
record
.
operation
===
2
)
component
=
(<>
修改
</>)
component
=
(<>
修改
品牌
</>)
else
if
(
record
.
operation
===
3
)
component
=
(<>
审核
</>)
component
=
(<>
审核
品牌
</>)
return
component
}
},
...
...
@@ -242,18 +242,20 @@ const CheckBrand: React.FC<{}> = () => {
<
Radio
value=
{
3
}
>
审核不通过
</
Radio
>
</
Radio
.
Group
>
</
Form
.
Item
>
<
Form
.
Item
{
checkStatus
===
3
&&
<
Form
.
Item
name=
"checkRemark"
label=
{
checkStatus
===
4
?
'审核通过原因'
:
'审核不通过原因'
}
label=
'审核不通过原因'
rules=
{
[
{
required
:
checkStatus
===
4
?
false
:
true
,
required
:
true
,
message
:
'请填写原因'
}
]
}
>
<
TextArea
rows=
{
3
}
maxLength=
{
60
}
placeholder=
"请填写原因"
/>
</
Form
.
Item
>
}
</
Form
>
</
Modal
>
</
PageHeaderWrapper
>
...
...
src/pages/trademark/trademarkSearch/index.tsx
View file @
46551319
...
...
@@ -112,7 +112,7 @@ const Trademark: React.FC<{}> = () => {
type
:
'string'
,
enum
:
[
{
label
:
'全部'
,
value
:
0
},
{
label
:
'待提交审核'
,
value
:
1
},
//
{
label
:
'待提交审核'
,
value
:
1
},
{
label
:
'待审核'
,
value
:
2
},
{
label
:
'审核不通过'
,
value
:
3
},
{
label
:
'审核通过'
,
value
:
4
}
...
...
src/pages/trademark/trademarkSearch/viewBrand.tsx
View file @
46551319
...
...
@@ -79,11 +79,11 @@ const viewBrand: React.FC<{}> = () => {
render
:
(
text
:
any
,
record
:
any
)
=>
{
let
component
:
ReactNode
=
null
if
(
record
.
operation
===
1
)
component
=
(<>
新增
</>)
component
=
(<>
提交审核
</>)
else
if
(
record
.
operation
===
2
)
component
=
(<>
修改
</>)
component
=
(<>
修改
品牌
</>)
else
if
(
record
.
operation
===
3
)
component
=
(<>
审核
</>)
component
=
(<>
审核
品牌
</>)
return
component
}
},
...
...
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