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
黄庭坚
jinfa-platform
Commits
b6f3fcb8
Commit
b6f3fcb8
authored
May 12, 2022
by
何洋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 采购订单编辑bug
parent
32332819
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
config.ts
config/config.ts
+1
-1
index.tsx
...pages/transaction/purchaseOrder/orderCollectSrm/index.tsx
+1
-1
utils.ts
src/pages/transaction/purchaseOrder/orderCollectSrm/utils.ts
+1
-1
No files found.
config/config.ts
View file @
b6f3fcb8
...
...
@@ -43,7 +43,7 @@ const config: any = {
// layout: {},
esbuild
:
{},
// 打开msfu会导致样式异常, 无法获得正常的样式变量
mfsu
:
{},
//
mfsu: {},
antd
:
{},
locale
:
{
default
:
'zh-CN'
,
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx
View file @
b6f3fcb8
...
...
@@ -356,7 +356,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
mergeArr
=
mergeArr
.
map
((
item
)
=>
({
...
item
,
// 兼容之前订单物料数据
logistics
:
contractValue
.
deliveryType
,
logistics
:
item
.
deliveryType
,
memberId
:
contractValue
.
partyBMemberId
,
memberRoleId
:
contractValue
.
partyBRoleId
,
amount
:
+
(
item
.
price
*
item
.
quantity
).
toFixed
(
2
),
// 这里应该会出现计算不准的问题
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/utils.ts
View file @
b6f3fcb8
...
...
@@ -17,7 +17,7 @@ export const convertOrderMaterialData = (dataSource: OrderMaterialsConfirmValue[
unit
:
dataSource
.
unit
,
tax
:
dataSource
.
isHasTax
===
1
,
taxRate
:
dataSource
.
taxRate
,
deliveryType
:
undefined
,
deliveryType
:
dataSource
.
deliveryType
,
price
:
dataSource
.
price
,
stock
:
dataSource
.
supplierInventory
,
quantity
:
dataSource
.
requisitionList
?.
reduce
((
pre
,
now
)
=>
(
now
as
any
).
orderQuantity
+
pre
,
0
)
||
0
,
...
...
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