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
linweijiong
jinfa-platform
Commits
41342ba9
Commit
41342ba9
authored
Jun 17, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 合同下单隐藏发票,处理支付信息价格显示异常
parent
8ef0085b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
12 deletions
+20
-12
index.tsx
src/pages/procurement/components/transferRecord/index.tsx
+1
-2
index.tsx
src/pages/transaction/components/orderMergeInfo/index.tsx
+4
-0
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+14
-9
No files found.
src/pages/procurement/components/transferRecord/index.tsx
View file @
41342ba9
...
...
@@ -18,7 +18,6 @@ export interface BidTransformRecordProps {
const
BidTransformRecord
:
React
.
FC
<
BidTransformRecordProps
>
=
({
cardTitle
})
=>
{
const
{
data
,
externalProcurementOrderLogResponses
,
interiorProcurementOrderLogResponses
,
apiType
}
=
useContext
(
BidDetailContext
)
// 根据模式选择对应的状态映射
const
insideModel
=
apiType
.
indexOf
(
'ender'
)
!==
-
1
?
'tenderInside'
:
'inside'
;
...
...
@@ -143,7 +142,7 @@ const BidTransformRecord:React.FC<BidTransformRecordProps> = ({cardTitle}) => {
extra=
{
<
Radio
.
Group
value=
{
transferRadio
}
buttonStyle=
"solid"
size=
"small"
onChange=
{
handleChangeType
}
>
{
externalProcurementOrderLogResponses
?.
length
?
<
Radio
.
Button
value=
{
TransferEnum
.
Outer
}
>
外部流转
</
Radio
.
Button
>
:
null
}
{
interiorProcurementOrderLogResponses
?.
length
?
<
Radio
.
Button
value=
{
TransferEnum
.
Interior
}
>
内部流转
</
Radio
.
Button
>
:
null
}
{
interiorProcurementOrderLogResponses
?.
length
&&
apiType
!==
'tenderInCallForBid'
&&
apiType
!==
'callForBidInTender'
?
<
Radio
.
Button
value=
{
TransferEnum
.
Interior
}
>
内部流转
</
Radio
.
Button
>
:
null
}
</
Radio
.
Group
>
}
className=
{
style
.
cardWrap
}
...
...
src/pages/transaction/components/orderMergeInfo/index.tsx
View file @
41342ba9
...
...
@@ -74,6 +74,10 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
{
title
:
'其他要求:'
,
name
:
'restsRequire'
},
]
if
(
data
.
orderModel
>
30
)
{
otherInfo
.
shift
()
}
return
(
<>
<
Row
style=
{
{
marginTop
:
24
}
}
gutter=
{
24
}
>
...
...
src/pages/transaction/components/orderPayModal/index.tsx
View file @
41342ba9
...
...
@@ -258,7 +258,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
setPayStep
(
1
)
}
else
{
message
.
error
(
'暂只支持线下支付、授信额度支付、余额支付、货到付款、微信支付方式'
)
message
.
error
(
'暂只支持线下支付、授信额度支付、余额支付、货到付款、微信
、账期月结
支付方式'
)
}
}
else
{
message
.
error
(
'请先选择支付方式'
)
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
41342ba9
...
...
@@ -137,7 +137,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
const
[
formLoading
,
setFormLoading
]
=
useState
(
false
)
const
[
btnLoading
,
setBtnLoading
]
=
useState
(
false
)
const
update
=
useUpdate
()
const
[
productSumPrice
,
setProductSumPrice
]
=
useState
<
number
>
(
0
)
// const [productSumPrice, setProductSumPrice] = useState<number>(0)
const
productSumPriceRef
=
useRef
<
any
>
(
0
)
const
{
pageStatus
,
id
,
page_type
=
'0'
,
modelType
,
spam_id
,
lastTypeParams
}
=
usePageStatus
()
const
[
initFormSchema
,
setInitFormSchema
]
=
useState
<
any
>
(()
=>
({...
mergeAllSchemas
[
page_type
]}))
const
[
initFormValue
,
setInitFormValue
]
=
useState
<
any
>
(()
=>
{
...
...
@@ -444,7 +445,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
forceEdit
:
col
.
forceEdit
,
handleSave
:
paymentSave
,
handleChange
:
(
record
,
value
=
100
)
=>
{
const
payPrice
=
(
value
/
100
*
productSumPrice
).
toFixed
(
2
)
const
payPrice
=
(
value
/
100
*
productSumPrice
Ref
.
current
).
toFixed
(
2
)
const
newData
=
[...
addSchemaAction
.
getFieldValue
(
'paymentInformationResponses'
)];
const
item
=
newData
[
index
];
newData
.
splice
(
index
,
1
,
{
...
...
@@ -460,8 +461,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
const
providerValue
=
{
detailData
:
initFormValue
,
schemaActions
:
addSchemaAction
,
productSumPrice
,
setProductSumPrice
//
productSumPrice,
//
setProductSumPrice
}
// 显示采购下单合同栏目
...
...
@@ -559,7 +560,8 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
})
addSchemaAction
.
setFieldValue
(
'paymentInformationResponses'
,
newData
)
}
setProductSumPrice
(
payload
)
// setProductSumPrice(payload)
productSumPriceRef
.
current
=
payload
})
$
(
'onFieldInputChange'
,
'orderModel'
).
subscribe
(
state
=>
{
const
{
editable
,
value
}
=
state
...
...
@@ -590,6 +592,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
state
.
props
.
title
=
orderTypeLabelMap
[
value
]
state
.
visible
=
true
})
ctx
.
setFieldState
(
'needTheInvoice'
,
state
=>
{
state
.
visible
=
false
})
showContractColumn
()
}
else
{
ctx
.
setFieldState
(
'quotationNo'
,
state
=>
{
...
...
@@ -654,24 +659,24 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
value
===
OrderModalType
.
PURCHASE_TENDER_CONTRACT_ORDER
)
{
// 判断合同下单
setTimeout
(()
=>
{
//
setTimeout(() =>
{
addSchemaAction
.
setFieldState
(
'orderProductRequests'
,
productState
=>
{
productState
.
props
[
"x-component-props"
]
=
{
...
productState
.
props
[
"x-component-props"
],
prefix
:
editable
?
materialAddButton
:
''
,
}
})
},
3
00
)
//
},
5
00
)
showContractColumn
()
}
else
{
setTimeout
(()
=>
{
//
setTimeout(() =>
{
addSchemaAction
.
setFieldState
(
'orderProductRequests'
,
productState
=>
{
productState
.
props
[
"x-component-props"
]
=
{
...
productState
.
props
[
"x-component-props"
],
prefix
:
''
,
}
})
}
)
//
},
500
)
}
// 选择某种类型时, 需显示对应的订单类型
ctx
.
setFieldValue
(
'type'
,
orderTypeLabelMap
[
value
])
...
...
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