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
11acc6e3
Commit
11acc6e3
authored
Apr 22, 2022
by
Gavin Peng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复送货计划管理、协同细节问题
parent
f8fbd642
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
200 additions
and
111 deletions
+200
-111
dateClock.png
public/static/imgs/dateClock.png
+0
-0
index.tsx
src/components/AnchorPage/index.tsx
+9
-1
global.less
src/global/styles/global.less
+53
-3
anchors.ts
src/pages/order/constants/anchors.ts
+4
-2
details.tsx
...r/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx
+12
-8
details.tsx
...r/deliveryPlanCollaboration/deliveryPlanQuery/details.tsx
+24
-20
create.tsx
...er/deliveryPlanManagement/deliveryPlanAwaitB2B/create.tsx
+11
-10
details.tsx
...r/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx
+16
-14
update.tsx
...er/deliveryPlanManagement/deliveryPlanAwaitB2B/update.tsx
+11
-7
create.tsx
...er/deliveryPlanManagement/deliveryPlanAwaitSRM/create.tsx
+10
-15
details.tsx
...r/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx
+12
-8
update.tsx
...er/deliveryPlanManagement/deliveryPlanAwaitSRM/update.tsx
+13
-9
details.tsx
...rder/deliveryPlanManagement/deliveryPlanQuery/details.tsx
+11
-6
update.tsx
...order/deliveryPlanManagement/deliveryPlanQuery/update.tsx
+14
-8
No files found.
public/static/imgs/dateClock.png
0 → 100644
View file @
11acc6e3
863 Bytes
src/components/AnchorPage/index.tsx
View file @
11acc6e3
...
@@ -22,6 +22,10 @@ export interface AnchorsItem {
...
@@ -22,6 +22,10 @@ export interface AnchorsItem {
* 名称
* 名称
*/
*/
name
:
React
.
ReactNode
|
string
,
name
:
React
.
ReactNode
|
string
,
/**
* 个性化定制 item Title 数量
*/
len
?:
number
|
string
,
}
}
interface
IProps
{
interface
IProps
{
...
@@ -137,7 +141,11 @@ const AnchorPage = (props: IProps) => {
...
@@ -137,7 +141,11 @@ const AnchorPage = (props: IProps) => {
className=
{
current
&&
index
===
0
?
'ant-anchor-link-active'
:
null
}
className=
{
current
&&
index
===
0
?
'ant-anchor-link-active'
:
null
}
key=
{
item
.
key
}
key=
{
item
.
key
}
href=
{
`#${item.key}`
}
href=
{
`#${item.key}`
}
title=
{
item
.
name
}
title=
{
item
.
len
?
`${item.name}(${item.len})`
:
item
.
name
}
/>
/>
))
}
))
}
</
div
>
</
div
>
...
...
src/global/styles/global.less
View file @
11acc6e3
...
@@ -59,7 +59,7 @@ a {
...
@@ -59,7 +59,7 @@ a {
::-webkit-scrollbar-thumb {
::-webkit-scrollbar-thumb {
width: 8px;
width: 8px;
min-height: 15px;
min-height: 15px;
background: rgba(0,
0,0,
.2);
background: rgba(0,
0, 0,
.2);
border-radius: 5px;
border-radius: 5px;
}
}
...
@@ -382,13 +382,13 @@ a {
...
@@ -382,13 +382,13 @@ a {
}
}
}
}
.ant-table-thead
> tr >
th {
.ant-table-thead
>tr>
th {
word-break: break-all;
word-break: break-all;
}
}
.useMegaStart {
.useMegaStart {
.mega-layout-item-content {
.mega-layout-item-content {
>
div {
>div {
justify-content: flex-start !important;
justify-content: flex-start !important;
}
}
}
}
...
@@ -403,6 +403,7 @@ a {
...
@@ -403,6 +403,7 @@ a {
background-color: #FFF !important;
background-color: #FFF !important;
border: 0 !important;
border: 0 !important;
box-shadow: 0 0 0 0 #fff !important;
box-shadow: 0 0 0 0 #fff !important;
.ant-picker-input {
.ant-picker-input {
border: 1px solid #d9d9d9 !important;
border: 1px solid #d9d9d9 !important;
background-color: #F4F6F8 !important;
background-color: #F4F6F8 !important;
...
@@ -420,19 +421,67 @@ a {
...
@@ -420,19 +421,67 @@ a {
vertical-align: middle;
vertical-align: middle;
}
}
}
}
.ant-picker-active-bar {
.ant-picker-active-bar {
margin-left: 0 !important;
margin-left: 0 !important;
}
}
.ant-picker-suffix {
.ant-picker-suffix {
display: none !important;
display: none !important;
}
}
.ant-picker-separator {
.ant-picker-separator {
.anticon-swap-right {
.anticon-swap-right {
display: none !important;
display: none !important;
}
}
&::before {
&::before {
display: inline-block;
display: inline-block;
content: '~';
content: '~';
}
}
}
}
}
}
.datePicker-range-separate {
padding: 0 !important;
background-color: #FFF !important;
border: 0 !important;
box-shadow: 0 0 0 0 #fff !important;
.ant-picker-input {
border: 1px solid #d9d9d9 !important;
background-color: #F4F6F8 !important;
padding: 6px 11px 6px !important;
border-radius: 4px;
&::after {
display: inline-block;
content: '';
width: 16px;
height: 16px;
background-image: url(/static/imgs/dateClock.png);
background-repeat: no-repeat;
background-size: cover;
vertical-align: middle;
}
}
.ant-picker-active-bar {
margin-left: 0 !important;
}
.ant-picker-suffix {
display: none !important;
}
.ant-picker-separator {
.anticon-swap-right {
display: none !important;
}
&::before {
display: inline-block;
content: '~';
}
}
}
\ No newline at end of file
src/pages/order/constants/anchors.ts
View file @
11acc6e3
...
@@ -72,12 +72,14 @@ const PlanMaterial: AnchorsItem = {
...
@@ -72,12 +72,14 @@ const PlanMaterial: AnchorsItem = {
const
PlanGood
:
AnchorsItem
=
{
const
PlanGood
:
AnchorsItem
=
{
key
:
'PlanGood'
,
key
:
'PlanGood'
,
name
:
"计划送货商品"
name
:
"计划送货商品"
,
len
:
0
}
}
const
PlannedDelivery
:
AnchorsItem
=
{
const
PlannedDelivery
:
AnchorsItem
=
{
key
:
'PlannedDelivery'
,
key
:
'PlannedDelivery'
,
name
:
"计划送货商品"
name
:
"计划送货商品"
,
len
:
0
}
}
const
DeliveryGood
:
AnchorsItem
=
{
const
DeliveryGood
:
AnchorsItem
=
{
...
...
src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx
View file @
11acc6e3
...
@@ -10,7 +10,7 @@ import _ from 'lodash'
...
@@ -10,7 +10,7 @@ import _ from 'lodash'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage'
import
{
Button
,
Space
,
Spin
,
Steps
,
Table
,
Tag
}
from
'antd'
import
{
Button
,
Space
,
Spin
,
Steps
,
Table
,
Tag
}
from
'antd'
import
{
CaretDownOutlined
,
CaretRightOutlined
,
CheckCircleOutlined
}
from
'@ant-design/icons'
import
{
CaretDownOutlined
,
CaretRightOutlined
,
CheckCircleOutlined
}
from
'@ant-design/icons'
import
{
Circulation
,
BaseInfo
as
base_Info
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlanNumber
,
PlanSummary
,
PlanningCycle
,
ExternalState
,
PlannedDelivery
,
BuyerLabel
,
}
from
'../../constants'
import
{
Circulation
,
BaseInfo
as
base_Info
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlanNumber
,
PlanSummary
,
PlanningCycle
,
ExternalState
,
PlannedDelivery
,
BuyerLabel
,
PlanMaterial
,
}
from
'../../constants'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
{
columnB2B
,
columnSRM
,
ExternalRoamRecordTableColumn
,
initExpandIconColumn
}
from
'../../constants/page-table-column'
import
{
columnB2B
,
columnSRM
,
ExternalRoamRecordTableColumn
,
initExpandIconColumn
}
from
'../../constants/page-table-column'
import
CustomizedModal
,
{
SubmitFeedback
}
from
'../../components/customizedModal'
import
CustomizedModal
,
{
SubmitFeedback
}
from
'../../components/customizedModal'
...
@@ -28,11 +28,14 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
...
@@ -28,11 +28,14 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
const
deliveryPlanType
=
godAtob
(
ty
as
string
)
const
deliveryPlanType
=
godAtob
(
ty
as
string
)
const
id
=
godAtob
(
i
as
string
)
const
id
=
godAtob
(
i
as
string
)
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlannedDelivery
,
Circulation
,
])
base_Info
,
deliveryPlanType
===
'1'
?
{
...
PlannedDelivery
,
len
:
_length
}
:
{
...
PlanMaterial
,
len
:
_length
},
]
}
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
...
@@ -75,6 +78,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
...
@@ -75,6 +78,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -124,7 +128,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
...
@@ -124,7 +128,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
{
/* 条件渲染 */
}
{
/* 条件渲染 */
}
...
@@ -165,7 +169,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
...
@@ -165,7 +169,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
</
Tag
>
</
Tag
>
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
>
</
BaseInfo
>
<
BaseInfo
className=
'mt-16'
title=
{
PlannedDelivery
.
name
}
id=
{
PlannedDelivery
.
key
}
cols=
{
1
}
>
<
BaseInfo
className=
'mt-16'
title=
{
deliveryPlanType
===
'1'
?
PlannedDelivery
.
name
:
PlanMaterial
.
name
}
id=
{
deliveryPlanType
===
'1'
?
PlannedDelivery
.
key
:
PlanMaterial
.
key
}
cols=
{
1
}
>
{
/* B2B 显示计划送货物料,SRM显示计划送货商品 */
}
{
/* B2B 显示计划送货物料,SRM显示计划送货商品 */
}
<
Table
<
Table
// defaultExpandAllRows
// defaultExpandAllRows
...
...
src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/details.tsx
View file @
11acc6e3
...
@@ -33,11 +33,14 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
...
@@ -33,11 +33,14 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
const
ref
=
useRef
<
any
>
()
const
ref
=
useRef
<
any
>
()
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
deliveryPlanType
===
'1'
?
PlannedDelivery
:
PlanMaterial
,
Circulation
,
])
base_Info
,
deliveryPlanType
===
'1'
?
{
...
PlannedDelivery
,
len
:
_length
}
:
{
...
PlanMaterial
,
len
:
_length
},
]
}
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
...
@@ -63,7 +66,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
...
@@ -63,7 +66,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
const
expandedRowRender
=
(
record
:
any
)
=>
{
const
expandedRowRender
=
(
record
:
any
)
=>
{
return
<
div
>
return
<
div
>
<
Table
<
Table
rowKey=
{
'planOrderId'
}
rowKey=
{
'planOrderId'
}
columns=
{
expandIconColumn
}
columns=
{
expandIconColumn
}
dataSource=
{
record
.
orders
}
dataSource=
{
record
.
orders
}
...
@@ -99,6 +102,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
...
@@ -99,6 +102,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -204,9 +208,9 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
...
@@ -204,9 +208,9 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
return
(
return
(
<
Spin
spinning=
{
spinning
}
>
<
Spin
spinning=
{
spinning
}
>
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
{
/* 条件渲染 */
}
{
/* 条件渲染 */
}
...
@@ -221,18 +225,18 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
...
@@ -221,18 +225,18 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
}
}
>
>
<
BaseInfo
<
BaseInfo
className=
'mt-0'
className=
'mt-0'
title=
{
Circulation
.
name
}
title=
{
Circulation
.
name
}
id=
{
Circulation
.
key
}
id=
{
Circulation
.
key
}
cols=
{
1
}
cols=
{
1
}
subtitle=
{
subtitle=
{
<
CirculationRecords
<
CirculationRecords
fetchApi=
{
getOrderDeliveryPlanDeliveryHistory
}
fetchApi=
{
getOrderDeliveryPlanDeliveryHistory
}
params=
{
{
id
:
id
as
string
}
}
params=
{
{
id
:
id
as
string
}
}
columns=
{
ExternalRoamRecordTableColumn
}
columns=
{
ExternalRoamRecordTableColumn
}
/>
/>
}
}
>
>
<
Steps
progressDot
current=
{
details
?.
status
===
4
?
1
:
0
}
>
<
Steps
progressDot
current=
{
details
?.
status
===
4
?
1
:
0
}
>
<
Steps
.
Step
title=
{
SubmitDeliveryPlan
}
description=
{
Purchaser
}
/>
<
Steps
.
Step
title=
{
SubmitDeliveryPlan
}
description=
{
Purchaser
}
/>
<
Steps
.
Step
title=
{
ConfirmDeliveryPlan
}
description=
{
Supplier
}
/>
<
Steps
.
Step
title=
{
ConfirmDeliveryPlan
}
description=
{
Supplier
}
/>
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/create.tsx
View file @
11acc6e3
...
@@ -35,12 +35,14 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
...
@@ -35,12 +35,14 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
// 锚点标题
// 锚点标题
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
// Circulation,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlannedDelivery
,
base_Info
,
Remarks
,
{
...
PlannedDelivery
,
len
:
_length
},
])
Remarks
,
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
goodsTableColumn
,
setGoodsTableColumn
]
=
useState
<
any
>
(
columnB2B
)
const
[
goodsTableColumn
,
setGoodsTableColumn
]
=
useState
<
any
>
(
columnB2B
)
...
@@ -162,8 +164,6 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
...
@@ -162,8 +164,6 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
// 获取计划送货
// 获取计划送货
const
getPlannedDelivery
=
()
=>
{
const
getPlannedDelivery
=
()
=>
{
getOrderDeliveryPlanOrderProductPage
({
getOrderDeliveryPlanOrderProductPage
({
// startDate: selectedDate[0],
// endDate: selectedDate[1],
memberId
:
selectedMember
.
memberId
,
memberId
:
selectedMember
.
memberId
,
roleId
:
selectedMember
.
roleId
,
roleId
:
selectedMember
.
roleId
,
roleType
:
ROLE_TYPE
,
roleType
:
ROLE_TYPE
,
...
@@ -172,6 +172,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
...
@@ -172,6 +172,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
((
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
((
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -202,7 +203,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
...
@@ -202,7 +203,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
CreateDeliveryPlanTitleB2B
}
title=
{
CreateDeliveryPlanTitleB2B
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
{
/* <Button>保存并提交</Button> */
}
{
/* <Button>保存并提交</Button> */
}
...
@@ -254,7 +255,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
...
@@ -254,7 +255,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
{
required
:
true
,
message
:
'请选择'
}
{
required
:
true
,
message
:
'请选择'
}
]
}
]
}
>
>
<
DatePicker
.
RangePicker
disabledDate=
{
disabledDate
}
style=
{
{
width
:
'100%'
}
}
onChange=
{
(
dates
)
=>
handleDateAssembleColumn
(
dates
)
}
/>
<
DatePicker
.
RangePicker
className=
'datePicker-range-separate'
disabledDate=
{
disabledDate
}
style=
{
{
width
:
'100%'
}
}
onChange=
{
(
dates
)
=>
handleDateAssembleColumn
(
dates
)
}
/>
</
Form
.
Item
>
</
Form
.
Item
>
</
BaseInfo
>
</
BaseInfo
>
<
BaseInfo
className=
'mt-16'
title=
{
PlannedDelivery
.
name
}
id=
{
PlannedDelivery
.
key
}
cols=
{
1
}
>
<
BaseInfo
className=
'mt-16'
title=
{
PlannedDelivery
.
name
}
id=
{
PlannedDelivery
.
key
}
cols=
{
1
}
>
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx
View file @
11acc6e3
...
@@ -28,11 +28,14 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
...
@@ -28,11 +28,14 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
const
goodsTableDataRef
=
useRef
(
null
)
const
goodsTableDataRef
=
useRef
(
null
)
// 锚点标题
// 锚点标题
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlannedDelivery
,
Circulation
,
])
base_Info
,
{
...
PlannedDelivery
,
len
:
_length
},
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
goodsTableColumn
,
setGoodsTableColumn
]
=
useState
<
any
>
(
columnB2B
)
const
[
goodsTableColumn
,
setGoodsTableColumn
]
=
useState
<
any
>
(
columnB2B
)
...
@@ -49,8 +52,6 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
...
@@ -49,8 +52,6 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
// 计划送货商品 列表
// 计划送货商品 列表
const
[
goodsTableData
,
setGoodsTableData
]
=
useState
<
any
>
(
null
)
const
[
goodsTableData
,
setGoodsTableData
]
=
useState
<
any
>
(
null
)
// 外部流转单据记录
const
[
externalRoamRecordData
,
setExternalRoamRecordData
]
=
useState
<
any
>
(
null
)
// 计划周期 渲染日期
// 计划周期 渲染日期
const
handleDateAssembleColumn
=
(
startDate
:
string
,
endDate
:
string
)
=>
{
const
handleDateAssembleColumn
=
(
startDate
:
string
,
endDate
:
string
)
=>
{
...
@@ -62,7 +63,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
...
@@ -62,7 +63,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
key
:
item
,
key
:
item
,
width
:
80
,
width
:
80
,
align
:
'center'
,
align
:
'center'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(<
CustomizedTableItem
createNotice=
{
text
?.
createNotice
}
createDelivery=
{
text
?.
createDelivery
}
planCount=
{
text
?.
planCount
}
/>)
render
:
(
text
:
any
,
record
:
any
)
=>
(<
CustomizedTableItem
createNotice=
{
text
?.
createNotice
}
createDelivery=
{
text
?.
createDelivery
}
planCount=
{
text
?.
planCount
}
/>)
}))
}))
setGoodsTableColumn
([...
goodsTableColumn
,
...
datesColumn
])
setGoodsTableColumn
([...
goodsTableColumn
,
...
datesColumn
])
setExpandIconColumn
([...
expandIconColumn
,
...
datesExpandIconColumn
])
setExpandIconColumn
([...
expandIconColumn
,
...
datesExpandIconColumn
])
...
@@ -76,6 +77,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
...
@@ -76,6 +77,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -110,7 +112,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
...
@@ -110,7 +112,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
>
>
<
BaseInfo
<
BaseInfo
className=
'mt-0'
className=
'mt-0'
...
@@ -152,11 +154,11 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
...
@@ -152,11 +154,11 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
columns=
{
goodsTableColumn
}
columns=
{
goodsTableColumn
}
expandable=
{
{
expandable=
{
{
expandIcon
:
({
expanded
,
onExpand
,
record
})
=>
expandIcon
:
({
expanded
,
onExpand
,
record
})
=>
expanded
?
(
expanded
?
(
<
CaretDownOutlined
onClick=
{
e
=>
onExpand
(
record
,
e
)
}
/>
<
CaretDownOutlined
onClick=
{
e
=>
onExpand
(
record
,
e
)
}
/>
)
:
(
)
:
(
<
CaretRightOutlined
onClick=
{
e
=>
onExpand
(
record
,
e
)
}
/>
<
CaretRightOutlined
onClick=
{
e
=>
onExpand
(
record
,
e
)
}
/>
),
),
expandedRowRender
expandedRowRender
}
}
}
}
dataSource=
{
goodsTableData
}
dataSource=
{
goodsTableData
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/update.tsx
View file @
11acc6e3
...
@@ -35,12 +35,15 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
...
@@ -35,12 +35,15 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
// 锚点标题
// 锚点标题
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlannedDelivery
,
Circulation
,
Remarks
,
base_Info
,
])
{
...
PlannedDelivery
,
len
:
_length
},
Remarks
,
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
goodsTableColumn
,
setGoodsTableColumn
]
=
useState
<
any
>
(
columnB2B
)
const
[
goodsTableColumn
,
setGoodsTableColumn
]
=
useState
<
any
>
(
columnB2B
)
...
@@ -130,6 +133,7 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
...
@@ -130,6 +133,7 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -169,7 +173,7 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
...
@@ -169,7 +173,7 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
details
?.
planNo
}
title=
{
details
?.
planNo
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
{
/* <Button>保存并提交</Button> */
}
{
/* <Button>保存并提交</Button> */
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/create.tsx
View file @
11acc6e3
...
@@ -34,12 +34,14 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
...
@@ -34,12 +34,14 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
// Circulation,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlanMaterial
,
base_Info
,
Remarks
,
{
...
PlanMaterial
,
len
:
_length
},
])
Remarks
,
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
materialTableColumn
,
setMaterialTableColumn
]
=
useState
<
any
>
(
columnSRM
)
const
[
materialTableColumn
,
setMaterialTableColumn
]
=
useState
<
any
>
(
columnSRM
)
...
@@ -163,8 +165,6 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
...
@@ -163,8 +165,6 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
// 获取计划送货 物料
// 获取计划送货 物料
const
getPlannedDelivery
=
()
=>
{
const
getPlannedDelivery
=
()
=>
{
getOrderDeliveryPlanOrderProductPage
({
getOrderDeliveryPlanOrderProductPage
({
// startDate: selectedDate[0],
// endDate: selectedDate[1],
memberId
:
selectedMember
.
memberId
,
memberId
:
selectedMember
.
memberId
,
roleId
:
selectedMember
.
roleId
,
roleId
:
selectedMember
.
roleId
,
roleType
:
ROLE_TYPE
,
roleType
:
ROLE_TYPE
,
...
@@ -173,6 +173,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
...
@@ -173,6 +173,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
((
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
((
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -203,7 +204,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
...
@@ -203,7 +204,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
CreateDeliveryPlanTitleSRM
}
title=
{
CreateDeliveryPlanTitleSRM
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
{
/* <Button>保存并新增</Button> */
}
{
/* <Button>保存并新增</Button> */
}
...
@@ -215,12 +216,6 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
...
@@ -215,12 +216,6 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
labelAlign=
'left'
labelAlign=
'left'
form=
{
form
}
form=
{
form
}
>
>
{
/* <BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
<Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
</Steps>
</BaseInfo> */
}
<
BaseInfo
className=
'mt-0'
title=
{
base_Info
.
name
}
id=
{
base_Info
.
key
}
>
<
BaseInfo
className=
'mt-0'
title=
{
base_Info
.
name
}
id=
{
base_Info
.
key
}
>
<
Form
.
Item
<
Form
.
Item
{
...
formItemLayout
}
{
...
formItemLayout
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx
View file @
11acc6e3
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
import
React
,
{
useEffect
,
useState
}
from
'react'
import
React
,
{
useEffect
,
useState
}
from
'react'
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage'
import
{
BaseInfo
as
base_Info
,
PlanningCycle
,
SupplyMembersLabel
,
PlanSummary
,
ExternalRoamRecord
,
Circulation
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlannedDelivery
,
ExternalState
,
PlanNumber
}
from
'../../constants'
import
{
BaseInfo
as
base_Info
,
PlanningCycle
,
SupplyMembersLabel
,
PlanSummary
,
ExternalRoamRecord
,
Circulation
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlannedDelivery
,
ExternalState
,
PlanNumber
,
PlanMaterial
}
from
'../../constants'
import
{
Steps
,
Table
,
Tag
}
from
'antd'
import
{
Steps
,
Table
,
Tag
}
from
'antd'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
{
columnSRM
,
ExternalRoamRecordTableColumn
,
initExpandIconColumn
}
from
'../../constants/page-table-column'
import
{
columnSRM
,
ExternalRoamRecordTableColumn
,
initExpandIconColumn
}
from
'../../constants/page-table-column'
...
@@ -24,11 +24,14 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
...
@@ -24,11 +24,14 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
const
{
location
:
{
query
:
{
i
}
}
}
=
history
const
{
location
:
{
query
:
{
i
}
}
}
=
history
const
id
=
godAtob
(
i
as
string
)
const
id
=
godAtob
(
i
as
string
)
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlannedDelivery
,
Circulation
,
])
base_Info
,
{
...
PlanMaterial
,
len
:
_length
},
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
materialTableColumn
,
setMaterialTableColumn
]
=
useState
<
any
>
(
columnSRM
)
const
[
materialTableColumn
,
setMaterialTableColumn
]
=
useState
<
any
>
(
columnSRM
)
...
@@ -71,6 +74,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
...
@@ -71,6 +74,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -104,7 +108,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
...
@@ -104,7 +108,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
>
>
<
BaseInfo
<
BaseInfo
className=
'mt-0'
className=
'mt-0'
...
@@ -138,7 +142,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
...
@@ -138,7 +142,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
</
Tag
>
</
Tag
>
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
>
</
BaseInfo
>
<
BaseInfo
className=
'mt-16'
title=
{
Plan
nedDelivery
.
name
}
id=
{
PlannedDelivery
.
key
}
cols=
{
1
}
>
<
BaseInfo
className=
'mt-16'
title=
{
Plan
Material
.
name
}
id=
{
PlanMaterial
.
key
}
cols=
{
1
}
>
<
Table
<
Table
// defaultExpandAllRows
// defaultExpandAllRows
rowKey=
{
'planProductId'
}
rowKey=
{
'planProductId'
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/update.tsx
View file @
11acc6e3
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
import
React
,
{
useEffect
,
useRef
,
useState
}
from
'react'
import
React
,
{
useEffect
,
useRef
,
useState
}
from
'react'
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage'
import
{
BaseInfo
as
base_Info
,
Remarks
,
PlanningCycle
,
SupplyMembersLabel
,
PlanSummary
,
ExternalRoamRecord
,
ExternalState
,
Circulation
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlannedDelivery
,
DeliveryPlanRemark
}
from
'../../constants'
import
{
BaseInfo
as
base_Info
,
Remarks
,
PlanningCycle
,
SupplyMembersLabel
,
PlanSummary
,
ExternalRoamRecord
,
ExternalState
,
Circulation
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlannedDelivery
,
DeliveryPlanRemark
,
PlanMaterial
}
from
'../../constants'
import
{
Button
,
Form
,
Input
,
InputNumber
,
message
,
Space
,
Spin
,
Steps
,
Table
,
Tag
}
from
'antd'
import
{
Button
,
Form
,
Input
,
InputNumber
,
message
,
Space
,
Spin
,
Steps
,
Table
,
Tag
}
from
'antd'
import
{
CaretDownOutlined
,
CaretRightOutlined
,
SaveOutlined
}
from
'@ant-design/icons'
import
{
CaretDownOutlined
,
CaretRightOutlined
,
SaveOutlined
}
from
'@ant-design/icons'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
...
@@ -34,12 +34,15 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
...
@@ -34,12 +34,15 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
PlannedDelivery
,
Circulation
,
Remarks
,
base_Info
,
])
{
...
PlanMaterial
,
len
:
_length
}
,
Remarks
,
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
materialTableColumn
,
setMaterialTableColumn
]
=
useState
<
any
>
(
columnSRM
)
const
[
materialTableColumn
,
setMaterialTableColumn
]
=
useState
<
any
>
(
columnSRM
)
...
@@ -132,6 +135,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
...
@@ -132,6 +135,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -171,7 +175,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
...
@@ -171,7 +175,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
<
Button
type=
'primary'
icon=
{
<
SaveOutlined
/>
}
onClick=
{
save
}
>
保存
</
Button
>
<
Button
type=
'primary'
icon=
{
<
SaveOutlined
/>
}
onClick=
{
save
}
>
保存
</
Button
>
...
@@ -222,7 +226,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
...
@@ -222,7 +226,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
</
Tag
>
</
Tag
>
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
>
</
BaseInfo
>
<
BaseInfo
className=
'mt-16'
title=
{
Plan
nedDelivery
.
name
}
id=
{
PlannedDelivery
.
key
}
cols=
{
1
}
>
<
BaseInfo
className=
'mt-16'
title=
{
Plan
Material
.
name
}
id=
{
PlanMaterial
.
key
}
cols=
{
1
}
>
<
Table
<
Table
// defaultExpandAllRows
// defaultExpandAllRows
rowKey=
{
'planProductId'
}
rowKey=
{
'planProductId'
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/details.tsx
View file @
11acc6e3
...
@@ -29,11 +29,14 @@ const DeliveryPlanManagementDetails: React.FC = () => {
...
@@ -29,11 +29,14 @@ const DeliveryPlanManagementDetails: React.FC = () => {
const
deliveryPlanType
=
godAtob
(
ty
as
string
)
const
deliveryPlanType
=
godAtob
(
ty
as
string
)
const
id
=
godAtob
(
i
as
string
)
const
id
=
godAtob
(
i
as
string
)
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
deliveryPlanType
===
'1'
?
PlannedDelivery
:
PlanMaterial
,
Circulation
,
])
base_Info
,
deliveryPlanType
===
'1'
?
{
...
PlannedDelivery
,
len
:
_length
}
:
{
...
PlanMaterial
,
len
:
_length
},
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
tableColumn
,
setTableColumn
]
=
useState
<
any
>
([])
const
[
tableColumn
,
setTableColumn
]
=
useState
<
any
>
([])
// 动态 expandIconColumn
// 动态 expandIconColumn
...
@@ -75,6 +78,8 @@ const DeliveryPlanManagementDetails: React.FC = () => {
...
@@ -75,6 +78,8 @@ const DeliveryPlanManagementDetails: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
console
.
log
(
'object :>> '
,
res
.
data
.
totalCount
);
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -108,7 +113,7 @@ const DeliveryPlanManagementDetails: React.FC = () => {
...
@@ -108,7 +113,7 @@ const DeliveryPlanManagementDetails: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
>
>
<
BaseInfo
<
BaseInfo
className=
'mt-0'
title=
{
Circulation
.
name
}
className=
'mt-0'
title=
{
Circulation
.
name
}
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/update.tsx
View file @
11acc6e3
...
@@ -36,12 +36,15 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
...
@@ -36,12 +36,15 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
spinning
,
setSpinning
]
=
useState
<
boolean
>
(
false
)
const
[
iAnchors
,
setIAnchors
]
=
useState
<
AnchorsItem
[]
>
([
const
[
len
,
setLen
]
=
useState
<
number
>
(
0
)
Circulation
,
const
getAnchors
=
(
_length
:
number
|
string
)
=>
{
base_Info
,
return
[
deliveryPlanType
===
'1'
?
PlannedDelivery
:
PlanMaterial
,
Circulation
,
Remarks
,
base_Info
,
])
deliveryPlanType
===
'1'
?
{
...
PlannedDelivery
,
len
:
_length
}
:
{
...
PlanMaterial
,
len
:
_length
},
Remarks
,
]
}
// 动态 TableColumn
// 动态 TableColumn
const
[
tableColumn
,
setTableColumn
]
=
useState
<
any
>
([])
const
[
tableColumn
,
setTableColumn
]
=
useState
<
any
>
([])
...
@@ -49,7 +52,9 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
...
@@ -49,7 +52,9 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
const
[
expandIconColumn
,
setExpandIconColumn
]
=
useState
<
any
>
(
initExpandIconColumn
)
const
[
expandIconColumn
,
setExpandIconColumn
]
=
useState
<
any
>
(
initExpandIconColumn
)
const
expandedRowRender
=
(
record
:
any
)
=>
{
const
expandedRowRender
=
(
record
:
any
)
=>
{
return
<
Table
rowKey=
{
'orderProductId'
}
columns=
{
expandIconColumn
}
dataSource=
{
record
.
orders
}
pagination=
{
false
}
tableLayout=
"fixed"
/>
return
<
div
>
<
Table
rowKey=
{
'orderProductId'
}
columns=
{
expandIconColumn
}
dataSource=
{
record
.
orders
}
pagination=
{
false
}
tableLayout=
"fixed"
/>
</
div
>
}
}
// 详情
// 详情
...
@@ -132,6 +137,7 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
...
@@ -132,6 +137,7 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
pageSize
:
'999'
pageSize
:
'999'
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setLen
(
res
.
data
.
totalCount
)
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
const
assemble
=
res
.
data
.
data
.
map
(
item
=>
{
return
{
return
{
...
item
,
...
item
,
...
@@ -171,7 +177,7 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
...
@@ -171,7 +177,7 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
<
AnchorPage
<
AnchorPage
title=
{
`${details?.digest} | ${details?.planNo}`
}
title=
{
`${details?.digest} | ${details?.planNo}`
}
onBack=
{
()
=>
history
.
goBack
()
}
onBack=
{
()
=>
history
.
goBack
()
}
anchors=
{
iAnchors
}
anchors=
{
getAnchors
(
len
)
}
extra=
{
extra=
{
<
Space
>
<
Space
>
<
Button
type=
'primary'
icon=
{
<
SaveOutlined
/>
}
onClick=
{
save
}
>
保存
</
Button
>
<
Button
type=
'primary'
icon=
{
<
SaveOutlined
/>
}
onClick=
{
save
}
>
保存
</
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