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
754977ee
Commit
754977ee
authored
May 05, 2022
by
何洋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 新增合同采购订单静态
parent
4b49e7cb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
11 deletions
+28
-11
index.tsx
...rderCollectSrm/components/requisitionModalTable/index.tsx
+18
-6
index.tsx
...nsaction/purchaseOrder/orderCollectSrm/constant/index.tsx
+2
-2
index.tsx
...pages/transaction/purchaseOrder/orderCollectSrm/index.tsx
+1
-1
useMaterialTable.tsx
.../purchaseOrder/orderCollectSrm/model/useMaterialTable.tsx
+7
-2
No files found.
src/pages/transaction/purchaseOrder/orderCollectSrm/components/requisitionModalTable/index.tsx
View file @
754977ee
...
...
@@ -5,7 +5,7 @@ import { useModalTable } from '../../model/useModalTable'
import
{
ISchemaFormActions
,
ISchemaFormAsyncActions
}
from
'@formily/antd'
import
{
requisitionColumns
}
from
'../../constant'
import
{
OrderModalType
}
from
'@/constants/order'
import
{
get
ContractManagePageCompleteList
}
from
'@/services/Contract
V2Api'
import
{
get
OrderBuyerFindRequisition
}
from
'@/services/OrderNew
V2Api'
import
{
useIntl
}
from
'umi'
export
interface
ContractModalTableProps
extends
ModalTableProps
{
...
...
@@ -22,12 +22,24 @@ const RequisitionModalTable:React.FC<ContractModalTableProps> = (props) => {
const
{
visible
,
setVisible
,
rowSelection
,
rowSelectionCtl
}
=
useModalTable
({
type
})
const
intl
=
useIntl
()
const
[
currentMaterial
,
setCurrentMaterial
]
=
useState
<
any
>
()
const
fetchTableData
=
async
(
params
)
=>
{
if
(
currentMaterial
)
{
// return await getOrderBuyerFindRequisition({
// ...params,
// productId: currentMaterial.id,
// }, {useCache: true, ttl: 10 * 1000}).data
}
}
useEffect
(()
=>
{
if
(
currentRef
)
{
currentRef
.
current
=
{
setVisible
,
visible
,
rowSelectionCtl
rowSelectionCtl
,
setCurrentMaterial
}
}
},
[])
...
...
@@ -37,16 +49,16 @@ const RequisitionModalTable:React.FC<ContractModalTableProps> = (props) => {
modalTitle=
{
'关联请购单'
}
columns=
{
requisitionColumns
}
visible=
{
visible
}
fetchTableData=
{
()
=>
{}
}
cancel=
{
()
=>
setVisible
(
false
)
}
fetchTableData=
{
fetchTableData
}
rowSelection=
{
rowSelection
}
modalType=
'contractByDefault'
searchName=
"contractNo"
tableProps=
{
{
rowKey
:
'
i
d'
,
rowKey
:
'
requisitionI
d'
,
scroll
:
{
x
:
true
}
}
}
resetModal=
{
{
destroyOnClose
:
true
,
footer
:
null
}
}
{
...
restProps
}
/>
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/constant/index.tsx
View file @
754977ee
...
...
@@ -463,9 +463,9 @@ export const materialInfoColumnsByRequisition: any[] = [
export
const
requisitionColumns
:
any
[]
=
[
{
title
:
'ID'
,
dataIndex
:
'
i
d'
,
dataIndex
:
'
requisitionI
d'
,
align
:
'center'
,
key
:
'
i
d'
,
key
:
'
requisitionI
d'
,
className
:
'commonHide'
},
]
src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx
View file @
754977ee
...
...
@@ -115,7 +115,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
// 订单物料
const
{
materialAddButton
,
materialRef
,
materialColumns
,
materialComponents
,
...
surplusProps
}
=
useMaterialTable
(
addSchemaAction
)
const
{
materialColumns
:
materialColumnsByRequisition
}
=
useMaterialTable
(
addSchemaAction
,
OrderModalType
.
PURCHASE_REQUISITION_ORDER
)
const
{
materialColumns
:
materialColumnsByRequisition
}
=
useMaterialTable
(
addSchemaAction
,
OrderModalType
.
PURCHASE_REQUISITION_ORDER
,
requisitionRef
)
let
timerSignature
=
null
useEffect
(()
=>
{
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/model/useMaterialTable.tsx
View file @
754977ee
...
...
@@ -26,7 +26,7 @@ export const getUnitPriceTotal = (record) => {
/**
* @param ctx schemaAction
*/
export
const
useMaterialTable
=
(
ctx
:
ISchemaFormActions
|
ISchemaFormAsyncActions
,
orderMode
=
ctx
.
getFieldValue
(
'orderMode'
))
=>
{
export
const
useMaterialTable
=
(
ctx
:
ISchemaFormActions
|
ISchemaFormAsyncActions
,
orderMode
=
ctx
.
getFieldValue
(
'orderMode'
)
,
requisitionRef
?:
React
.
MutableRefObject
<
any
>
)
=>
{
const
materialRef
=
useRef
<
any
>
({})
const
intl
=
useIntl
()
const
{
visible
,
setVisible
,
rowSelection
,
rowSelectionCtl
}
=
useModalTable
({
type
:
'checkbox'
})
...
...
@@ -63,7 +63,12 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
tempColumn
[
associatedIndex
].
render
=
(
text
,
record
)
=>
(
<
Button
type=
"link"
onClick=
{
()
=>
alert
(
JSON
.
stringify
(
record
))
}
onClick=
{
()
=>
{
if
(
requisitionRef
)
{
requisitionRef
.
current
.
setCurrentMaterial
(
record
)
requisitionRef
.
current
.
setVisible
(
true
)
}
}
}
>
关联请购单
</
Button
>
...
...
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