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
19bfcc69
Commit
19bfcc69
authored
Nov 10, 2023
by
guang.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 去掉没用代码
parent
a3a98aa6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
39 deletions
+19
-39
UpdatePriceStock.jsx
...sManage/SupplyPriceUpdate/components/UpdatePriceStock.jsx
+1
-1
index.jsx
src/pages/GoodsManage/SupplyPriceUpdate/index.jsx
+1
-19
staticdata.js
src/pages/GoodsManage/SupplyPriceUpdate/staticdata.js
+17
-19
No files found.
src/pages/GoodsManage/SupplyPriceUpdate/components/UpdatePriceStock.jsx
View file @
19bfcc69
...
@@ -69,7 +69,7 @@ const UpdatePriceStock = options => {
...
@@ -69,7 +69,7 @@ const UpdatePriceStock = options => {
onCancel=
{
options
.
onCancel
}
onCancel=
{
options
.
onCancel
}
onOk=
{
onSubmit
}
onOk=
{
onSubmit
}
confirmLoading=
{
loading
}
confirmLoading=
{
loading
}
width=
{
10
00
}
width=
{
8
00
}
className=
{
styles
.
priceStockTable
}
className=
{
styles
.
priceStockTable
}
destroyOnClose
destroyOnClose
>
>
...
...
src/pages/GoodsManage/SupplyPriceUpdate/index.jsx
View file @
19bfcc69
...
@@ -29,7 +29,6 @@ class supplyPriceUpdate extends Component {
...
@@ -29,7 +29,6 @@ class supplyPriceUpdate extends Component {
pageSize
:
20
,
pageSize
:
20
,
previewVisible
:
false
,
previewVisible
:
false
,
createloading
:
false
,
createloading
:
false
,
selectedRowKeys
:
[],
productType
:
1
,
// 商品类型
productType
:
1
,
// 商品类型
searchValue
:
{},
// 搜索条件
searchValue
:
{},
// 搜索条件
refresh
:
''
,
// 外卖刷新
refresh
:
''
,
// 外卖刷新
...
@@ -55,7 +54,6 @@ class supplyPriceUpdate extends Component {
...
@@ -55,7 +54,6 @@ class supplyPriceUpdate extends Component {
const
searchValue
=
this
.
searchForm
.
getFieldsValue
()
||
{};
const
searchValue
=
this
.
searchForm
.
getFieldsValue
()
||
{};
this
.
setState
({
searchValue
});
this
.
setState
({
searchValue
});
if
(
searchValue
.
productType
!==
5
)
{
if
(
searchValue
.
productType
!==
5
)
{
this
.
onSelectChange
([]);
const
currentPage
=
this
.
state
.
pageNo
;
const
currentPage
=
this
.
state
.
pageNo
;
this
.
setState
(
this
.
setState
(
{
{
...
@@ -113,7 +111,6 @@ class supplyPriceUpdate extends Component {
...
@@ -113,7 +111,6 @@ class supplyPriceUpdate extends Component {
this
.
setState
({
this
.
setState
({
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
20
,
pageSize
:
20
,
selectedRowKeys
:
[],
});
});
this
.
handleSearch
();
this
.
handleSearch
();
};
};
...
@@ -121,9 +118,6 @@ class supplyPriceUpdate extends Component {
...
@@ -121,9 +118,6 @@ class supplyPriceUpdate extends Component {
onLoad
=
error
=>
{
onLoad
=
error
=>
{
if
(
!
error
)
{
if
(
!
error
)
{
notification
.
success
({
message
:
'
操作成功
'
});
notification
.
success
({
message
:
'
操作成功
'
});
this
.
setState
({
selectedRowKeys
:
[],
});
this
.
handleSearch
();
this
.
handleSearch
();
}
}
};
};
...
@@ -151,12 +145,6 @@ class supplyPriceUpdate extends Component {
...
@@ -151,12 +145,6 @@ class supplyPriceUpdate extends Component {
}
}
};
};
onSelectChange
=
selectedRowKeys
=>
{
this
.
setState
({
selectedRowKeys
,
});
};
// 显示更新供货价弹窗
// 显示更新供货价弹窗
serviceVisbleChange
=
async
row
=>
{
serviceVisbleChange
=
async
row
=>
{
try
{
try
{
...
@@ -179,11 +167,7 @@ class supplyPriceUpdate extends Component {
...
@@ -179,11 +167,7 @@ class supplyPriceUpdate extends Component {
SupplyPrice
:
{
tableData
=
{}
},
SupplyPrice
:
{
tableData
=
{}
},
permissions
,
permissions
,
}
=
this
.
props
;
}
=
this
.
props
;
const
rowSelection
=
{
const
{
pageNo
,
pageSize
}
=
this
.
state
;
selectedRowKeys
:
this
.
state
.
selectedRowKeys
,
onChange
:
this
.
onSelectChange
,
};
const
{
pageNo
,
pageSize
,
selectedRowKeys
}
=
this
.
state
;
this
.
canEditable
=
permissions
[
GOOD_MANAGE
.
EDITABLE
];
this
.
canEditable
=
permissions
[
GOOD_MANAGE
.
EDITABLE
];
return
(
return
(
...
@@ -200,7 +184,6 @@ class supplyPriceUpdate extends Component {
...
@@ -200,7 +184,6 @@ class supplyPriceUpdate extends Component {
treeData=
{
this
.
state
.
categoryTree
}
treeData=
{
this
.
state
.
categoryTree
}
shopList=
{
this
.
shopList
}
shopList=
{
this
.
shopList
}
checkStock=
{
this
.
checkEnableUpdateStock
}
checkStock=
{
this
.
checkEnableUpdateStock
}
selectNum=
{
selectedRowKeys
.
length
}
changeProductType=
{
this
.
changeProductType
}
changeProductType=
{
this
.
changeProductType
}
setArea=
{
(
isALL
,
type
)
=>
this
.
setArea
(
isALL
,
type
)
}
setArea=
{
(
isALL
,
type
)
=>
this
.
setArea
(
isALL
,
type
)
}
/>
/>
...
@@ -223,7 +206,6 @@ class supplyPriceUpdate extends Component {
...
@@ -223,7 +206,6 @@ class supplyPriceUpdate extends Component {
pagination=
{
false
}
pagination=
{
false
}
className=
{
styles
.
tabletop
}
className=
{
styles
.
tabletop
}
scroll=
{
{
x
:
'
100%
'
,
y
:
500
}
}
scroll=
{
{
x
:
'
100%
'
,
y
:
500
}
}
rowSelection=
{
rowSelection
}
/>
/>
</
Spin
>
</
Spin
>
<
br
/>
<
br
/>
...
...
src/pages/GoodsManage/SupplyPriceUpdate/staticdata.js
View file @
19bfcc69
...
@@ -44,15 +44,9 @@ export function column(specArr = []) {
...
@@ -44,15 +44,9 @@ export function column(specArr = []) {
<
/div
>
<
/div
>
),
),
},
},
{
title
:
'
重量(kg)
'
,
width
:
135
,
align
:
'
center
'
,
dataIndex
:
'
weight
'
,
},
{
{
title
:
'
库存
'
,
title
:
'
库存
'
,
width
:
12
0
,
width
:
8
0
,
dataIndex
:
'
productStock
'
,
dataIndex
:
'
productStock
'
,
align
:
'
center
'
,
align
:
'
center
'
,
render
:
(
_
,
row
,
index
)
=>
(
render
:
(
_
,
row
,
index
)
=>
(
...
@@ -69,18 +63,6 @@ export function column(specArr = []) {
...
@@ -69,18 +63,6 @@ export function column(specArr = []) {
<
/div
>
<
/div
>
),
),
},
},
{
title
:
'
库存预警
'
,
width
:
120
,
dataIndex
:
'
productStockWarning
'
,
align
:
'
center
'
,
},
{
title
:
'
商品自编码
'
,
dataIndex
:
'
thirdSkuNo
'
,
width
:
200
,
align
:
'
center
'
,
},
];
];
}
}
...
@@ -105,6 +87,22 @@ export function columnManage() {
...
@@ -105,6 +87,22 @@ export function columnManage() {
sorter
:
(
a
,
b
)
=>
a
.
marketPrice
-
b
.
marketPrice
,
sorter
:
(
a
,
b
)
=>
a
.
marketPrice
-
b
.
marketPrice
,
render
:
(
_
,
row
)
=>
<
div
>
{(
row
.
marketPrice
||
0
).
toFixed
(
2
)}
<
/div>
,
render
:
(
_
,
row
)
=>
<
div
>
{(
row
.
marketPrice
||
0
).
toFixed
(
2
)}
<
/div>
,
},
},
{
title
:
'
供货价
'
,
dataIndex
:
'
supplyPrice
'
,
width
:
160
,
align
:
'
center
'
,
sorter
:
(
a
,
b
)
=>
a
.
supplyPrice
-
b
.
supplyPrice
,
render
:
(
_
,
row
)
=>
(
<
div
>
{(
row
.
supplyPrice
&&
(
row
.
marketPrice
||
0
).
toFixed
(
2
))
||
'
-
'
}
<
/div
>
),
},
{
title
:
'
库存
'
,
dataIndex
:
'
stock
'
,
width
:
160
,
align
:
'
center
'
,
},
{
{
title
:
'
操作
'
,
title
:
'
操作
'
,
dataIndex
:
'
action
'
,
dataIndex
:
'
action
'
,
...
...
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