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
e9fac838
Commit
e9fac838
authored
Sep 27, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化订单
parent
a8c3dbb2
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
15 deletions
+81
-15
index.tsx
src/pages/transaction/purchaseOrder/constant/index.tsx
+5
-1
index.tsx
src/pages/transaction/purchaseOrder/orderPreview/index.tsx
+12
-0
useSelfTable.tsx
...ction/purchaseOrder/readyFileOrder/model/useSelfTable.tsx
+22
-4
index.tsx
src/pages/transaction/saleOrder/orderPreview/index.tsx
+36
-4
useSelfTable.tsx
.../saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx
+1
-1
index.tsx
...pages/transaction/saleOrder/readyReturnDocument/index.tsx
+1
-1
useSelfTable.tsx
...tion/saleOrder/readyReturnDocument/model/useSelfTable.tsx
+4
-4
No files found.
src/pages/transaction/purchaseOrder/constant/index.tsx
View file @
e9fac838
...
...
@@ -16,19 +16,22 @@ export const baseOrderListColumns: any[] = [
return
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`
}
>
{
text
}
</
EyePreview
>
}
},
ellipsis
:
true
,
},
{
title
:
'订单摘要'
,
align
:
'center'
,
dataIndex
:
'orderThe'
,
key
:
'orderThe'
,
ellipsis
:
true
,
},
{
title
:
'供应会员'
,
align
:
'center'
,
dataIndex
:
'supplyMembersName'
,
key
:
'supplyMembersName'
,
ellipsis
:
true
,
},
{
title
:
'下单时间'
,
...
...
@@ -42,6 +45,7 @@ export const baseOrderListColumns: any[] = [
align
:
'center'
,
dataIndex
:
'sumPrice'
,
key
:
'sumPrice'
,
ellipsis
:
true
,
},
{
title
:
'订单类型'
,
...
...
src/pages/transaction/purchaseOrder/orderPreview/index.tsx
View file @
e9fac838
...
...
@@ -111,6 +111,14 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
break
;
}
case
PURCHASE_ORDER_STATUS
.
READY_RETURN_DOCUMENT
:
{
const
params
=
{
id
:
parseInt
(
id
),
}
result
=
await
PublicApi
.
postOrderFiledOrderAdd
(
params
)
break
;
}
// 确认收货
// case PURCHASE_ORDER_STATUS.READY_DELEVED_ORDER: {
// const params = {
...
...
@@ -148,6 +156,10 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
if
(
page_type
===
PURCHASE_ORDER_STATUS
.
READY_CONFIRM_ELECTRON_ORDER
)
{
handleSubmit
({})
}
if
(
page_type
===
PURCHASE_ORDER_STATUS
.
READY_RETURN_DOCUMENT
)
{
handleSubmit
({})
}
}
const
extraRight
=
formData
&&
pageStatus
!==
PageStatus
.
PREVIEW
&&
<
div
>
...
...
src/pages/transaction/purchaseOrder/readyFileOrder/model/useSelfTable.tsx
View file @
e9fac838
import
React
from
'react'
import
React
,
{
useRef
}
from
'react'
import
{
Button
}
from
'antd'
import
{
baseOrderListColumns
}
from
'../../constant'
import
{
history
}
from
'umi'
import
{
PublicApi
}
from
'@/services/api'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
PurchaseOrderInsideWorkState
,
SaleOrderInsideWorkState
}
from
'@/constants'
// 业务hooks
, 待新增订单
// 业务hooks
export
const
useSelfTable
=
()
=>
{
const
ref
=
useRef
<
any
>
({})
const
[
rowSelection
,
rowSelectionCtl
]
=
useRowSelectionTable
({
customKey
:
'id'
})
const
handleSubmit
=
async
(
record
)
=>
{
if
(
record
.
interiorState
===
PurchaseOrderInsideWorkState
.
FILLING_ORDER
)
{
history
.
push
(
`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?id=
${
record
.
id
}
&preview=0&page_type=7`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
{
title
:
'操作'
,
...
...
@@ -11,12 +23,18 @@ export const useSelfTable = () => {
dataIndex
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
<
Button
type=
'link'
>
提交审核
</
Button
>
{
record
.
interiorState
===
PurchaseOrderInsideWorkState
.
FILLING_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
)
}
>
归档
</
Button
>
}
</>
}
])
return
{
columns
:
secondColumns
columns
:
secondColumns
,
ref
,
rowSelection
,
rowSelectionCtl
}
}
src/pages/transaction/saleOrder/orderPreview/index.tsx
View file @
e9fac838
...
...
@@ -110,6 +110,24 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
break
;
}
// 确认全部回单
case
SALE_ORDER_STATUS
.
CONFIRM_RETURN_ORDER
:
{
const
params
=
{
id
:
parseInt
(
id
)
}
result
=
await
PublicApi
.
postOrderReceiptOrderConfirmedAll
(
params
)
break
;
}
// 待归档
case
SALE_ORDER_STATUS
.
RETURN_DOCUMENT_ORDER
:
{
const
params
=
{
id
:
parseInt
(
id
)
}
result
=
await
PublicApi
.
postOrderOfOrdersToBeFiled
(
params
)
break
;
}
}
if
(
result
.
code
===
1000
)
{
...
...
@@ -126,9 +144,23 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
handleSubmit
()
}
const
extraRight
=
formData
&&
SaleOrderInsideWorkState
.
CONFIRM_DELIVERY_ORDER
!==
formData
.
purchaseOrderInteriorState
&&
SaleOrderInsideWorkState
.
CONFIRM_RECEIPT
!==
formData
.
purchaseOrderInteriorState
&&
<
Button
type=
'primary'
onClick=
{
startPush
}
>
提交审核
</
Button
>
const
renderExtra
=
()
=>
{
if
(
!
formData
)
{
return
null
}
switch
(
formData
.
purchaseOrderInteriorState
)
{
case
SaleOrderInsideWorkState
.
CONFIRM_DELIVERY_ORDER
:
{
return
<
Button
type=
'primary'
onClick=
{
startPush
}
>
确认全部已发货
</
Button
>
}
case
SaleOrderInsideWorkState
.
CONFIRM_RECEIPT
:
{
return
<
Button
type=
'primary'
onClick=
{
startPush
}
>
确认全部已回单
</
Button
>
}
default
:
{
return
<
Button
type=
'primary'
onClick=
{
startPush
}
>
提交审核
</
Button
>
}
}
}
const
detailList
=
[
{
label
:
'对应报价单号'
,
name
:
'quotationNo'
,
span
:
8
,
render
:
text
=>
<
Link
to=
{
'/'
}
>
{
text
}
</
Link
>
},
{
label
:
'订单摘要'
,
name
:
'orderThe'
,
span
:
8
},
...
...
@@ -147,7 +179,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
return
formData
?
(
<
div
>
<
OrderDetailContext
.
Provider
value=
{
formContext
}
>
<
OrderDetailHeader
headerTitle=
{
headerTiTle
}
detailList=
{
detailList
}
detailData=
{
formData
}
extraRight=
{
extraRight
}
/>
<
OrderDetailHeader
headerTitle=
{
headerTiTle
}
detailList=
{
detailList
}
detailData=
{
formData
}
extraRight=
{
renderExtra
()
}
/>
<
OrderDetailWrapper
>
<
div
className=
'gray-wrap'
>
{
/* 工作流进度 */
}
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx
View file @
e9fac838
...
...
@@ -99,7 +99,7 @@ export const useSelfTable = () => {
]
const
handleConfirm
=
async
(
record
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=
7
&id=
${
record
.
id
}
&preview=0&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=
8
&id=
${
record
.
id
}
&preview=0&orderDeliveryDetailsId=
${
record
.
orderDeliveryDetailsId
}
`
)
}
return
{
...
...
src/pages/transaction/saleOrder/readyReturnDocument/index.tsx
View file @
e9fac838
...
...
@@ -15,7 +15,7 @@ import { DatePicker } from '@formily/antd-components'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
PurchaseOrderInsideWorkState
,
SaleOrderInsideWorkState
}
from
'@/constants'
// 待
确认回
单
// 待
归档订
单
export
interface
FirstApprovedOrderProps
{}
...
...
src/pages/transaction/saleOrder/readyReturnDocument/model/useSelfTable.tsx
View file @
e9fac838
...
...
@@ -6,14 +6,14 @@ import { PublicApi } from '@/services/api'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
PurchaseOrderInsideWorkState
,
SaleOrderInsideWorkState
}
from
'@/constants'
// 业务hooks
, 待新增订单
// 业务hooks
export
const
useSelfTable
=
()
=>
{
const
ref
=
useRef
<
any
>
({})
const
[
rowSelection
,
rowSelectionCtl
]
=
useRowSelectionTable
({
customKey
:
'id'
})
const
handleSubmit
=
async
(
record
)
=>
{
if
(
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
ONE_LEVEL_AUDIT
_ORDER
)
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=
${
record
.
id
}
&preview=0&page_type=
1
`
)
if
(
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
FILLING
_ORDER
)
{
history
.
push
(
`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=
${
record
.
id
}
&preview=0&page_type=
9
`
)
}
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
.
concat
([
...
...
@@ -24,7 +24,7 @@ export const useSelfTable = () => {
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
{
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
ONE_LEVEL_AUDIT
_ORDER
&&
record
.
purchaseOrderInteriorState
===
SaleOrderInsideWorkState
.
FILLING
_ORDER
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleSubmit
(
record
)
}
>
提交审核
</
Button
>
}
</>
...
...
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