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
50537a3c
Commit
50537a3c
authored
Dec 07, 2022
by
shenshaokai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jinfa-20221102' into 'jinfa-20221102'
fix: 变更合同采购订单-订单物料-切换数据问题 See merge request project/jinfa-platform!450
parents
115607ba
a41f4005
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
index.tsx
src/pages/transaction/components/orderProductTable/index.tsx
+5
-2
No files found.
src/pages/transaction/components/orderProductTable/index.tsx
View file @
50537a3c
...
...
@@ -187,6 +187,9 @@ const OrderProductTable: React.FC<OrderProductTableProps> = ({ editable }) => {
const
requisitionRef
=
useRef
<
RequisitionModalTableRef
|
null
>
(
null
)
// 关联请购单
const
{
ctl
,
data
,
versionContext
}
=
useContext
(
OrderDetailContext
)
const
{
product
=
[],
orderMode
,
orderKind
}
=
data
||
{}
const
[
productData
,
setProductData
]
=
useState
(
product
?.
products
||
[]);
const
creditsCommodity
=
(
orderMode
===
10
||
orderMode
===
25
)
// @todo 积分或渠道积分下单模式
// 合同或请购下单模式
const
contractOrder
=
(
orderKind
===
OrderKindType
.
SRM_ORDER
||
orderKind
===
OrderKindType
.
REQUISITION_ORDER
)
...
...
@@ -468,7 +471,7 @@ const OrderProductTable: React.FC<OrderProductTableProps> = ({ editable }) => {
const
{
totalAmountChangeStatus
,
totalAmount
}
=
formatContext
(
versionContext
,
value
)
const
_product
=
formatContext
(
versionContext
,
value
)?.
product
setProductData
(
_product
)
setDataBo
({
product
:
_product
,
totalAmountChangeStatus
,
...
...
@@ -509,7 +512,7 @@ const OrderProductTable: React.FC<OrderProductTableProps> = ({ editable }) => {
>
<
Table
columns=
{
contractOrder
?
materialInfo
:
productInfoColumns
}
dataSource=
{
product
.
products
}
dataSource=
{
product
Data
}
components=
{
productComponents
}
rowKey=
'orderProductId'
pagination=
{
false
}
...
...
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