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
06e47b4e
Commit
06e47b4e
authored
Mar 29, 2022
by
Gavin Peng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复定义描述错误
parent
8958df8f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
14 deletions
+22
-14
anchors.ts
src/pages/order/constants/anchors.ts
+10
-3
details.tsx
...r/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx
+3
-3
details.tsx
...r/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx
+3
-3
details.tsx
...r/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx
+3
-3
details.tsx
...rder/deliveryPlanManagement/deliveryPlanQuery/details.tsx
+3
-2
No files found.
src/pages/order/constants/anchors.ts
View file @
06e47b4e
...
...
@@ -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
,
Plan
Material
,
Plan
nedDelivery
,
ExternalRoamRecord
]
const
DeliveryPlanAwaitDetails
:
AnchorsItem
[]
=
[
Circulation
,
BaseInfo
,
Plan
Material
,
Plan
nedDelivery
,
Remarks
,
ExternalRoamRecord
,
]
...
...
@@ -92,7 +97,7 @@ const DeliveryPlanAwaitDetails: AnchorsItem[] = [
const
DeliveryPlanCollaborationAnchors
:
AnchorsItem
[]
=
[
Circulation
,
BaseInfo
,
Plan
Material
,
Plan
nedDelivery
,
ExternalRoamRecord
,
]
...
...
@@ -114,4 +119,5 @@ export {
DeliveryPlanAwaitDetails
,
Remarks
,
DeliveryPlanCollaborationAnchors
,
PlannedDelivery
,
}
\ No newline at end of file
src/pages/order/deliveryPlanCollaboration/deliveryPlanAwait/details.tsx
View file @
06e47b4e
...
...
@@ -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
,
Plan
Material
,
ExternalRoamRecord
,
}
from
'../../constants'
import
{
DeliveryPlanCollaborationAnchors
,
Circulation
,
BaseInfo
as
base_Info
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
ConfirmDeliveryPlan
,
PlanNumber
,
SupplyMember
,
PlanSummary
,
PlanningCycle
,
ExternalState
,
Plan
nedDelivery
,
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=
{
Plan
Material
.
name
}
id=
{
PlanMaterial
.
key
}
cols=
{
1
}
>
计划送货物料
<
BaseInfo
className=
'mt-16'
title=
{
Plan
nedDelivery
.
name
}
id=
{
PlannedDelivery
.
key
}
cols=
{
1
}
>
SRM计划送货物料, B2B计划送货商品
</
BaseInfo
>
<
BaseInfo
className=
'mt-16'
title=
{
ExternalRoamRecord
.
name
}
id=
{
ExternalRoamRecord
.
key
}
cols=
{
1
}
>
<
Table
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/details.tsx
View file @
06e47b4e
...
...
@@ -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=
{
Plan
Material
.
name
}
id=
{
PlanMaterial
.
key
}
cols=
{
1
}
>
计划送货物料
<
BaseInfo
className=
'mt-16'
title=
{
Plan
nedDelivery
.
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个汉字。'
/>
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/details.tsx
View file @
06e47b4e
...
...
@@ -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=
{
Plan
Material
.
name
}
id=
{
PlanMaterial
.
key
}
cols=
{
1
}
>
计划送货物料
<
BaseInfo
className=
'mt-16'
title=
{
Plan
nedDelivery
.
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个汉字。'
/>
...
...
src/pages/order/deliveryPlanManagement/deliveryPlanQuery/details.tsx
View file @
06e47b4e
...
...
@@ -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
,
Plan
Material
,
PlanningCycle
,
PlanNumber
,
PlanSummary
,
Purchaser
,
SubmitDeliveryPlan
,
Supplier
,
SupplyMember
,
}
from
'../../constants'
import
{
BaseInfo
as
base_Info
,
Circulation
,
ConfirmDeliveryPlan
,
DeliveryPlanDetails
,
ExternalRoamRecord
,
ExternalState
,
Plan
nedDelivery
,
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'
}
...
...
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