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
陈智峰
jinfa-platform
Commits
bd88fe77
Commit
bd88fe77
authored
Aug 28, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:商品、货品、品类问题
parent
97dd7ab1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
39 deletions
+30
-39
index.tsx
src/pages/classAndProperty/categoryAttributes/index.tsx
+2
-1
addGoods.tsx
src/pages/commodity/goods/addGoods.tsx
+18
-33
viewProducts.tsx
src/pages/commodity/products/viewProducts.tsx
+5
-5
index.tsx
src/pages/trademark/index.tsx
+5
-0
No files found.
src/pages/classAndProperty/categoryAttributes/index.tsx
View file @
bd88fe77
...
...
@@ -294,7 +294,7 @@ const CategoryAttributes: React.FC<{}> = () => {
name
:
{
type
:
'string'
,
'x-component-props'
:
{
place
H
older
:
'属性名称'
place
h
older
:
'属性名称'
},
'x-component'
:
'Search'
}
...
...
@@ -324,6 +324,7 @@ const CategoryAttributes: React.FC<{}> = () => {
onCancel=
{
handleSelectCancel
}
okText=
"确认"
cancelText=
"取消"
destroyOnClose=
{
true
}
>
<
StandardTable
columns=
{
columnsLink
}
...
...
src/pages/commodity/goods/addGoods.tsx
View file @
bd88fe77
...
...
@@ -61,50 +61,32 @@ const AddGoods = () => {
}
},
[])
const
handleBrandSearch
=
(
value
:
any
)
=>
{
// end value
if
(
value
)
{
PublicApi
.
getProductSelectGetSelectBrand
({
name
:
value
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setBrandData
(
res
.
data
)
})
}
else
{
setBrandData
([])
}
const
handleBrandSearch
=
(
value
?:
any
)
=>
{
// end value
PublicApi
.
getProductSelectGetSelectBrand
({
name
:
value
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setBrandData
(
res
.
data
)
})
}
const
handleBrandChange
=
(
value
:
any
)
=>
{
setBrandValue
(
value
)
// let obj = {...filterParams, brandId: value}
// setFilterParams(obj)
}
const
handleClassSearch
=
(
value
:
any
)
=>
{
if
(
value
)
{
PublicApi
.
getProductSelectGetSelectCustomerCategory
({
name
:
value
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setClassData
(
res
.
data
)
})
}
else
{
setClassData
([])
}
const
handleClassSearch
=
(
value
?:
any
)
=>
{
PublicApi
.
getProductSelectGetSelectCustomerCategory
({
name
:
value
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setClassData
(
res
.
data
)
})
}
const
handleClassChange
=
(
value
:
any
)
=>
{
setClassValue
(
value
)
// let obj = {...filterParams, customerCategoryId: value}
// setFilterParams(obj)
}
const
handleUnitSearch
=
(
value
:
any
)
=>
{
if
(
value
)
{
PublicApi
.
getProductSelectGetSelectCnUnit
({
name
:
value
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setUnitData
(
res
.
data
)
})
}
else
{
setUnitData
([])
}
const
handleUnitSearch
=
(
value
?:
any
)
=>
{
PublicApi
.
getProductSelectGetSelectCnUnit
({
name
:
value
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setUnitData
(
res
.
data
)
})
}
const
handleUnitChange
=
(
value
:
any
)
=>
{
setUnitValue
(
value
)
// let obj = {...filterParams, customerCategoryId: value}
// setFilterParams(obj)
}
const
onFinish
=
(
values
:
any
)
=>
{
...
...
@@ -188,6 +170,7 @@ const AddGoods = () => {
filterOption=
{
false
}
onSearch=
{
handleClassSearch
}
onChange=
{
handleClassChange
}
onFocus=
{
()
=>
handleClassSearch
(
null
)
}
notFoundContent=
{
null
}
style=
{
{
width
:
'100%'
}
}
disabled=
{
isSee
}
...
...
@@ -215,6 +198,7 @@ const AddGoods = () => {
filterOption=
{
false
}
onSearch=
{
handleBrandSearch
}
onChange=
{
handleBrandChange
}
onFocus=
{
()
=>
handleBrandSearch
(
null
)
}
notFoundContent=
{
null
}
style=
{
{
width
:
'100%'
}
}
disabled=
{
isSee
}
...
...
@@ -241,6 +225,7 @@ const AddGoods = () => {
filterOption=
{
false
}
onSearch=
{
handleUnitSearch
}
onChange=
{
handleUnitChange
}
onFocus=
{
()
=>
handleUnitSearch
(
null
)
}
notFoundContent=
{
null
}
style=
{
{
width
:
'100%'
}
}
disabled=
{
isSee
}
...
...
src/pages/commodity/products/viewProducts.tsx
View file @
bd88fe77
...
...
@@ -105,13 +105,13 @@ const viewProducts: React.FC<{}> = () => {
key
:
'status'
,
render
:
(
text
:
any
,
record
:
any
)
=>
{
let
component
:
ReactNode
=
null
if
(
record
.
status
===
1
)
component
=
(<><
span
className=
"commonStatusValid"
></
span
>
通过
</>)
if
(
record
.
status
===
4
)
component
=
(<><
span
className=
"commonStatusValid"
></
span
>
审核通过
</>)
else
if
(
record
.
status
===
1
)
component
=
(<><
span
className=
"commonStatusInvalid"
></
span
>
待提交审核
</>)
else
if
(
record
.
status
===
2
)
component
=
(<><
span
className=
"commonStatusInvalid"
></
span
>
待提交
</>)
else
if
(
record
.
status
===
3
)
component
=
(<><
span
className=
"commonStatusModify"
></
span
>
待审核
</>)
else
if
(
record
.
status
===
4
)
else
if
(
record
.
status
===
3
)
component
=
(<><
span
className=
"commonStatusStop"
></
span
>
审核不通过
</>)
return
component
}
...
...
src/pages/trademark/index.tsx
View file @
bd88fe77
...
...
@@ -168,6 +168,11 @@ const Trademark: React.FC<{}> = () => {
},
ctx
:
{
inline
:
false
,
effects
:
(
$
,
action
)
=>
{
$
(
'onFieldValueChange'
,
'status'
).
subscribe
(
state
=>
{
ref
.
current
.
reload
({
current
:
1
,
pageSize
:
10
,
status
:
state
.
value
})
})
},
schema
:
{
type
:
'object'
,
properties
:
{
...
...
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