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
21e004d1
Commit
21e004d1
authored
Dec 07, 2020
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改加工订单时,订单号为必填
parent
b58802fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
index.tsx
src/pages/handling/assign/add/index.tsx
+15
-4
index.tsx
src/pages/handling/components/ProcessOrder/index.tsx
+5
-3
No files found.
src/pages/handling/assign/add/index.tsx
View file @
21e004d1
...
...
@@ -269,15 +269,26 @@ const Add: React.FC<{}> = () => {
}
setSubmitLoading
(
true
);
const
detailList
=
someLists
.
map
((
item
)
=>
{
const
orderData
=
values
.
source
===
1
?
{
orderId
:
item
.
orderId
,
orderDetailId
:
item
.
fullId
,
orderNo
:
item
.
orderNo
,
productId
:
item
.
commodityId
,
purchaseCount
:
item
.
orderTotal
,
// 订单数量
surplusProcessNum
:
item
.
restTotal
,
// 剩余加工数量
}
:
{
productId
:
item
.
id
,
purchaseCount
:
null
,
surplusProcessNum
:
null
,
}
return
{
orederNo
:
item
.
orderNo
,
// 如果是商品加工,那么他没有订单号
productId
:
item
.
id
,
// skuid
...
orderData
,
productName
:
item
.
name
,
category
:
item
.
customerCategoryName
,
brand
:
item
.
brandName
,
unit
:
item
.
unitName
,
purchaseCount
:
null
,
surplusProcessNum
:
null
,
processNum
:
item
.
processNum
||
0
,
processPrice
:
item
.
processUnitPrice
||
0
,
processTotalPrice
:
item
.
processTotalPrice
,
...
...
src/pages/handling/components/ProcessOrder/index.tsx
View file @
21e004d1
...
...
@@ -52,20 +52,22 @@ const ProcessProducts = ({visible, cancel, rowSelection, ...restProps}) => {
(
item
)
=>
{
return
{
orderNo
:
record
.
orderNo
,
orderId
:
record
.
id
,
// 订单id
// orderDetailId: item.id, // 订单商品唯一id
commodityId
:
item
.
productId
,
// 商品id
id
:
item
.
productId
,
id
:
item
.
productId
,
// sku id
name
:
item
.
productName
,
customerCategoryName
:
item
.
category
,
brandName
:
item
.
brand
,
unitName
:
item
.
unit
,
orderTotal
:
item
.
purchaseCount
,
orderTotal
:
item
.
purchaseCount
,
// 采购数量
restTotal
:
item
.
purchaseCount
-
(
item
.
processNum
||
0
),
processNum
:
''
,
processUnitPrice
:
''
,
processTotalPrice
:
''
,
price
:
item
.
price
,
//单价,
hasProcessNum
:
item
.
processNum
||
0
,
fullId
:
item
.
id
fullId
:
item
.
id
,
//订单商品唯一id
}
}
)
...
...
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