Commit e3897c59 authored by Gavin Peng's avatar Gavin Peng

fix: 修复定义描述错误

parent 6515b7eb
......@@ -51,6 +51,11 @@ const PlanMaterial: AnchorsItem = {
name: "计划送货物料"
}
const PlannedDelivery: AnchorsItem = {
key: 'PlannedDelivery',
name: "计划送货"
}
const DeliveryGood: AnchorsItem = {
key: 'DeliveryGood',
name: '送货商品'
......@@ -77,14 +82,14 @@ const DeliveryNoteQuery: AnchorsItem[] = [
const DeliveryPlanDetails: AnchorsItem[] = [
Circulation,
BaseInfo,
PlanMaterial,
PlannedDelivery,
ExternalRoamRecord
]
const DeliveryPlanAwaitDetails: AnchorsItem[] = [
Circulation,
BaseInfo,
PlanMaterial,
PlannedDelivery,
Remarks,
ExternalRoamRecord,
]
......@@ -92,7 +97,7 @@ const DeliveryPlanAwaitDetails: AnchorsItem[] = [
const DeliveryPlanCollaborationAnchors: AnchorsItem[] = [
Circulation,
BaseInfo,
PlanMaterial,
PlannedDelivery,
ExternalRoamRecord,
]
......@@ -114,4 +119,5 @@ export {
DeliveryPlanAwaitDetails,
Remarks,
DeliveryPlanCollaborationAnchors,
PlannedDelivery,
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { Button, Space, Steps, Table, Tag } from 'antd'
import { CheckCircleOutlined } from '@ant-design/icons'
import { DeliveryPlanCollaborationAnchors, Circulation, BaseInfo as base_Info, Purchaser, SubmitDeliveryPlan, Supplier, ConfirmDeliveryPlan, PlanNumber, SupplyMember, PlanSummary, PlanningCycle, ExternalState, PlanMaterial, ExternalRoamRecord, } from '../../constants'
import { DeliveryPlanCollaborationAnchors, Circulation, BaseInfo as base_Info, Purchaser, SubmitDeliveryPlan, Supplier, ConfirmDeliveryPlan, PlanNumber, SupplyMember, PlanSummary, PlanningCycle, ExternalState, PlannedDelivery, ExternalRoamRecord, } from '../../constants'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
import CustomizedModal, { SubmitFeedback } from '../../components/customizedModal'
......@@ -57,8 +57,8 @@ const DeliveryPlanCollaborationAwaitDetails: React.FC = () => {
<Tag color='green'>已提交</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
计划送货物料
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
SRM计划送货物料, B2B计划送货商品
</BaseInfo>
<BaseInfo className='mt-16' title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
......
......@@ -6,7 +6,7 @@
import React, { useState } from 'react'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { DeliveryPlanAwaitDetails, Circulation, ConfirmDeliveryPlan, Purchaser, SubmitDeliveryPlan, BaseInfo as base_Info, Supplier, PlanningCycle, SupplyMembersLabel, PlanSummary, ExternalState, PlanMaterial, Remarks, ExternalRoamRecord } from '../../constants'
import { DeliveryPlanAwaitDetails, Circulation, ConfirmDeliveryPlan, Purchaser, SubmitDeliveryPlan, BaseInfo as base_Info, Supplier, PlanningCycle, SupplyMembersLabel, PlanSummary, ExternalState, Remarks, ExternalRoamRecord, PlannedDelivery } from '../../constants'
import { Button, DatePicker, Form, Input, Space, Steps, Table } from 'antd'
import { SaveOutlined } from '@ant-design/icons'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
......@@ -70,8 +70,8 @@ const DeliveryPlanAwaitB2BDetails: React.FC = () => {
待提交
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
计划送货物料
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
SRM计划送货物料, B2B计划送货商品
</BaseInfo>
<BaseInfo className='mt-16' title={Remarks.name} id={Remarks.key} cols={1}>
<Input.TextArea rows={6} maxLength={300} placeholder='最长600个字符,300个汉字。' />
......
......@@ -6,7 +6,7 @@
import React, { useState } from 'react'
import { history } from 'umi'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { DeliveryPlanAwaitDetails, BaseInfo as base_Info, PlanMaterial, Remarks, PlanningCycle, SupplyMembersLabel, PlanSummary, ExternalRoamRecord, ExternalState, Circulation, Purchaser, SubmitDeliveryPlan, Supplier, ConfirmDeliveryPlan } from '../../constants'
import { DeliveryPlanAwaitDetails, BaseInfo as base_Info, Remarks, PlanningCycle, SupplyMembersLabel, PlanSummary, ExternalRoamRecord, ExternalState, Circulation, Purchaser, SubmitDeliveryPlan, Supplier, ConfirmDeliveryPlan, PlannedDelivery } from '../../constants'
import { Button, DatePicker, Form, Input, Space, Steps, Table } from 'antd'
import { SaveOutlined } from '@ant-design/icons'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
......@@ -70,8 +70,8 @@ const DeliveryPlanAwaitSRMDetails: React.FC = () => {
待提交
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
计划送货物料
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
SRM计划送货物料, B2B计划送货商品
</BaseInfo>
<BaseInfo className='mt-16' title={Remarks.name} id={Remarks.key} cols={1}>
<Input.TextArea rows={6} maxLength={300} placeholder='最长600个字符,300个汉字。' />
......
......@@ -8,7 +8,7 @@ import { Steps, Table, Tag } from 'antd'
import AnchorPage from '@/components/AnchorPage'
import { AnchorsItem } from "@/components/AnchorPage"
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { BaseInfo as base_Info, Circulation, ConfirmDeliveryPlan, DeliveryPlanDetails, ExternalRoamRecord, ExternalState, PlanMaterial, PlanningCycle, PlanNumber, PlanSummary, Purchaser, SubmitDeliveryPlan, Supplier, SupplyMember, } from '../../constants'
import { BaseInfo as base_Info, Circulation, ConfirmDeliveryPlan, DeliveryPlanDetails, ExternalRoamRecord, ExternalState, PlannedDelivery, PlanningCycle, PlanNumber, PlanSummary, Purchaser, SubmitDeliveryPlan, Supplier, SupplyMember, } from '../../constants'
import { ExternalRoamRecordTableColumn, PlannedDeliveryMaterialExpandableTableColumn, PlannedDeliveryMaterialTableColumn } from '../../constants/page-table-column'
......@@ -150,7 +150,8 @@ const DeliveryPlanManagementDetails: React.FC = () => {
<Tag color='green'>已提交</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
<BaseInfo className='mt-16' title={PlannedDelivery.name} id={PlannedDelivery.key} cols={1}>
{/* B2B 显示计划送货物料,SRM显示计划送货商品 */}
<Table
// defaultExpandAllRows
rowKey={'id'}
......
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