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
b7529970
Commit
b7529970
authored
Sep 25, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:调整订单详情
parent
23b83bc7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app.tsx
src/app.tsx
+0
-1
index.tsx
...Order/orderPreview/components/orderProductTable/index.tsx
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/orderPreview/index.tsx
+4
-3
No files found.
src/app.tsx
View file @
b7529970
...
@@ -172,7 +172,6 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
...
@@ -172,7 +172,6 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
history
.
replace
(
'/memberCenter/home'
)
history
.
replace
(
'/memberCenter/home'
)
return
;
return
;
}
}
console
.
log
(
query
)
// 固定配置, 出现此参数说明需携带参数校验权限路由
// 固定配置, 出现此参数说明需携带参数校验权限路由
if
(
query
.
page_type
&&
routeAuthUrls
.
find
(
authPath
=>
{
if
(
query
.
page_type
&&
routeAuthUrls
.
find
(
authPath
=>
{
const
parseUrl
=
queryString
.
parseUrl
(
authPath
)
const
parseUrl
=
queryString
.
parseUrl
(
authPath
)
...
...
src/pages/transaction/purchaseOrder/orderPreview/components/orderProductTable/index.tsx
View file @
b7529970
...
@@ -246,7 +246,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
...
@@ -246,7 +246,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
})
})
})
})
}
}
},
[
orderProductRequests
])
},
[])
const
handleSave
=
row
=>
{
const
handleSave
=
row
=>
{
const
newData
=
[...
orderProductRequests
];
const
newData
=
[...
orderProductRequests
];
...
...
src/pages/transaction/purchaseOrder/orderPreview/index.tsx
View file @
b7529970
...
@@ -173,6 +173,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
...
@@ -173,6 +173,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
}
}
const
editableProductTable
=
pageStatus
!==
PageStatus
.
PREVIEW
const
editableProductTable
=
pageStatus
!==
PageStatus
.
PREVIEW
console
.
log
(
1
)
return
formData
?
(
return
formData
?
(
<
div
>
<
div
>
<
OrderDetailContext
.
Provider
value=
{
formContext
}
>
<
OrderDetailContext
.
Provider
value=
{
formContext
}
>
...
@@ -190,16 +191,16 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
...
@@ -190,16 +191,16 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
></
AuditProcess
>
}
></
AuditProcess
>
}
{
/* 商品列表 */
}
{
/* 商品列表 */
}
{
/* <OrderProductTable editable={editableProductTable}/> */
}
<
OrderProductTable
editable=
{
editableProductTable
}
/>
{
/* 支付信息 todo */
}
{
/* 支付信息 todo */
}
<
OrderPayTabs
/>
<
OrderPayTabs
/>
{
/* 杂项 */
}
{
/* 杂项 */
}
{
/* <OrderMergeInfo/> */
}
<
OrderMergeInfo
/>
{
/* 订单流转记录 */
}
{
/* 订单流转记录 */
}
{
/* <OrderTransformRecord/> */
}
<
OrderTransformRecord
/>
</
div
>
</
div
>
</
OrderDetailWrapper
>
</
OrderDetailWrapper
>
...
...
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