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
57e167d9
Commit
57e167d9
authored
Feb 09, 2022
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
e63726c1
13afc035
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
63 additions
and
5 deletions
+63
-5
useHandleSettlementList.tsx
...sPayable/settlementList/hooks/useHandleSettlementList.tsx
+31
-2
useHandleSettlementList.tsx
...ceivable/settlementList/hooks/useHandleSettlementList.tsx
+31
-2
invoiceDrawerInfo.tsx
...es/balance/components/InvoiceCreate/invoiceDrawerInfo.tsx
+1
-1
No files found.
src/pages/balance/accountsPayable/settlementList/hooks/useHandleSettlementList.tsx
View file @
57e167d9
...
@@ -152,9 +152,38 @@ function useHandleSettlementList() {
...
@@ -152,9 +152,38 @@ function useHandleSettlementList() {
const
prefix
=
`/memberCenter/balance/accountsPayable/settlementList/`
;
const
prefix
=
`/memberCenter/balance/accountsPayable/settlementList/`
;
const
url
=
URL_MAP
[
record
.
orderType
];
const
url
=
URL_MAP
[
record
.
orderType
];
let
fullUrl
=
`
${
prefix
}${
url
}
?id=
${
record
.
id
}
`
;
let
fullUrl
=
`
${
prefix
}${
url
}
?id=
${
record
.
id
}
`
;
if
(
record
.
orderType
===
CONTRACT_FUND_BILL
)
{
switch
(
record
.
orderType
)
{
fullUrl
=
`/memberCenter/contract/funds/bill/details?applyId=
${
record
.
orderId
}
`
;
// 生产单
case
1
:
fullUrl
=
`/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=
${
record
.
orderId
}
`
;
break
;
// 物流单
case
2
:
fullUrl
=
`/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=
${
record
.
orderId
}
`
;
break
;
// 订单
case
3
:
case
4
:
fullUrl
=
`/memberCenter/tranactionAbility/saleOrder/orderList/preview?orderNo=
${
record
.
orderNo
}
`
;
break
;
// 退货
case
5
:
fullUrl
=
`/memberCenter/afterService/returnManage/returnQuery/detail?id=
${
record
.
orderId
}
`
;
break
;
// 请款单
case
6
:
case
7
:
fullUrl
=
`/memberCenter/balance/businessRequestFunds/search/preview?id=
${
record
.
orderId
}
&no=
${
record
.
orderNo
}
`
;
break
;
// case 7:
// window.open(`/memberCenter/balance/businessReconciliation/search/preview?id=${record.dataId}&no=${record.orderNo}`)
// break;
default
:
break
;
}
}
// if(record.orderType === CONTRACT_FUND_BILL) {
// fullUrl = `/memberCenter/contract/funds/bill/details?applyId=${record.orderId}`;
// }
return
(
return
(
<
EyePreview
url=
{
fullUrl
}
>
<
EyePreview
url=
{
fullUrl
}
>
{
record
.
settlementNo
}
{
record
.
settlementNo
}
...
...
src/pages/balance/accountsReceivable/settlementList/hooks/useHandleSettlementList.tsx
View file @
57e167d9
...
@@ -88,9 +88,38 @@ function useHandleSettlementList() {
...
@@ -88,9 +88,38 @@ function useHandleSettlementList() {
const
prefix
=
'/memberCenter/balance/accountsReceivable/settlementList/'
;
const
prefix
=
'/memberCenter/balance/accountsReceivable/settlementList/'
;
const
url
=
URL_MAP
[
record
.
orderType
];
const
url
=
URL_MAP
[
record
.
orderType
];
let
fullUrl
=
`
${
prefix
}${
url
}
?id=
${
record
.
id
}
`
;
let
fullUrl
=
`
${
prefix
}${
url
}
?id=
${
record
.
id
}
`
;
if
(
record
.
orderType
===
CONTRACT_FUND_BILL
)
{
switch
(
record
.
orderType
)
{
fullUrl
=
`/memberCenter/contract/funds/bill/details?applyId=
${
record
.
orderId
}
`
;
// 生产单
case
1
:
fullUrl
=
`/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=
${
record
.
orderId
}
`
;
break
;
// 物流单
case
2
:
fullUrl
=
`/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=
${
record
.
orderId
}
`
;
break
;
// 订单
case
3
:
case
4
:
fullUrl
=
`/memberCenter/tranactionAbility/saleOrder/orderList/preview?orderNo=
${
record
.
orderNo
}
`
;
break
;
// 退货
case
5
:
fullUrl
=
`/memberCenter/afterService/returnManage/returnQuery/detail?id=
${
record
.
orderId
}
`
;
break
;
// 请款单
case
6
:
case
7
:
fullUrl
=
`/memberCenter/balance/businessRequestFundsCollaboration/search/preview?id=
${
record
.
orderId
}
&no=
${
record
.
orderNo
}
`
;
break
;
// case 7:
// window.open(`/memberCenter/balance/businessReconciliation/search/preview?id=${record.dataId}&no=${record.orderNo}`)
// break;
default
:
break
;
}
}
// if(record.orderType === CONTRACT_FUND_BILL) {
// fullUrl = `/memberCenter/contract/funds/bill/details?applyId=${record.orderId}`;
// }
return
(
return
(
<
EyePreview
url=
{
fullUrl
}
>
<
EyePreview
url=
{
fullUrl
}
>
{
record
.
settlementNo
}
{
record
.
settlementNo
}
...
...
src/pages/balance/components/InvoiceCreate/invoiceDrawerInfo.tsx
View file @
57e167d9
...
@@ -106,7 +106,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
...
@@ -106,7 +106,7 @@ const InvoiceDrawerInfo: React.FC<Iprops> = (props: Iprops) => {
<
div
className=
{
styles
.
header
}
>
<
div
className=
{
styles
.
header
}
>
<
div
className=
{
styles
[
'header-item'
]
}
>
<
div
className=
{
styles
[
'header-item'
]
}
>
{
disabled
?
'原订单发票号码'
:
<>
{
disabled
?
'原订单发票号码'
:
<>
{
intl
.
formatMessage
({
id
:
'balance.fapiao
guanli
'
})
}
<
span
className=
{
styles
.
required
}
>
*
</
span
>
{
intl
.
formatMessage
({
id
:
'balance.fapiao
haoma
'
})
}
<
span
className=
{
styles
.
required
}
>
*
</
span
>
</>
}
</>
}
</
div
>
</
div
>
<
div
className=
{
styles
[
'header-item'
]
}
>
<
div
className=
{
styles
[
'header-item'
]
}
>
...
...
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