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
cd6d77a3
Commit
cd6d77a3
authored
May 10, 2022
by
ganke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 收货单管理的bug修复
parent
e8c269ba
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
15 deletions
+19
-15
index.ts
config/routes/index.ts
+2
-2
HandleFormSubmit.ts
src/pages/order/assets/handles/HandleFormSubmit.ts
+1
-0
details.tsx
src/pages/order/receivingNote/deliveryNoteManage/details.tsx
+2
-2
edit.tsx
src/pages/order/receivingNote/deliveryNoteManage/edit.tsx
+14
-11
No files found.
config/routes/index.ts
View file @
cd6d77a3
...
...
@@ -10,7 +10,7 @@ import CommodityRoute from './commodityRoute'; // 商品能力路由
// import ChannelRoute from './channelRoute' // 渠道能力路由
import
TranactionRoute
from
'./tranactionRoute'
;
// 交易能力路由
// import LogisticsRoute from './logisticsRoutes' // 物流能力路由
//
import PayandSettleRoute from './payandSettle' //支付与结算
import
PayandSettleRoute
from
'./payandSettle'
//支付与结算
// import AuthConfigRoute from './authConfigRoute'
// import AfterService from './afterServiceRoute' // 售后
// import HandlingRoute from './handlingRoute'; // 加工能力
...
...
@@ -46,7 +46,7 @@ const srmPurchaserHomeRoute = {
// isDev ? [ homeRoute, OrderRoute ] :
// const routes = asyncRoutes;
const
routes
=
isDev
?
[
homeRoute
,
OrderRoute
]
:
asyncRoutes
;
const
routes
=
isDev
?
[
homeRoute
,
OrderRoute
,
PayandSettleRoute
]
:
asyncRoutes
;
const
memberCenterRoute
=
{
path
:
'/memberCenter'
,
...
...
src/pages/order/assets/handles/HandleFormSubmit.ts
View file @
cd6d77a3
...
...
@@ -111,6 +111,7 @@ export class HandleFormSubmit {
sendTime: data?.sendTime ? moment(data?.sendTime) : moment().startOf('day'),
"executorVO.carNumbers": data?.executorVO?.carNumbers,
"receiveVO.phone": data?.receiveVO?.phone,
"receiveVO.consignee":data?.receiveVO?.consignee,
logisticsNo: data?.logisticsNo,
logisticsCompanyInt: {
label: data?.logisticsCompany,
...
...
src/pages/order/receivingNote/deliveryNoteManage/details.tsx
View file @
cd6d77a3
...
...
@@ -100,10 +100,10 @@ const DeliveryNoteManageDetails: React.FC = () => {
</ListInfoItem>
<ListInfoItem className="mt-16" label='收货人'>
{info?.
receiverB
O?.consignee}
{info?.
executorV
O?.consignee}
</ListInfoItem>
<ListInfoItem className="mt-16" label='收货电话'>
{info?.
receiverB
O?.phone}
{info?.
executorV
O?.phone}
</ListInfoItem>
</div>
...
...
src/pages/order/receivingNote/deliveryNoteManage/edit.tsx
View file @
cd6d77a3
...
...
@@ -89,6 +89,7 @@ function DeliveryNoteAddForm() {
function
handleSubmit
()
{
console
.
log
(
tableDataSource
)
Modal
.
confirm
({
title
:
"提示"
,
content
:
"确认送货单资料填写是否正确,提交后不能再撤回!"
,
...
...
@@ -183,16 +184,6 @@ function DeliveryNoteAddForm() {
<
FormItem
rules=
{
[
{
required
:
false
,
message
:
''
,
}
]
}
label=
{
ConsigneeLabel
}
name=
"receiveVO.consignee"
>
<
Input
placeholder=
{
`${PlearInput}${ConsigneeLabel}`
}
/>
</
FormItem
>
<
FormItem
rules=
{
[
required
()
]
}
label=
{
ReceivingAddress
}
name=
"receiveVO"
>
...
...
@@ -209,7 +200,19 @@ function DeliveryNoteAddForm() {
message
:
''
,
}
]
}
label=
{
ConsigneePhoneLabel
}
name=
"receiveVO.phone"
>
label=
{
ConsigneeLabel
}
name=
"executorVO.consignee"
>
<
Input
placeholder=
{
`${PlearInput}${ConsigneeLabel}`
}
/>
</
FormItem
>
<
FormItem
rules=
{
[
{
required
:
false
,
message
:
''
,
}
]
}
label=
{
ConsigneePhoneLabel
}
name=
"executorVO.phone"
>
<
Input
placeholder=
{
`${PlearInput}${ConsigneePhoneLabel}`
}
/>
</
FormItem
>
...
...
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