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
da5c994a
Commit
da5c994a
authored
Nov 10, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
parent
5fd8af74
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
index.tsx
...Order/orderCollect/components/productModalTable/index.tsx
+0
-4
No files found.
src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx
View file @
da5c994a
...
...
@@ -138,11 +138,7 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
const
handleConfirmProduct
=
async
()
=>
{
// 判断所选择的商品是否属于同一个工作流
<<
<
<<<<
HEAD
const
{
code
,
data
}
=
await
PublicApi
.
postOrderIsWorkFlow
({
productIds
:
rowSelectionCtl
.
selectedRowKeys
},
{
ctlType
:
'
none
'
})
=======
const
res
=
await
PublicApi
.
postOrderIsWorkFlow
({
memberId
:
rowSelectionCtl
.
selectRow
[
0
].
memberId
,
productIds
:
rowSelectionCtl
.
selectedRowKeys
},
{
ctlType
:
'none'
})
>
>>>>>>
37febd41... fix:处理商城跳转过来的下单获取信息报错,处理销售订单审核是否使用合同参数异常
if
(
res
.
code
===
1000
)
{
const
productData
=
schemaAction
.
getFieldValue
(
'orderProductRequests'
)
...
...
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