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
926653cc
Commit
926653cc
authored
Sep 22, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 订单详情添加来源商城,新增时修改b2b订单数量清空支付方式选中
parent
2f187d09
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
5 deletions
+22
-5
useOrderDetail.tsx
...ages/transaction/_public/order/effects/useOrderDetail.tsx
+5
-0
index.tsx
...es/transaction/purchaseOrder/firstApprovedOrder/index.tsx
+1
-2
index.ts
...ransaction/purchaseOrder/orderCollectB2b/effects/index.ts
+1
-0
index.tsx
...ages/transaction/purchaseOrder/readySubmitOrder/index.tsx
+5
-1
index.tsx
...s/transaction/purchaseOrder/secondApprovedOrder/index.tsx
+5
-1
index.tsx
...pages/transaction/saleOrder/secondApprovedOrder/index.tsx
+5
-1
No files found.
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @
926653cc
...
...
@@ -48,6 +48,11 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
span
:
8
,
render
:
(
text
,
record
)
=>
<
StatusColors
type=
{
type
===
'saleOrder'
?
'saleInside'
:
'inside'
}
status=
{
text
}
text=
{
record
.
innerStatusName
}
/>
},
{
label
:
'来源商城'
,
name
:
'shopName'
,
span
:
8
,
},
])
useEffect
(()
=>
{
...
...
src/pages/transaction/purchaseOrder/firstApprovedOrder/index.tsx
View file @
926653cc
...
...
@@ -33,8 +33,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = () => {
const
handleSubmitBatch
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
message
.
error
(
'请先勾选订单'
)
return
;
return
message
.
error
(
'请先勾选订单'
)
}
const
{
code
}
=
await
run
(
rowSelectionCtl
.
selectedRowKeys
.
map
(
item
=>
({
orderId
:
item
})))
if
(
code
===
1000
)
{
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/effects/index.ts
View file @
926653cc
...
...
@@ -64,6 +64,7 @@ export const useProductTableChangeForPay = (ctx: ISchemaFormActions | ISchemaFor
// 请求一次并复制给支付信息
const
productItem
=
value
[
0
]
if
(
pageStatus
===
PageStatus
.
ADD
)
{
// 新增下 需要支付信息生成支付次数
ctx
.
setFieldValue
(
'payments'
,
[])
// 变动后先 清空支付信息
const
shopId
=
ctx
.
getFieldValue
(
'shopId'
)
const
products
=
value
.
map
(
item
=>
({
productId
:
item
.
commodityId
,
skuId
:
item
.
productId
}))
if
(
shopId
&&
products
?.
length
)
{
...
...
src/pages/transaction/purchaseOrder/readySubmitOrder/index.tsx
View file @
926653cc
import
React
from
'react'
import
{
Card
,
Button
,
Space
}
from
'antd'
import
{
Card
,
Button
,
Space
,
message
}
from
'antd'
import
{
StandardTable
}
from
'god'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PublicApi
}
from
'@/services/api'
...
...
@@ -31,6 +31,10 @@ const ReadySubmitOrder:React.FC<ReadySubmitOrderProps> = (props) => {
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postOrderBuyerValidateSubmitBatch
)
const
handleBitchPush
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
return
message
.
error
(
'请先勾选订单'
)
}
const
{
code
}
=
await
run
(
rowSelectionCtl
.
selectedRowKeys
.
map
(
item
=>
({
orderId
:
item
})))
if
(
code
===
1000
)
{
ref
.
current
.
reload
()
...
...
src/pages/transaction/purchaseOrder/secondApprovedOrder/index.tsx
View file @
926653cc
import
React
from
'react'
import
{
Card
,
Button
,
Space
}
from
'antd'
import
{
Card
,
Button
,
Space
,
message
}
from
'antd'
import
{
StandardTable
}
from
'god'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PublicApi
}
from
'@/services/api'
...
...
@@ -30,6 +30,10 @@ const SecondApprovedOrder:React.FC<SecondApprovedOrderProps> = (props) => {
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postOrderBuyerValidateGradeTwoBatch
)
const
handleSubmitBatch
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
return
message
.
error
(
'请先勾选订单'
)
}
const
{
code
}
=
await
run
(
rowSelectionCtl
.
selectedRowKeys
.
map
(
item
=>
({
orderId
:
item
})))
if
(
code
===
1000
)
{
...
...
src/pages/transaction/saleOrder/secondApprovedOrder/index.tsx
View file @
926653cc
import
React
from
'react'
import
{
Card
,
Button
,
Space
}
from
'antd'
import
{
Card
,
Button
,
Space
,
message
}
from
'antd'
import
{
StandardTable
}
from
'god'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
PublicApi
}
from
'@/services/api'
...
...
@@ -31,6 +31,10 @@ const SecondApprovedOrder:React.FC<SecondApprovedOrderProps> = (props) => {
const
{
run
,
loading
}
=
useHttpRequest
(
PublicApi
.
postOrderVendorValidateGradeTwoBatch
)
const
handleSubmitBatch
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
){
return
message
.
error
(
'请勾选要审核的订单'
)
}
const
{
code
}
=
await
run
(
rowSelectionCtl
.
selectedRowKeys
.
map
(
item
=>
({
orderId
:
item
})))
if
(
code
===
1000
)
{
rowSelectionCtl
.
setSelectRow
([])
...
...
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