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
6957c03a
Commit
6957c03a
authored
Jun 08, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理niceform内上传组件空值异常
parent
9264cbad
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
index.tsx
src/components/NiceForm/components/AntUpload/index.tsx
+3
-2
index.tsx
src/pages/transaction/components/orderSaleRecord/index.tsx
+2
-0
index.tsx
...ges/transaction/components/orderTransformRecord/index.tsx
+3
-3
index.tsx
...transaction/saleOrder/readyApprovedOrder/detail/index.tsx
+1
-4
No files found.
src/components/NiceForm/components/AntUpload/index.tsx
View file @
6957c03a
...
...
@@ -284,12 +284,13 @@ export const Upload = connect({
</
UploadDragger
>
)
}
return
(<
div
>
{
value
.
map
(
item
=>
(<
p
key=
{
item
.
uid
}
style=
{
{
width
:
424
,
display
:
'flex'
,
justifyContent
:
'space-between'
}
}
>
value
?
value
.
map
(
item
=>
(<
p
key=
{
item
.
uid
}
style=
{
{
width
:
424
,
display
:
'flex'
,
justifyContent
:
'space-between'
}
}
>
<
a
href=
{
item
.
url
}
target=
"_blank"
><
FileFilled
/>
{
item
.
name
}
</
a
>
{
!
others
.
readOnly
?
<
span
style=
{
{
cursor
:
'pointer'
}
}
onClick=
{
()
=>
this
.
removeItem
(
item
)
}
><
DeleteOutlined
/></
span
>
:
null
}
</
p
>))
</
p
>))
:
null
}
<
AntdUpload
{
...
others
}
...
...
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @
6957c03a
...
...
@@ -289,6 +289,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
// 确认全部发货单已收到回单
const
handelReciveReturnOrder
=
async
()
=>
{
// @ts-ignore
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
},
{
ctlType
:
"none"
})
let
tip
=
''
if
(
res
.
data
)
...
...
@@ -307,6 +308,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
// 继续发货
const
handleContinueDeliver
=
async
()
=>
{
// @ts-ignore
const
res
=
await
PublicApi
.
getOrderIsDeliveryCompleted
({
id
:
data
.
id
},
{
ctlType
:
'none'
})
let
tip
=
''
if
(
res
.
data
)
...
...
src/pages/transaction/components/orderTransformRecord/index.tsx
View file @
6957c03a
...
...
@@ -28,7 +28,7 @@ const outOrderCols: any[] = [
dataIndex
:
'state'
,
align
:
'center'
,
key
:
'state'
,
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'transformOut'
/>
render
:
(
text
,
record
)
=>
<
StatusColors
status=
{
text
}
type=
'transformOut'
text=
{
record
.
stateName
}
/>
// @todo 需传递工作流状态重新render
},
{
...
...
@@ -82,7 +82,7 @@ const PurchaseSideOrderCols: any[] = [
dataIndex
:
'state'
,
align
:
'center'
,
key
:
'state'
,
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'transformInside'
/>
render
:
(
text
,
record
)
=>
<
StatusColors
status=
{
text
}
type=
'transformInside'
text=
{
record
.
stateName
}
/>
},
{
title
:
'操作'
,
...
...
@@ -135,7 +135,7 @@ const SaleSideOrderCols: any[] = [
dataIndex
:
'state'
,
align
:
'center'
,
key
:
'state'
,
render
:
text
=>
<
StatusColors
status=
{
text
}
type=
'transformSaleInside'
/>
render
:
(
text
,
record
)
=>
<
StatusColors
status=
{
text
}
type=
'transformSaleInside'
text=
{
record
.
stateName
}
/>
},
{
title
:
'操作'
,
...
...
src/pages/transaction/saleOrder/readyApprovedOrder/detail/index.tsx
View file @
6957c03a
import
React
,
{
use
State
,
useCallback
,
useRef
}
from
'react'
;
import
React
,
{
use
Callback
,
useRef
}
from
'react'
;
import
{
OrderDetailContext
}
from
'../../../_public/order/context'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
Button
}
from
'antd'
;
import
OrderDetailHeader
from
'@/pages/transaction/components/OrderDetailHeader'
;
import
OrderDetailWrapper
from
'@/pages/transaction/components/OrderDetailWrapper'
;
import
PreLoading
from
'@/components/PreLoading'
;
import
{
useOrderDetail
}
from
'../../../_public/order/effects/useOrderDetail'
;
import
{
history
}
from
'umi'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
;
import
OrderDetailSection
from
'../../../components/orderDetailSection'
;
import
CreateOrderElectronModal
from
'@/pages/transaction/components/createElectronModal'
;
...
...
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