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
96997797
Commit
96997797
authored
Dec 07, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
3a4eac29
6ea840d8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
6 deletions
+3
-6
detail.tsx
src/pages/transaction/demandPosts/components/detail.tsx
+2
-2
index.tsx
...eOrder/orderCollect/components/payInfoTableCell/index.tsx
+0
-2
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+0
-1
usePaymentInfo.tsx
...ction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
+1
-1
No files found.
src/pages/transaction/demandPosts/components/detail.tsx
View file @
96997797
...
@@ -292,7 +292,7 @@ const detailInfo: React.FC<detailParams> = (props) => {
...
@@ -292,7 +292,7 @@ const detailInfo: React.FC<detailParams> = (props) => {
const
fetchData
=
(
params
?:
any
)
=>
{
const
fetchData
=
(
params
?:
any
)
=>
{
return
new
Promise
(
resolve
=>
{
return
new
Promise
(
resolve
=>
{
PublicApi
.
getOrderRequisitionFormProductList
({
...
params
}).
then
(
res
=>
{
PublicApi
.
getOrderRequisitionFormProductList
({
id
,
...
params
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
const
arr
:
any
[]
=
[]
const
arr
:
any
[]
=
[]
res
.
data
.
data
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
res
.
data
.
data
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
...
@@ -520,7 +520,7 @@ const detailInfo: React.FC<detailParams> = (props) => {
...
@@ -520,7 +520,7 @@ const detailInfo: React.FC<detailParams> = (props) => {
{
data
.
type
===
1
&&
{
data
.
type
===
1
&&
<
Form
.
Item
name=
'shopIds'
noStyle
wrapperCol=
{
{
span
:
24
}
}
>
<
Form
.
Item
name=
'shopIds'
noStyle
wrapperCol=
{
{
span
:
24
}
}
>
<
Checkbox
.
Group
disabled
className=
{
style
.
checkbox_wrap_style
}
>
<
Checkbox
.
Group
disabled
className=
{
style
.
checkbox_wrap_style
}
>
<
Row
>
<
Row
gutter=
{
[
24
,
24
]
}
>
{
{
goodAllIds
.
map
((
v
:
any
,
i
:
number
)
=>
{
goodAllIds
.
map
((
v
:
any
,
i
:
number
)
=>
{
return
(
return
(
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/payInfoTableCell/index.tsx
View file @
96997797
...
@@ -87,7 +87,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
...
@@ -87,7 +87,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
}
}
case
'select'
:
{
case
'select'
:
{
const
{
options
,
...
rest
}
=
formItemProps
const
{
options
,
...
rest
}
=
formItemProps
console
.
log
(
originOptions
)
// 支付方式
// 支付方式
if
(
dataIndex
===
'payWay'
)
{
if
(
dataIndex
===
'payWay'
)
{
return
<
Select
ref=
{
formItemRef
}
return
<
Select
ref=
{
formItemRef
}
...
@@ -116,7 +115,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
...
@@ -116,7 +115,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
}
}
}
}
console
.
log
(
type
,
originOptions
,
childOptions
)
}
}
let
childNode
=
children
;
let
childNode
=
children
;
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
96997797
...
@@ -205,7 +205,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
...
@@ -205,7 +205,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
// theInvoiceInfo: value.theInvoiceInfo
// theInvoiceInfo: value.theInvoiceInfo
}
}
// 校验是否选择支付渠道
// 校验是否选择支付渠道
console
.
log
(
params
,
'params'
)
let
judgementByPay
=
params
.
paymentInformationResponses
.
map
(
item
=>
{
let
judgementByPay
=
params
.
paymentInformationResponses
.
map
(
item
=>
{
if
(
item
.
channel
&&
item
.
payWay
){
if
(
item
.
channel
&&
item
.
payWay
){
return
true
return
true
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
View file @
96997797
...
@@ -99,7 +99,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
@@ -99,7 +99,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
...
item
,
...
item
,
...
row
,
...
row
,
});
});
ctx
.
setFieldValue
(
'paymentInfor
+
mationResponses'
,
newData
)
ctx
.
setFieldValue
(
'paymentInformationResponses'
,
newData
)
resolve
({
item
,
newData
})
resolve
({
item
,
newData
})
})
})
...
...
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