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
75e473aa
Commit
75e473aa
authored
Sep 28, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
冗余发票信息
parent
d0b6e9eb
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
44 additions
and
14 deletions
+44
-14
index.ts
src/constants/index.ts
+8
-1
index.less
src/pages/transaction/components/ContractList/index.less
+1
-1
index.tsx
src/pages/transaction/components/ContractList/index.tsx
+0
-0
index.tsx
...haseOrder/orderDetail/components/theInvoiceList/index.tsx
+6
-5
index.ts
...es/transaction/purchaseOrder/orderDetail/effects/index.ts
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/orderDetail/index.tsx
+4
-1
index.tsx
...aseOrder/orderPreview/components/orderMergeInfo/index.tsx
+2
-1
index.tsx
...aleOrder/orderPreview/components/orderMergeInfo/index.tsx
+14
-0
index.tsx
src/pages/transaction/saleOrder/orderPreview/index.tsx
+4
-0
useSelfTable.tsx
...ansaction/saleOrder/readyPayResult/model/useSelfTable.tsx
+4
-4
No files found.
src/constants/index.ts
View file @
75e473aa
...
@@ -567,7 +567,7 @@ export enum PurchaseOrderInsideWorkState {
...
@@ -567,7 +567,7 @@ export enum PurchaseOrderInsideWorkState {
SUBMIT_ORDER
,
SUBMIT_ORDER
,
/**
/**
*
提交订单完成
*
待确认电子合同
*/
*/
SUBMIT_FINISH_ORDER
,
SUBMIT_FINISH_ORDER
,
...
@@ -665,6 +665,11 @@ export enum SaleOrderInsideWorkState {
...
@@ -665,6 +665,11 @@ export enum SaleOrderInsideWorkState {
NOT_ACCEPTED_ORDER
,
NOT_ACCEPTED_ORDER
,
/**
/**
* 待确认支付结果
*/
READY_CONFIRM_PAY_RESULT
,
/**
* 确认支付结果没到账
* 确认支付结果没到账
*/
*/
CONFIRM_NOT_PAY_RESULT
=
17
,
CONFIRM_NOT_PAY_RESULT
=
17
,
...
@@ -797,6 +802,8 @@ export const SaleOrderInsideWorkStateTexts = {
...
@@ -797,6 +802,8 @@ export const SaleOrderInsideWorkStateTexts = {
7
:
'提交一级审核订单不通过'
,
7
:
'提交一级审核订单不通过'
,
8
:
'提交二级审核订单不通过'
,
8
:
'提交二级审核订单不通过'
,
9
:
'不接受订单'
,
9
:
'不接受订单'
,
10
:
'待确认支付结果'
,
16
:
'支付结果确认到账'
,
16
:
'支付结果确认到账'
,
17
:
'支付结果没到账'
,
17
:
'支付结果没到账'
,
18
:
'发货单创建'
,
18
:
'发货单创建'
,
...
...
src/pages/transaction/
purchaseOrder/orderPreview/
components/ContractList/index.less
→
src/pages/transaction/components/ContractList/index.less
View file @
75e473aa
@import '../../../../
../../
global/styles/utils.less';
@import '../../../../global/styles/utils.less';
.contractList {
.contractList {
padding: 0;
padding: 0;
...
...
src/pages/transaction/
purchaseOrder/orderPreview/
components/ContractList/index.tsx
→
src/pages/transaction/components/ContractList/index.tsx
View file @
75e473aa
File moved
src/pages/transaction/purchaseOrder/orderDetail/components/theInvoiceList/index.tsx
View file @
75e473aa
...
@@ -31,15 +31,16 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
...
@@ -31,15 +31,16 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
const
modalRef
=
useRef
<
any
>
({})
const
modalRef
=
useRef
<
any
>
({})
const
{
dataSource
,
showMore
}
=
state
const
{
dataSource
,
showMore
}
=
state
const
{
value
,
mutators
,
form
,
editable
}
=
props
const
{
value
,
mutators
,
form
,
editable
}
=
props
let
useValue
=
typeof
value
===
'object'
?
value
:
dataSource
.
find
(
v
=>
v
.
id
===
value
)
const
transformData
=
transformDefaultData
(
dataSource
)
const
transformData
=
transformDefaultData
(
dataSource
)
const
showDataSource
=
showMore
?
[...
transformData
].
splice
(
0
,
3
)
:
transformData
const
showDataSource
=
showMore
?
[...
transformData
].
splice
(
0
,
3
)
:
transformData
const
handleAdd
=
()
=>
{
const
handleAdd
=
()
=>
{
setMode
(
'add'
)
setMode
(
'add'
)
modalRef
.
current
.
setVisible
(
true
)
modalRef
.
current
.
setVisible
(
true
)
}
}
const
handleCheck
=
(
i
d
)
=>
{
const
handleCheck
=
(
i
tem
)
=>
{
// 选中的id
// 选中的id
mutators
.
change
(
i
d
)
mutators
.
change
(
i
tem
)
}
}
const
reload
=
()
=>
{
const
reload
=
()
=>
{
...
@@ -85,11 +86,11 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
...
@@ -85,11 +86,11 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
return
(
return
(
<
div
style=
{
{
width
:
'100%'
}
}
className=
{
styles
.
invoice
}
>
<
div
style=
{
{
width
:
'100%'
}
}
className=
{
styles
.
invoice
}
>
{
editable
&&
<
Button
block
onClick=
{
handleAdd
}
icon=
{
<
PlusOutlined
/>
}
>
新增发票
</
Button
>
}
{
editable
&&
<
Button
block
onClick=
{
handleAdd
}
icon=
{
<
PlusOutlined
/>
}
>
新增发票
</
Button
>
}
<
Radio
.
Group
className=
{
styles
.
raido_group
}
value=
{
v
alue
}
onChange=
{
e
=>
handleCheck
(
e
)
}
>
<
Radio
.
Group
className=
{
styles
.
raido_group
}
value=
{
useV
alue
}
onChange=
{
e
=>
handleCheck
(
e
)
}
>
<
div
className=
{
styles
.
invoice_list
}
>
<
div
className=
{
styles
.
invoice_list
}
>
{
{
showDataSource
.
map
((
item
,
index
)
=>
(
showDataSource
.
map
((
item
,
index
)
=>
(
<
Radio
className=
{
styles
.
list_radio
}
value=
{
item
.
id
}
key=
{
`address_list_radio_${item.id}`
}
>
<
Radio
className=
{
styles
.
list_radio
}
value=
{
item
}
key=
{
`address_list_radio_${item.id}`
}
>
<
div
className=
{
styles
.
invoice_list_item
}
key=
{
`invoice_list_item_${index}`
}
>
<
div
className=
{
styles
.
invoice_list_item
}
key=
{
`invoice_list_item_${index}`
}
>
<
div
className=
{
styles
.
invoice_list_item_content
}
>
<
div
className=
{
styles
.
invoice_list_item_content
}
>
<
div
className=
{
cx
(
styles
.
invoice_list_item_content_tag
,
item
.
kind
!==
1
?
styles
.
special
:
''
)
}
>
{
item
.
kind
===
1
?
'增值税普通发票'
:
'增值税专用发票'
}
</
div
>
<
div
className=
{
cx
(
styles
.
invoice_list_item_content_tag
,
item
.
kind
!==
1
?
styles
.
special
:
''
)
}
>
{
item
.
kind
===
1
?
'增值税普通发票'
:
'增值税专用发票'
}
</
div
>
...
@@ -103,7 +104,7 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
...
@@ -103,7 +104,7 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
</
div
>
</
div
>
</
div
>
</
div
>
{
{
value
===
item
.
id
&&
(
value
.
id
===
item
.
id
&&
(
editable
?
editable
?
<
div
className=
{
styles
.
invoice_list_item_btn_group
}
>
<
div
className=
{
styles
.
invoice_list_item_btn_group
}
>
<
div
className=
{
styles
.
invoice_list_item_btn
}
onClick=
{
(
e
)
=>
handleEdit
(
item
,
e
)
}
>
编辑
</
div
>
<
div
className=
{
styles
.
invoice_list_item_btn
}
onClick=
{
(
e
)
=>
handleEdit
(
item
,
e
)
}
>
编辑
</
div
>
...
...
src/pages/transaction/purchaseOrder/orderDetail/effects/index.ts
View file @
75e473aa
...
@@ -155,7 +155,7 @@ export const useInvoiceList = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
@@ -155,7 +155,7 @@ export const useInvoiceList = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
ctx
.
setFieldState
(
'theInvoiceId'
,
state
=>
{
ctx
.
setFieldState
(
'theInvoiceId'
,
state
=>
{
if
(
data
.
length
>
0
&&
!
state
.
value
)
{
if
(
data
.
length
>
0
&&
!
state
.
value
)
{
// 初始化时存在数据, 默认帮用户选中第一个
// 初始化时存在数据, 默认帮用户选中第一个
state
.
value
=
data
[
0
]
.
id
state
.
value
=
data
[
0
]
}
}
state
.
dataSource
=
data
state
.
dataSource
=
data
state
.
showMore
=
data
.
length
>
3
state
.
showMore
=
data
.
length
>
3
...
...
src/pages/transaction/purchaseOrder/orderDetail/index.tsx
View file @
75e473aa
...
@@ -160,7 +160,10 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -160,7 +160,10 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
needTheInvoice
:
Number
(
value
.
needTheInvoice
),
needTheInvoice
:
Number
(
value
.
needTheInvoice
),
// 冗余交付信息
// 冗余交付信息
deliveryAddresId
:
value
.
deliveryAddresId
.
id
,
deliveryAddresId
:
value
.
deliveryAddresId
.
id
,
...
omit
(
value
.
deliveryAddresId
,
[
'id'
])
...
omit
(
value
.
deliveryAddresId
,
[
'id'
]),
// 冗余发票信息
theInvoiceId
:
value
.
theInvoiceId
?
value
.
theInvoiceId
.
id
:
undefined
,
theInvoiceInfo
:
value
.
theInvoiceId
||
null
}
}
fnResult
=
id
?
await
PublicApi
.
postOrderProcurementOrderUpdate
({...
params
,
id
})
:
await
PublicApi
.
postOrderProcurementOrderAddReinsurancePolicy
(
params
)
fnResult
=
id
?
await
PublicApi
.
postOrderProcurementOrderUpdate
({...
params
,
id
})
:
await
PublicApi
.
postOrderProcurementOrderAddReinsurancePolicy
(
params
)
break
;
break
;
...
...
src/pages/transaction/purchaseOrder/orderPreview/components/orderMergeInfo/index.tsx
View file @
75e473aa
...
@@ -6,7 +6,7 @@ import { formatTimeString } from '@/utils'
...
@@ -6,7 +6,7 @@ import { formatTimeString } from '@/utils'
import
{
DELIVERY_TYPE
}
from
'@/constants'
import
{
DELIVERY_TYPE
}
from
'@/constants'
import
style
from
'./index.less'
import
style
from
'./index.less'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
ContractList
from
'../ContractList'
import
ContractList
from
'../
../../../components/
ContractList'
export
interface
OrderMergeInfoProps
{
}
export
interface
OrderMergeInfoProps
{
}
const
payInfo
=
[
const
payInfo
=
[
...
@@ -29,6 +29,7 @@ const payInfo = [
...
@@ -29,6 +29,7 @@ const payInfo = [
]
]
const
otherInfo
=
[
const
otherInfo
=
[
{
title
:
'发票'
,
name
:
'theInvoiceInfo'
},
{
title
:
'包装要求'
,
name
:
'pageRequire'
},
{
title
:
'包装要求'
,
name
:
'pageRequire'
},
{
title
:
'其他要求'
,
name
:
'restsRequire'
},
{
title
:
'其他要求'
,
name
:
'restsRequire'
},
]
]
...
...
src/pages/transaction/saleOrder/orderPreview/components/orderMergeInfo/index.tsx
View file @
75e473aa
...
@@ -6,6 +6,7 @@ import { formatTimeString } from '@/utils'
...
@@ -6,6 +6,7 @@ import { formatTimeString } from '@/utils'
import
{
DELIVERY_TYPE
}
from
'@/constants'
import
{
DELIVERY_TYPE
}
from
'@/constants'
import
style
from
'./index.less'
import
style
from
'./index.less'
import
{
PublicApi
}
from
'@/services/api'
import
{
PublicApi
}
from
'@/services/api'
import
ContractList
from
'@/pages/transaction/components/ContractList'
export
interface
OrderMergeInfoProps
{
}
export
interface
OrderMergeInfoProps
{
}
const
payInfo
=
[
const
payInfo
=
[
...
@@ -28,6 +29,7 @@ const payInfo = [
...
@@ -28,6 +29,7 @@ const payInfo = [
]
]
const
otherInfo
=
[
const
otherInfo
=
[
{
title
:
'发票'
,
name
:
'theInvoiceInfo'
},
{
title
:
'包装要求'
,
name
:
'pageRequire'
},
{
title
:
'包装要求'
,
name
:
'pageRequire'
},
{
title
:
'其他要求'
,
name
:
'restsRequire'
},
{
title
:
'其他要求'
,
name
:
'restsRequire'
},
]
]
...
@@ -77,6 +79,18 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
...
@@ -77,6 +79,18 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
</
Col
>
</
Col
>
<
Col
span=
{
4
}
push=
{
2
}
>
<
Col
span=
{
4
}
push=
{
2
}
>
<
MellowCard
title=
'电子合同'
blockClassName=
{
style
.
fullHeight
}
className=
{
style
.
fullHeight
}
>
<
MellowCard
title=
'电子合同'
blockClassName=
{
style
.
fullHeight
}
className=
{
style
.
fullHeight
}
>
<
ContractList
dataSource=
{
data
.
electronicContractUrl
?
[
{
electronicContractUrl
:
data
.
electronicContractUrl
,
electronicContractName
:
data
.
electronicContractName
,
},
]
:
null
}
/>
<
RenderCard
infoList=
{
electronInfo
}
dataSource=
{
data
}
/>
<
RenderCard
infoList=
{
electronInfo
}
dataSource=
{
data
}
/>
</
MellowCard
>
</
MellowCard
>
</
Col
>
</
Col
>
...
...
src/pages/transaction/saleOrder/orderPreview/index.tsx
View file @
75e473aa
...
@@ -180,6 +180,10 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
...
@@ -180,6 +180,10 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
text
=
'确认提交'
text
=
'确认提交'
break
;
break
;
}
}
case
SaleOrderInsideWorkState
.
READY_CONFIRM_PAY_RESULT
:
{
text
=
'确认支付结果'
break
;
}
case
SaleOrderInsideWorkState
.
CONFIRM_RECEIPT
:
{
case
SaleOrderInsideWorkState
.
CONFIRM_RECEIPT
:
{
text
=
'确认全部已回单'
text
=
'确认全部已回单'
break
;
break
;
...
...
src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx
View file @
75e473aa
...
@@ -121,9 +121,9 @@ export const useSelfTable = () => {
...
@@ -121,9 +121,9 @@ export const useSelfTable = () => {
{
{
title
:
'内部状态'
,
title
:
'内部状态'
,
align
:
'center'
,
align
:
'center'
,
dataIndex
:
'
i
nteriorState'
,
dataIndex
:
'
purchaseOrderI
nteriorState'
,
key
:
'
i
nteriorState'
,
key
:
'
purchaseOrderI
nteriorState'
,
render
:
(
text
)
=>
<
StatusColors
status=
{
text
}
type=
'
i
nside'
/>
render
:
(
text
)
=>
<
StatusColors
status=
{
text
}
type=
'
saleI
nside'
/>
},
},
{
{
title
:
'操作'
,
title
:
'操作'
,
...
@@ -131,7 +131,7 @@ export const useSelfTable = () => {
...
@@ -131,7 +131,7 @@ export const useSelfTable = () => {
dataIndex
:
'ctl'
,
dataIndex
:
'ctl'
,
key
:
'ctl'
,
key
:
'ctl'
,
render
:
(
text
,
record
)
=>
<>
render
:
(
text
,
record
)
=>
<>
<
Button
type=
'link'
onClick=
{
()
=>
handleConfirm
(
record
)
}
>
支付
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
handleConfirm
(
record
)
}
>
确认
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
handleCancel
(
record
.
id
)
}
>
取消订单
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
handleCancel
(
record
.
id
)
}
>
取消订单
</
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