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
ded2bebb
Commit
ded2bebb
authored
Nov 02, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复询价报价单,需求报价单新增问题
parent
c9a6ca36
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
7 deletions
+29
-7
index.ts
...ages/transaction/purchaseOrder/orderCollect/apis/index.ts
+3
-2
index.tsx
...eOrder/orderCollect/components/demandModalTable/index.tsx
+4
-2
index.tsx
...Order/orderCollect/components/inquiryModalTable/index.tsx
+8
-1
index.tsx
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
+9
-2
useProductTable.tsx
...tion/purchaseOrder/orderCollect/model/useProductTable.tsx
+5
-0
No files found.
src/pages/transaction/purchaseOrder/orderCollect/apis/index.ts
View file @
ded2bebb
...
...
@@ -3,7 +3,7 @@ import { PublicApi } from '@/services/api'
export
const
fetchOrderApi
=
{
// 弹窗获取商品列表
async
getProductList
(
params
)
{
const
{
data
}
=
await
PublicApi
.
getProductCommodityCommonGetCommodityListByBuyer
(
params
)
const
{
data
}
=
await
PublicApi
.
getProductCommodityCommonGetCommodityListByBuyer
(
params
,
{
useCache
:
true
,
ttl
:
10
*
1000
}
)
return
data
},
...
...
@@ -25,8 +25,9 @@ export const fetchOrderApi = {
return
data
},
// 根据需求报价id查询商品列表
async
getProductListByDemandOrderId
(
params
)
{
const
{
data
}
=
await
PublicApi
.
getOrder
RequisitionForm
ProductList
(
params
)
const
{
data
}
=
await
PublicApi
.
getOrder
QuotationParticulars
ProductList
(
params
)
return
data
},
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/demandModalTable/index.tsx
View file @
ded2bebb
...
...
@@ -32,12 +32,14 @@ const DemandModalTable:React.FC<DemandModalTableProps> = (props) => {
const
item
=
rowSelectionCtl
.
selectRow
[
0
]
if
(
item
)
{
schemaAction
.
setFieldValue
(
'quotationNo'
,
item
.
quotationNo
)
const
data
=
await
fetchOrderApi
.
getProductListBy
Quotation
OrderId
({
const
data
=
await
fetchOrderApi
.
getProductListBy
Demand
OrderId
({
id
:
item
.
id
})
schemaAction
.
setFieldValue
(
'orderProductRequests'
,
data
)
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
item
.
demandMembers
)
schemaAction
.
setFieldValue
(
'supplyMembersId'
,
item
.
demandMemberId
)
// 需求单回显订单明细
schemaAction
.
setFieldValue
(
'orderThe'
,
item
.
quotationSummary
)
}
confirmModal
&&
confirmModal
()
setVisible
(
false
)
...
...
@@ -49,7 +51,7 @@ const DemandModalTable:React.FC<DemandModalTableProps> = (props) => {
visible=
{
visible
}
confirm=
{
handleConfirm
}
cancel=
{
()
=>
setVisible
(
false
)
}
fetchTableData=
{
async
(
params
)
=>
(
await
PublicApi
.
getOrder
QuotationRequisitionForm
List
({...
params
,
externalState
:
5
})).
data
}
fetchTableData=
{
async
(
params
)
=>
(
await
PublicApi
.
getOrder
ConfirmationQuotation
List
({...
params
,
externalState
:
5
})).
data
}
rowSelection=
{
rowSelection
}
modalType=
'demandByDefault'
tableProps=
{
{
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/inquiryModalTable/index.tsx
View file @
ded2bebb
...
...
@@ -35,8 +35,15 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
const
data
=
await
fetchOrderApi
.
getProductListByQuotationOrderId
({
id
:
item
.
id
})
schemaAction
.
setFieldValue
(
'orderProductRequests'
,
data
)
// 将询价报价单的id字段 冗余给商品列表
schemaAction
.
setFieldValue
(
'orderProductRequests'
,
data
.
map
((
v
:
any
)
=>
{
v
.
memberId
=
item
.
memberId
v
.
memberRoleId
=
item
.
memberRoleId
return
v
}))
schemaAction
.
setFieldValue
(
'supplyMembersName'
,
item
.
memberName
||
'后端没有返回会员名称'
)
// 询价单回显订单明细
schemaAction
.
setFieldValue
(
'orderThe'
,
item
.
details
)
}
confirmModal
&&
confirmModal
()
setVisible
(
false
)
...
...
src/pages/transaction/purchaseOrder/orderCollect/index.tsx
View file @
ded2bebb
...
...
@@ -346,10 +346,17 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}
ctx
.
reset
({
validate
:
false
,
selector
:
'*(quotationNo,supplyMembersName,orderProductRequests)'
selector
:
'*(quotationNo,supplyMembersName,orderProductRequests
,orderThe
)'
})
// 清空弹窗所选的值
productRef
.
current
.
rowSelectionCtl
.
setSelectRow
([])
productRef
.
current
.
rowSelectionCtl
.
setSelectedRowKeys
([])
memberRef
.
current
.
rowSelectionCtl
.
setSelectRow
([])
memberRef
.
current
.
rowSelectionCtl
.
setSelectedRowKeys
([])
inquiryRef
.
current
.
rowSelectionCtl
.
setSelectRow
([])
inquiryRef
.
current
.
rowSelectionCtl
.
setSelectedRowKeys
([])
demandRef
.
current
.
rowSelectionCtl
.
setSelectRow
([])
demandRef
.
current
.
rowSelectionCtl
.
setSelectedRowKeys
([])
}
})
useOrderFormInitEffect
(
ctx
)
...
...
@@ -403,7 +410,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}
}
/>
</
Card
>
<
ProductModalTable
currentRef=
{
productRef
}
schemaAction=
{
addSchemaAction
}
sectionProps=
{
sectionProps
}
/>
<
ProductModalTable
currentRef=
{
productRef
}
schemaAction=
{
addSchemaAction
}
sectionProps=
{
sectionProps
}
forceRender
/>
<
MemberModalTable
currentRef=
{
memberRef
}
schemaAction=
{
addSchemaAction
}
/>
{
/* 询价报价单弹窗 */
}
<
InquiryModalTable
currentRef=
{
inquiryRef
}
schemaAction=
{
addSchemaAction
}
/>
...
...
src/pages/transaction/purchaseOrder/orderCollect/model/useProductTable.tsx
View file @
ded2bebb
...
...
@@ -8,6 +8,11 @@ import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
export
const
getUnitPriceTotal
=
(
record
)
=>
{
const
purchaseCount
=
Number
(
record
[
'purchaseCount'
])
||
0
// fix 当没有传递unitPrice字段时 自动容错, 单价显示为0
record
.
unitPrice
=
record
.
unitPrice
||
record
.
price
||
0
if
(
typeof
record
.
unitPrice
===
'number'
)
{
return
record
.
unitPrice
*
purchaseCount
}
let
unitPrice
=
0
Object
.
entries
(
record
.
unitPrice
).
forEach
(([
key
,
value
])
=>
{
const
[
min
,
max
]
=
key
.
split
(
'-'
).
map
(
v
=>
Number
(
v
))
...
...
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