Skip to content

J
jinfa-platform
Commit 11acc6e3 authored by Gavin Peng's avatar Gavin Peng
Browse files
Options

fix: 修复送货计划管理、协同细节问题

parent f8fbd642
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 111 deletions
src/components/AnchorPage/index.tsx
View file @ 11acc6e3
......@@ -22,6 +22,10 @@ export interface AnchorsItem {
* 名称
*/
name: React.ReactNode | string,
/**
* 个性化定制 item Title 数量
*/
len?: number | string,
}
interface IProps {
......@@ -137,7 +141,11 @@ const AnchorPage = (props: IProps) => {
className={current && index === 0 ? 'ant-anchor-link-active' : null}
key={item.key}
href={`#${item.key}`}
title={item.name}
title={
item.len
? `${item.name}(${item.len})`
: item.name
}
/>
))}
</div>
......
src/global/styles/global.less
View file @ 11acc6e3
......@@ -59,7 +59,7 @@ a {
::-webkit-scrollbar-thumb {
width: 8px;
min-height: 15px;
background: rgba(0,0,0,.2);
background: rgba(0, 0, 0, .2);
border-radius: 5px;
}
......@@ -382,13 +382,13 @@ a {
}
}
.ant-table-thead > tr > th {
.ant-table-thead>tr>th {
word-break: break-all;
}
.useMegaStart {
.mega-layout-item-content {
> div {
>div {
justify-content: flex-start !important;
}
}
......@@ -403,6 +403,7 @@ a {
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;
......@@ -420,19 +421,67 @@ a {
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: '~';
}
}
}
.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 = {
const PlanGood: AnchorsItem = {
key: 'PlanGood',
name: "计划送货商品"
name: "计划送货商品",
len: 0
}
const PlannedDelivery: AnchorsItem = {
key: 'PlannedDelivery',
name: "计划送货商品"
name: "计划送货商品",
len: 0
}
const DeliveryGood: AnchorsItem = {
......
src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx
View file @ 11acc6e3
......@@ -10,7 +10,7 @@ import _ from 'lodash'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { Button, Space, Spin, Steps, Table, Tag } from 'antd'
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 { columnB2B, columnSRM, ExternalRoamRecordTableColumn, initExpandIconColumn } from '../../constants/page-table-column'
import CustomizedModal, { SubmitFeedback } from '../../components/customizedModal'
......@@ -28,11 +28,14 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
const deliveryPlanType = godAtob(ty as string)
const id = godAtob(i as string)
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
PlannedDelivery,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
deliveryPlanType === '1' ? { ...PlannedDelivery, len: _length } : { ...PlanMaterial, len: _length },
]
}
const [spinning, setSpinning] = useState<boolean>(false)
const [details, setDetails] = useState<any>({})
......@@ -75,6 +78,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -124,7 +128,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
<AnchorPage
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
{/* 条件渲染 */}
......@@ -165,7 +169,7 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
</Tag>
</BaseInfo.BaseInfoItem>
</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显示计划送货商品 */}
<Table
// defaultExpandAllRows
......
src/pages/order/deliveryPlanCollaboration/deliveryPlanQuery/details.tsx
View file @ 11acc6e3
......@@ -33,11 +33,14 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
const ref = useRef<any>()
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
deliveryPlanType === '1' ? PlannedDelivery : PlanMaterial,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
deliveryPlanType === '1' ? { ...PlannedDelivery, len: _length } : { ...PlanMaterial, len: _length },
]
}
const [spinning, setSpinning] = useState<boolean>(false)
const [details, setDetails] = useState<any>({})
......@@ -63,7 +66,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
const expandedRowRender = (record: any) => {
return <div>
<Table
<Table
rowKey={'planOrderId'}
columns={expandIconColumn}
dataSource={record.orders}
......@@ -99,6 +102,7 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -204,9 +208,9 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
return (
<Spin spinning={spinning}>
<AnchorPage
title={ `${details?.digest} | ${details?.planNo}`}
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
{/* 条件渲染 */}
......@@ -221,18 +225,18 @@ const DeliveryPlanCollaborationDetails: React.FC = () => {
}
>
<BaseInfo
className='mt-0'
title={Circulation.name}
id={Circulation.key}
cols={1}
subtitle={
<CirculationRecords
fetchApi={getOrderDeliveryPlanDeliveryHistory}
params={{ id: id as string }}
columns={ExternalRoamRecordTableColumn}
/>
}
>
className='mt-0'
title={Circulation.name}
id={Circulation.key}
cols={1}
subtitle={
<CirculationRecords
fetchApi={getOrderDeliveryPlanDeliveryHistory}
params={{ id: id as string }}
columns={ExternalRoamRecordTableColumn}
/>
}
>
<Steps progressDot current={details?.status === 4 ? 1 : 0}>
<Steps.Step title={SubmitDeliveryPlan} description={Purchaser} />
<Steps.Step title={ConfirmDeliveryPlan} description={Supplier} />
......
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/create.tsx
View file @ 11acc6e3
......@@ -35,12 +35,14 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
const [spinning, setSpinning] = useState<boolean>(false)
// 锚点标题
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
// Circulation,
base_Info,
PlannedDelivery,
Remarks,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
base_Info,
{ ...PlannedDelivery, len: _length },
Remarks,
]
}
// 动态 TableColumn
const [goodsTableColumn, setGoodsTableColumn] = useState<any>(columnB2B)
......@@ -162,8 +164,6 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
// 获取计划送货
const getPlannedDelivery = () => {
getOrderDeliveryPlanOrderProductPage({
// startDate: selectedDate[0],
// endDate: selectedDate[1],
memberId: selectedMember.memberId,
roleId: selectedMember.roleId,
roleType: ROLE_TYPE,
......@@ -172,6 +172,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map((item => {
return {
...item,
......@@ -202,7 +203,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
<AnchorPage
title={CreateDeliveryPlanTitleB2B}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
{/* <Button>保存并提交</Button> */}
......@@ -254,7 +255,7 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
{ 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>
</BaseInfo>
<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 = () => {
const goodsTableDataRef = useRef(null)
// 锚点标题
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
PlannedDelivery,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
{ ...PlannedDelivery, len: _length },
]
}
// 动态 TableColumn
const [goodsTableColumn, setGoodsTableColumn] = useState<any>(columnB2B)
......@@ -49,8 +52,6 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
const [details, setDetails] = useState<any>({})
// 计划送货商品 列表
const [goodsTableData, setGoodsTableData] = useState<any>(null)
// 外部流转单据记录
const [externalRoamRecordData, setExternalRoamRecordData] = useState<any>(null)
// 计划周期 渲染日期
const handleDateAssembleColumn = (startDate: string, endDate: string) => {
......@@ -62,7 +63,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
key: item,
width: 80,
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])
setExpandIconColumn([...expandIconColumn, ...datesExpandIconColumn])
......@@ -76,6 +77,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -110,7 +112,7 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
<AnchorPage
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
>
<BaseInfo
className='mt-0'
......@@ -152,11 +154,11 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
columns={goodsTableColumn}
expandable={{
expandIcon: ({ expanded, onExpand, record }) =>
expanded ? (
<CaretDownOutlined onClick={e => onExpand(record, e)} />
) : (
<CaretRightOutlined onClick={e => onExpand(record, e)} />
),
expanded ? (
<CaretDownOutlined onClick={e => onExpand(record, e)} />
) : (
<CaretRightOutlined onClick={e => onExpand(record, e)} />
),
expandedRowRender
}}
dataSource={goodsTableData}
......
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/update.tsx
View file @ 11acc6e3
......@@ -35,12 +35,15 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
const [spinning, setSpinning] = useState<boolean>(false)
// 锚点标题
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
PlannedDelivery,
Remarks,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
{ ...PlannedDelivery, len: _length },
Remarks,
]
}
// 动态 TableColumn
const [goodsTableColumn, setGoodsTableColumn] = useState<any>(columnB2B)
......@@ -130,6 +133,7 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -169,7 +173,7 @@ const DeliveryPlanAwaitB2BUpdate: React.FC = () => {
<AnchorPage
title={details?.planNo}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
{/* <Button>保存并提交</Button> */}
......
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/create.tsx
View file @ 11acc6e3
......@@ -34,12 +34,14 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
const [spinning, setSpinning] = useState<boolean>(false)
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
// Circulation,
base_Info,
PlanMaterial,
Remarks,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
base_Info,
{ ...PlanMaterial, len: _length },
Remarks,
]
}
// 动态 TableColumn
const [materialTableColumn, setMaterialTableColumn] = useState<any>(columnSRM)
......@@ -163,8 +165,6 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
// 获取计划送货 物料
const getPlannedDelivery = () => {
getOrderDeliveryPlanOrderProductPage({
// startDate: selectedDate[0],
// endDate: selectedDate[1],
memberId: selectedMember.memberId,
roleId: selectedMember.roleId,
roleType: ROLE_TYPE,
......@@ -173,6 +173,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map((item => {
return {
...item,
......@@ -203,7 +204,7 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
<AnchorPage
title={CreateDeliveryPlanTitleSRM}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
{/* <Button>保存并新增</Button> */}
......@@ -215,12 +216,6 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
labelAlign='left'
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}>
<Form.Item
{...formItemLayout}
......
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx
View file @ 11acc6e3
......@@ -6,7 +6,7 @@
import React, { useEffect, useState } from 'react'
import { history } from 'umi'
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 BaseInfo from '@/components/BaseInfo/BaseInfo'
import { columnSRM, ExternalRoamRecordTableColumn, initExpandIconColumn } from '../../constants/page-table-column'
......@@ -24,11 +24,14 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
const { location: { query: { i } } } = history
const id = godAtob(i as string)
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
PlannedDelivery,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
{ ...PlanMaterial, len: _length },
]
}
// 动态 TableColumn
const [materialTableColumn, setMaterialTableColumn] = useState<any>(columnSRM)
......@@ -71,6 +74,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -104,7 +108,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
<AnchorPage
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
>
<BaseInfo
className='mt-0'
......@@ -138,7 +142,7 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
<BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
<Table
// defaultExpandAllRows
rowKey={'planProductId'}
......
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/update.tsx
View file @ 11acc6e3
......@@ -6,7 +6,7 @@
import React, { useEffect, useRef, useState } from 'react'
import { history } from 'umi'
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 { CaretDownOutlined, CaretRightOutlined, SaveOutlined } from '@ant-design/icons'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
......@@ -34,12 +34,15 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
const [spinning, setSpinning] = useState<boolean>(false)
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
PlannedDelivery,
Remarks,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
{ ...PlanMaterial, len: _length } ,
Remarks,
]
}
// 动态 TableColumn
const [materialTableColumn, setMaterialTableColumn] = useState<any>(columnSRM)
......@@ -132,6 +135,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -171,7 +175,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
<AnchorPage
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
<Button type='primary' icon={<SaveOutlined />} onClick={save}>保存</Button>
......@@ -222,7 +226,7 @@ const DeliveryPlanAwaitSRMUpdate: React.FC = () => {
</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
<BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
<Table
// defaultExpandAllRows
rowKey={'planProductId'}
......
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/details.tsx
View file @ 11acc6e3
......@@ -29,11 +29,14 @@ const DeliveryPlanManagementDetails: React.FC = () => {
const deliveryPlanType = godAtob(ty as string)
const id = godAtob(i as string)
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
deliveryPlanType === '1' ? PlannedDelivery : PlanMaterial,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
deliveryPlanType === '1' ? { ...PlannedDelivery, len: _length } : { ...PlanMaterial, len: _length },
]
}
// 动态 TableColumn
const [tableColumn, setTableColumn] = useState<any>([])
// 动态 expandIconColumn
......@@ -75,6 +78,8 @@ const DeliveryPlanManagementDetails: React.FC = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
console.log('object :>> ', res.data.totalCount);
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -108,7 +113,7 @@ const DeliveryPlanManagementDetails: React.FC = () => {
<AnchorPage
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
>
<BaseInfo
className='mt-0' title={Circulation.name}
......
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/update.tsx
View file @ 11acc6e3
......@@ -36,12 +36,15 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
const [spinning, setSpinning] = useState<boolean>(false)
const [iAnchors, setIAnchors] = useState<AnchorsItem[]>([
Circulation,
base_Info,
deliveryPlanType === '1' ? PlannedDelivery : PlanMaterial,
Remarks,
])
const [len, setLen] = useState<number>(0)
const getAnchors = (_length: number | string) => {
return [
Circulation,
base_Info,
deliveryPlanType === '1' ? { ...PlannedDelivery, len: _length } : { ...PlanMaterial, len: _length },
Remarks,
]
}
// 动态 TableColumn
const [tableColumn, setTableColumn] = useState<any>([])
......@@ -49,7 +52,9 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
const [expandIconColumn, setExpandIconColumn] = useState<any>(initExpandIconColumn)
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 = () => {
pageSize: '999'
}).then((res) => {
if (res.code === 1000) {
setLen(res.data.totalCount)
const assemble = res.data.data.map(item => {
return {
...item,
......@@ -171,7 +177,7 @@ const DeliveryPlanManagementUpdate: React.FC = () => {
<AnchorPage
title={`${details?.digest} | ${details?.planNo}`}
onBack={() => history.goBack()}
anchors={iAnchors}
anchors={getAnchors(len)}
extra={
<Space>
<Button type='primary' icon={<SaveOutlined />} onClick={save}>保存</Button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment