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
3b8b71bb
Commit
3b8b71bb
authored
Apr 14, 2022
by
rainbowmorel@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一些问题
parent
79e9d1a3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
18 deletions
+31
-18
HandleFormSubmit.ts
src/pages/order/assets/handles/HandleFormSubmit.ts
+4
-3
label.ts
src/pages/order/constants/label.ts
+2
-0
add.tsx
src/pages/order/deliveryNotice/create/add.tsx
+9
-4
add.tsx
src/pages/order/deliveryNotice/manageB2B/add.tsx
+1
-0
index.tsx
...eliveryNoticeAwaitSRM/components/AddEditContent/index.tsx
+4
-9
index.tsx
...liveryNoticeManagement/deliveryNoticeFromCreate/index.tsx
+11
-2
No files found.
src/pages/order/assets/handles/HandleFormSubmit.ts
View file @
3b8b71bb
...
@@ -103,7 +103,7 @@ export class HandleFormSubmit {
...
@@ -103,7 +103,7 @@ export class HandleFormSubmit {
receiveVO
:
{
receiveVO
:
{
...
data
?.
receiverBO
,
...
data
?.
receiverBO
,
receiverName
:
data
?.
receiverBO
?.
consignee
,
receiverName
:
data
?.
receiverBO
?.
consignee
,
fullAddress
:
`
${
data
?.
receiverBO
?.
provinceName
??
''
}
$
{
data
?.
receiverBO
?.
cityName
??
''
}
$
{
data
?.
receiverBO
?.
districtName
??
''
}
$
{
data
?.
receiverBO
?.
streetName
??
''
}
`
fullAddress
:
`
${
data
?.
receiverBO
?.
provinceName
??
''
}
$
{
data
?.
receiverBO
?.
cityName
??
''
}
$
{
data
?.
receiverBO
?.
districtName
??
''
}
$
{
data
?.
receiverBO
?.
streetName
??
''
}
`
},
},
executorVO: {
executorVO: {
...data?.executorVO,
...data?.executorVO,
...
@@ -123,7 +123,7 @@ export class HandleFormSubmit {
...
@@ -123,7 +123,7 @@ export class HandleFormSubmit {
deliveryNo: data?.deliveryNo
deliveryNo: data?.deliveryNo
}
}
console.log(formField);
console.log(formField);
return formField
return formField
}
}
...
@@ -372,7 +372,8 @@ export class DeliveryNoticeOrderAddService extends DeliveryNoteAddService {
...
@@ -372,7 +372,8 @@ export class DeliveryNoticeOrderAddService extends DeliveryNoteAddService {
},
},
"receiverBO.phone": data.receiveVO.phone,
"receiverBO.phone": data.receiveVO.phone,
products: data.products,
products: data.products,
orderType: data.orderType
orderType: data.orderType,
sourceNo: data.sourceNo
}
}
return formField
return formField
})
})
...
...
src/pages/order/constants/label.ts
View file @
3b8b71bb
...
@@ -2,6 +2,8 @@ export const ReceiptAddLabel = '新增收货单';
...
@@ -2,6 +2,8 @@ export const ReceiptAddLabel = '新增收货单';
export
const
ReceiptAbstractLabel
=
'收货单摘要'
;
export
const
ReceiptAbstractLabel
=
'收货单摘要'
;
export
const
DeliveryAbstractLabel
=
'送货单摘要'
;
export
const
DeliveryAbstractLabel
=
'送货单摘要'
;
export
const
DeliveryAbstractNoLabel
=
'送货通知编号'
;
export
const
DeliveryPanleNoLabel
=
'送货计划编号'
export
const
SupplyMembersLabel
=
'供应会员'
;
export
const
SupplyMembersLabel
=
'供应会员'
;
export
const
NoteLabel
=
'备注'
;
export
const
NoteLabel
=
'备注'
;
...
...
src/pages/order/deliveryNotice/create/add.tsx
View file @
3b8b71bb
...
@@ -7,7 +7,7 @@ import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
...
@@ -7,7 +7,7 @@ import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import
React
,
{
useCallback
,
useEffect
,
useState
,
useContext
}
from
'react'
import
React
,
{
useCallback
,
useEffect
,
useState
,
useContext
}
from
'react'
import
{
import
{
BaseInfo
,
BuyerLabel
,
ConsigneeTimeLabel
,
DeliveryAbstractLabel
,
DeliveryDate
,
BaseInfo
,
BuyerLabel
,
ConsigneeTimeLabel
,
DeliveryAbstractLabel
,
DeliveryDate
,
DeliveryGood
,
DeliveryInfo
,
DeliveryNameLabel
,
DeliveryPhoneLabel
,
DeliveryTime
,
DeliveryGood
,
DeliveryInfo
,
DeliveryNameLabel
,
DeliveryP
anleNoLabel
,
DeliveryP
honeLabel
,
DeliveryTime
,
DeliveryTimeLabel
,
DeliveryTypeLabel
,
Distribution
,
LogisticsCarNoLabel
,
DeliveryTimeLabel
,
DeliveryTypeLabel
,
Distribution
,
LogisticsCarNoLabel
,
LogisticsCompanyLabel
,
LogisticsInfo
,
LogisticsNoLabel
,
NoteLabel
,
ReceivingAddress
as
ReceivingAddressLabel
LogisticsCompanyLabel
,
LogisticsInfo
,
LogisticsNoLabel
,
NoteLabel
,
ReceivingAddress
as
ReceivingAddressLabel
}
from
'../../constants'
}
from
'../../constants'
...
@@ -28,7 +28,7 @@ import { DeliveryAddFactory } from '../../assets/factory/DeliveryAddFactory';
...
@@ -28,7 +28,7 @@ import { DeliveryAddFactory } from '../../assets/factory/DeliveryAddFactory';
import
{
useLocation
}
from
'umi'
;
import
{
useLocation
}
from
'umi'
;
import
{
SourceTypeEnum
}
from
'../../constants/SourceTypeEnum'
;
import
{
SourceTypeEnum
}
from
'../../constants/SourceTypeEnum'
;
import
{
ShipperAddress
,
Receiv
ing
Address
}
from
'@/components/AddressDrawer'
import
{
ShipperAddress
,
Receiv
er
Address
}
from
'@/components/AddressDrawer'
const
DeliveryNoticeManageSRMDetails
:
React
.
FC
=
()
=>
{
const
DeliveryNoticeManageSRMDetails
:
React
.
FC
=
()
=>
{
...
@@ -103,6 +103,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
...
@@ -103,6 +103,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</
FormItem
>
</
FormItem
>
<
ContentBox
title=
{
BaseInfo
.
name
}
id=
{
BaseInfo
.
key
}
>
<
ContentBox
title=
{
BaseInfo
.
name
}
id=
{
BaseInfo
.
key
}
>
<
FormItem
label=
{
DeliveryPanleNoLabel
}
name=
"sourceNo"
>
<
Input
disabled
/>
</
FormItem
>
<
FormItem
<
FormItem
rules=
{
[
rules=
{
[
required
()
required
()
...
@@ -190,8 +195,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
...
@@ -190,8 +195,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
required
()
required
()
]
}
]
}
label=
{
ReceivingAddressLabel
}
name=
"receiveVO"
>
label=
{
ReceivingAddressLabel
}
name=
"receiveVO"
>
<
Receiv
ing
Address
/>
<
Receiv
er
Address
/>
</
FormItem
>
</
FormItem
>
...
...
src/pages/order/deliveryNotice/manageB2B/add.tsx
View file @
3b8b71bb
...
@@ -91,6 +91,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
...
@@ -91,6 +91,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</
FormItem
>
</
FormItem
>
<
ContentBox
title=
{
BillsInfo
.
name
}
id=
{
BillsInfo
.
key
}
>
<
ContentBox
title=
{
BillsInfo
.
name
}
id=
{
BillsInfo
.
key
}
>
<
FormItem
<
FormItem
rules=
{
[
rules=
{
[
required
()
required
()
...
...
src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitSRM/components/AddEditContent/index.tsx
View file @
3b8b71bb
...
@@ -9,7 +9,7 @@ import { history } from 'umi'
...
@@ -9,7 +9,7 @@ import { history } from 'umi'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
BaseInfo
from
'@/components/BaseInfo/BaseInfo'
import
{
Button
,
DatePicker
,
Form
,
Input
,
message
,
Steps
,
Table
,
TimePicker
}
from
'antd'
import
{
Button
,
DatePicker
,
Form
,
Input
,
message
,
Steps
,
Table
,
TimePicker
}
from
'antd'
import
{
PlusOutlined
}
from
'@ant-design/icons'
import
{
PlusOutlined
}
from
'@ant-design/icons'
import
{
AddressDrawer
}
from
'@/components/AddressDrawer'
import
{
AddressDrawer
,
ReceiverAddress
}
from
'@/components/AddressDrawer'
import
AuthButton
from
'@/components/AuthButton'
import
AuthButton
from
'@/components/AuthButton'
import
{
RoleSelect
}
from
'@/components/RoleSelect'
import
{
RoleSelect
}
from
'@/components/RoleSelect'
import
StandardTable
from
'@/components/StandardTable'
import
StandardTable
from
'@/components/StandardTable'
...
@@ -283,14 +283,9 @@ const DeliveryNoticeManagementAwaitSRMDetails: React.FC<PropsType> = ({ type, id
...
@@ -283,14 +283,9 @@ const DeliveryNoticeManagementAwaitSRMDetails: React.FC<PropsType> = ({ type, id
rules=
{
[
rules=
{
[
{
required
:
true
,
message
:
`请选择${ReceivingAddress}`
}
{
required
:
true
,
message
:
`请选择${ReceivingAddress}`
}
]
}
]
}
>
>
<
AddressDrawer
<
ReceiverAddress
disabled
/>
disabled
rows=
{
1
}
addressListRequest=
{
(
val
)
=>
{
return
getLogisticsSelectListReceiverAddress
(
val
)
}
}
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
...
...
src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx
View file @
3b8b71bb
...
@@ -2,7 +2,7 @@ import AnchorPage, { AnchorsItem } from "@/components/AnchorPage";
...
@@ -2,7 +2,7 @@ import AnchorPage, { AnchorsItem } from "@/components/AnchorPage";
import
{
Button
,
Form
,
Input
,
message
,
Radio
,
Table
}
from
"antd"
;
import
{
Button
,
Form
,
Input
,
message
,
Radio
,
Table
}
from
"antd"
;
import
{
useCallback
,
useEffect
,
useState
}
from
"react"
;
import
{
useCallback
,
useEffect
,
useState
}
from
"react"
;
import
{
DeliveryNoticeOrderAddService
}
from
"../../assets/handles/HandleFormSubmit"
;
import
{
DeliveryNoticeOrderAddService
}
from
"../../assets/handles/HandleFormSubmit"
;
import
{
BillsInfo
,
BuyerLabel
,
ConsigneeTimeLabel
,
DeliveryAbstractLabel
,
DeliveryDateLabel
,
DeliveryGood
,
DeliveryInfo
,
DeliveryNameLabel
,
DeliveryPhoneLabel
,
DeliveryTimeLabel
,
DeliveryTypeLabel
,
Distribution
,
LogisticsCarNoLabel
,
LogisticsCompanyLabel
,
LogisticsInfo
,
LogisticsNoLabel
,
NoteLabel
,
ReceivingAddress
}
from
"../../constants"
;
import
{
BillsInfo
,
BuyerLabel
,
ConsigneeTimeLabel
,
DeliveryAbstractLabel
,
Delivery
AbstractNoLabel
,
Delivery
DateLabel
,
DeliveryGood
,
DeliveryInfo
,
DeliveryNameLabel
,
DeliveryPhoneLabel
,
DeliveryTimeLabel
,
DeliveryTypeLabel
,
Distribution
,
LogisticsCarNoLabel
,
LogisticsCompanyLabel
,
LogisticsInfo
,
LogisticsNoLabel
,
NoteLabel
,
ReceivingAddress
}
from
"../../constants"
;
import
{
BaseInfo
}
from
'@/components/BaseInfo'
;
import
{
BaseInfo
}
from
'@/components/BaseInfo'
;
import
{
required
,
FormItem
}
from
"@/components/FormItem"
;
import
{
required
,
FormItem
}
from
"@/components/FormItem"
;
import
{
RoleSelect
}
from
"@/components/RoleSelect"
;
import
{
RoleSelect
}
from
"@/components/RoleSelect"
;
...
@@ -74,7 +74,7 @@ function DeliveryNoticeFromCreate() {
...
@@ -74,7 +74,7 @@ function DeliveryNoticeFromCreate() {
}
}
return
(
return
(
<
AnchorPage
title=
"送货单管理
详情
"
<
AnchorPage
title=
"送货单管理
新增
"
anchors=
{
anchors
}
anchors=
{
anchors
}
extra=
{
extra=
{
<
AuthButton
btnCode=
'deliveryNoticeQuery.submit'
>
<
AuthButton
btnCode=
'deliveryNoticeQuery.submit'
>
...
@@ -90,6 +90,15 @@ function DeliveryNoticeFromCreate() {
...
@@ -90,6 +90,15 @@ function DeliveryNoticeFromCreate() {
</
FormItem
>
</
FormItem
>
<
ContentBox
title=
{
BillsInfo
.
name
}
id=
{
BillsInfo
.
key
}
>
<
ContentBox
title=
{
BillsInfo
.
name
}
id=
{
BillsInfo
.
key
}
>
<
FormItem
rules=
{
[
required
()
]
}
label=
{
DeliveryAbstractNoLabel
}
name=
"sourceNo"
>
<
Input
/>
</
FormItem
>
<
FormItem
<
FormItem
rules=
{
[
rules=
{
[
required
()
required
()
...
...
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