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
shenshaokai
jinfa-platform
Commits
b3038584
Commit
b3038584
authored
Mar 23, 2022
by
rainbowmorel@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
送货单详情页面
parent
60b034f3
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
30 deletions
+123
-30
deliveryNotice.ts
config/routes/orderRoute/deliveryNotice.ts
+5
-2
receivingNote.ts
config/routes/orderRoute/receivingNote.ts
+2
-1
anchors.ts
src/pages/order/constants/anchors.ts
+8
-1
label.ts
src/pages/order/constants/label.ts
+15
-5
details.tsx
src/pages/order/deliveryNotice/manageB2B/details.tsx
+88
-15
add.tsx
src/pages/order/receivingNote/deliveryNoteManage/add.tsx
+5
-6
No files found.
config/routes/orderRoute/deliveryNotice.ts
View file @
b3038584
...
...
@@ -2,7 +2,7 @@
* 订单能力 -- 送货单
* @author: Gavin
*/
const
DeliveryNotice
=
[
const
DeliveryNotice
=
[
{
path
:
'/memberCenter/order/deliveryNotice'
,
name
:
'送货单'
,
...
...
@@ -19,6 +19,7 @@
name
:
'送货单管理详情(SRM)'
,
component
:
'@/pages/order/deliveryNotice/manageSRM/details'
,
hideInMenu
:
true
,
noMargin
:
true
},
...
...
@@ -34,6 +35,7 @@
name
:
'送货单管理详情(B2B)'
,
component
:
'@/pages/order/deliveryNotice/manageB2B/details'
,
hideInMenu
:
true
,
noMargin
:
true
},
...
...
@@ -52,6 +54,6 @@
},
]
}
]
]
export
default
DeliveryNotice
\ No newline at end of file
config/routes/orderRoute/receivingNote.ts
View file @
b3038584
...
...
@@ -34,7 +34,8 @@ const ReceivingNote = [
path
:
'/memberCenter/order/receivingNote/deliveryNoteManage/add'
,
name
:
'新增收货单'
,
component
:
'@/pages/order/receivingNote/deliveryNoteManage/add'
,
noMargin
:
true
noMargin
:
true
,
hideInMenu
:
true
},
{
/** 收货单管理详情*/
...
...
src/pages/order/constants/anchors.ts
View file @
b3038584
...
...
@@ -51,6 +51,11 @@ const PlanMaterial: AnchorsItem = {
name
:
"计划送货物料"
}
const
DeliveryGood
:
AnchorsItem
=
{
key
:
'DeliveryGood'
,
name
:
'送货商品'
}
const
DeliveryNoteQuery
:
AnchorsItem
[]
=
[
BillsInfo
,
Distribution
,
...
...
@@ -77,5 +82,6 @@ export {
Circulation
,
PlanMaterial
,
DeliveryNoteQuery
,
DeliveryPlanDetails
DeliveryPlanDetails
,
DeliveryGood
}
\ No newline at end of file
src/pages/order/constants/label.ts
View file @
b3038584
export
const
ReceiptAddLabel
=
'新增收货单'
;
export
const
ReceiptAbstractLabel
=
'收货单摘要'
;
export
const
DeliveryAbstractLabel
=
'送货单摘要'
;
export
const
SupplyMembersLabel
=
'供应会员'
;
export
const
NoteLabel
=
'备注'
;
export
const
ConsigneeLabel
=
'收货人'
;
export
const
ConsigneeTimeLab
le
=
'收货时间'
;
export
const
ConsigneeTimeLab
el
=
'收货时间'
;
export
const
ConsigneePhoneLabel
=
'收货人电话'
;
export
const
DeliveryOrderNoLabel
=
'送货订单号'
;
export
const
DeliveryNoLabel
=
'送货单编号'
;
export
const
DeliveryDateLabel
=
'发货日期'
;
export
const
DeliveryTimeLabel
=
'发货时间'
;
export
const
DeliveryAddrLabel
=
'送货自提地址'
;
export
const
DeliveryAddrLabel
=
'送货地址'
;
export
const
DeliverySlefAddrLabel
=
'送货(自提)地址'
;
export
const
DeliveryNameLabel
=
'送货人'
;
export
const
DeliveryPhoneLabel
=
'送货人电话'
;
export
const
LogisticsCompanyLab
le
=
'物流公司'
;
export
const
LogisticsCarNoLab
le
=
'车牌号码'
;
export
const
LogisticsNoLab
le
=
'物流单号'
;
export
const
LogisticsCompanyLab
el
=
'物流公司'
;
export
const
LogisticsCarNoLab
el
=
'车牌号码'
;
export
const
LogisticsNoLab
el
=
'物流单号'
;
export
const
BuyerLabel
=
'采购会员'
;
export
const
OutStatusLabel
=
'外部状态'
;
export
const
DeliveryTypeLabel
=
'配送方式'
;
...
...
src/pages/order/deliveryNotice/manageB2B/details.tsx
View file @
b3038584
...
...
@@ -3,23 +3,96 @@
* @author: Gavin
* @description: 与B2B内容大致相同,文件分开方便后续对接以及日后变动修改二开
*/
import
React
,
{
useState
}
from
'react
'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layou
t'
import
{
history
}
from
'umi
'
import
ReutrnEle
from
'@/components/ReturnEle
'
import
AnchorPage
,
{
AnchorsItem
}
from
'@/components/AnchorPage
'
import
React
,
{
useState
}
from
'reac
t'
import
{
BillsInfo
,
ConsigneeLabel
,
ConsigneePhoneLabel
,
ConsigneeTimeLabel
,
DeliveryAbstractLabel
,
DeliveryAddrLabel
,
DeliveryDateLabel
,
DeliveryGood
,
DeliveryInfo
,
DeliveryNameLabel
,
DeliveryNoLabel
,
DeliveryPhoneLabel
,
DeliverySlefAddrLabel
,
DeliveryTimeLabel
,
DeliveryTypeLabel
,
Distribution
,
LogisticsCarNoLabel
,
LogisticsCompanyLabel
,
LogisticsInfo
,
LogisticsNoLabel
,
NoteLabel
,
OutStatusLabel
}
from
'../../constants
'
import
{
BaseInfo
as
ContentBox
}
from
'@/components/BaseInfo
'
const
DeliveryNoticeManageSRMDetails
:
React
.
FC
=
()
=>
{
const
[
details
,
setDetails
]
=
useState
<
any
>
({})
const
ContentBoxItem
=
ContentBox
.
BaseInfoItem
;
const
DeliveryNoticeManageSRMDetails
:
React
.
FC
=
()
=>
{
const
[
anchors
,
setAnchors
]
=
useState
<
AnchorsItem
[]
>
([
BillsInfo
,
Distribution
,
DeliveryInfo
,
LogisticsInfo
,
DeliveryGood
,
])
return
(
<
PageHeaderWrapper
title=
{
details
?.
name
}
onBack=
{
()
=>
history
.
goBack
()
}
backIcon=
{
<
ReutrnEle
/>
}
<
AnchorPage
title=
"送货单管理详情(B2B)"
anchors=
{
anchors
}
>
<
div
>
送货单 - 送货单管理详情SRM
</
div
>
</
PageHeaderWrapper
>
<
ContentBox
title=
{
BillsInfo
.
name
}
id=
{
BillsInfo
.
key
}
>
<
ContentBoxItem
label=
{
DeliveryNoLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
DeliveryAbstractLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
NoteLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
OutStatusLabel
}
>
</
ContentBoxItem
>
</
ContentBox
>
<
ContentBox
title=
{
Distribution
.
name
}
id=
{
Distribution
.
key
}
>
<
ContentBoxItem
label=
{
DeliveryDateLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
DeliveryNameLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
DeliveryTimeLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
DeliveryPhoneLabel
}
>
</
ContentBoxItem
>
</
ContentBox
>
<
ContentBox
title=
{
DeliveryInfo
.
name
}
id=
{
DeliveryInfo
.
key
}
>
<
ContentBoxItem
label=
{
ConsigneeTimeLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
DeliveryAddrLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
DeliverySlefAddrLabel
}
>
</
ContentBoxItem
>
</
ContentBox
>
<
ContentBox
title=
{
LogisticsInfo
.
name
}
id=
{
LogisticsInfo
.
key
}
>
<
ContentBoxItem
label=
{
DeliveryTypeLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
LogisticsCarNoLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
LogisticsCompanyLabel
}
>
</
ContentBoxItem
>
<
ContentBoxItem
label=
{
LogisticsNoLabel
}
>
</
ContentBoxItem
>
</
ContentBox
>
</
AnchorPage
>
)
}
}
export
default
DeliveryNoticeManageSRMDetails
\ No newline at end of file
export
default
DeliveryNoticeManageSRMDetails
\ No newline at end of file
src/pages/order/receivingNote/deliveryNoteManage/add.tsx
View file @
b3038584
...
...
@@ -4,8 +4,7 @@ import { useState } from "react"
import
{
BillsInfo
,
DeliveryInfo
,
LogisticsInfo
,
Harvest
,
HarvestMaterial
,
ReceiptAddLabel
,
ReceiptAbstractLabel
,
SupplyMembersLabel
,
NoteLabel
,
DeliveryTimeLabel
,
ConsigneeLabel
,
DeliveryAddrLabel
,
DeliveryOrderNoLabel
,
ConsigneePhoneLabel
,
ConsigneeTimeLable
,
LogisticsCompanyLable
,
LogisticsCarNoLable
,
LogisticsNoLable
ConsigneeLabel
,
DeliveryAddrLabel
,
DeliveryOrderNoLabel
,
ConsigneePhoneLabel
,
ConsigneeTimeLabel
,
LogisticsCompanyLabel
,
LogisticsCarNoLabel
,
LogisticsNoLabel
}
from
'../../constants'
import
{
DatePicker
,
Form
,
Input
,
Table
}
from
'antd'
import
{
FormItem
}
from
'@/components/FormItem'
...
...
@@ -47,7 +46,7 @@ function DeliveryNoteAddForm() {
</
BaseInfo
>
<
BaseInfo
title=
{
Harvest
.
name
}
id=
{
Harvest
.
key
}
>
<
BaseInfo
.
BaseInfoItem
label=
{
ConsigneeTimeLab
le
}
>
<
BaseInfo
.
BaseInfoItem
label=
{
ConsigneeTimeLab
el
}
>
<
FormItem
>
<
DatePicker
className=
"w-full"
/>
</
FormItem
>
...
...
@@ -84,10 +83,10 @@ function DeliveryNoteAddForm() {
</
BaseInfo
>
<
BaseInfo
title=
{
LogisticsInfo
.
name
}
id=
{
LogisticsInfo
.
key
}
>
<
BaseInfo
.
BaseInfoItem
label=
{
LogisticsCompanyLab
le
}
>
<
BaseInfo
.
BaseInfoItem
label=
{
LogisticsCompanyLab
el
}
>
HF200019343344
</
BaseInfo
.
BaseInfoItem
>
<
BaseInfo
.
BaseInfoItem
label=
{
LogisticsCarNoLab
le
}
>
<
BaseInfo
.
BaseInfoItem
label=
{
LogisticsCarNoLab
el
}
>
<
div
className=
"#LogisticsAddr"
>
<
div
className=
"#LogisticsAddrDisc leading-10"
>
广东省广州市海珠区新港东路1068号中洲中心
...
...
@@ -97,7 +96,7 @@ function DeliveryNoteAddForm() {
</
div
>
</
div
>
</
BaseInfo
.
BaseInfoItem
>
<
BaseInfo
.
BaseInfoItem
label=
{
LogisticsNoLab
le
}
>
<
BaseInfo
.
BaseInfoItem
label=
{
LogisticsNoLab
el
}
>
2012 / 09 / 10
</
BaseInfo
.
BaseInfoItem
>
</
BaseInfo
>
...
...
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