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
8f3748ad
Commit
8f3748ad
authored
Jan 06, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 对接采购待分配订单
parent
96815898
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
14 deletions
+29
-14
index.tsx
src/pages/transaction/effect/index.tsx
+17
-1
index.tsx
...ransaction/purchaseOrder/readyDistributionOrder/index.tsx
+5
-4
useSelfTable.tsx
...rchaseOrder/readyDistributionOrder/model/useSelfTable.tsx
+3
-2
index.ts
...tion/purchaseOrder/readyDistributionOrder/schema/index.ts
+4
-7
No files found.
src/pages/transaction/effect/index.tsx
View file @
8f3748ad
import
{
getOrderBuyerCreatePageItems
,
getOrderBuyerPageItems
,
GetOrderBuyerPageItemsResponse
,
getOrderBuyerValidatePageItems
,
getOrderVendorPageItems
,
getOrderVendorValidatePageItems
}
from
'@/services/OrderNewV2Api'
import
{
getOrderBuyerCreatePageItems
,
getOrderBuyerPageItems
,
GetOrderBuyerPageItemsResponse
,
getOrderBuyer
TakePageItems
,
getOrderBuyer
ValidatePageItems
,
getOrderVendorPageItems
,
getOrderVendorValidatePageItems
}
from
'@/services/OrderNewV2Api'
import
{
getProductSelectGetSelectCategory
}
from
'@/services/ProductV2Api'
import
{
getPurchaseRequisitionFindInnerStatusEnum
}
from
'@/services/PurchaseV2Api'
import
{
useEffect
,
useState
}
from
'react'
...
...
@@ -119,3 +119,19 @@ export const getPurchaseRequisitionOrderPageSelectOption = () => {
return
state
}
/** (采购待分配订单查询)获取前端页面下拉框列表 */
export
const
getPurchaseOrderReadyDistributionPageSelectOption
=
()
=>
{
const
[
state
,
setstate
]
=
useState
<
any
>
()
useEffect
(()
=>
{
getOrderBuyerTakePageItems
({}).
then
(
res
=>
{
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
setstate
(
data
)
}
})
},
[])
return
state
}
src/pages/transaction/purchaseOrder/readyDistributionOrder/index.tsx
View file @
8f3748ad
...
...
@@ -10,7 +10,7 @@ import Submit from '@/components/NiceForm/components/Submit'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
import
'../index.less'
import
{
getOrderBuyer
ValidateSubmitPage
,
postOrderBuyerValidateSubmit
Batch
}
from
'@/services/OrderNewV2Api'
import
{
getOrderBuyer
TakePage
,
postOrderBuyerTake
Batch
}
from
'@/services/OrderNewV2Api'
import
{
useIntl
}
from
'umi'
// 待分配订单
...
...
@@ -18,7 +18,7 @@ import { useIntl } from 'umi'
export
interface
ReadyDistributionOrderProps
{}
const
fetchTableData
=
async
(
params
)
=>
{
const
{
data
}
=
await
getOrderBuyer
ValidateSubmit
Page
(
params
)
const
{
data
}
=
await
getOrderBuyer
Take
Page
(
params
)
return
data
}
...
...
@@ -29,7 +29,8 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
rowSelection
,
rowSelectionCtl
}
=
useSelfTable
()
const
{
run
,
loading
}
=
useHttpRequest
(
postOrderBuyerValidateSubmitBatch
)
const
{
run
,
loading
}
=
useHttpRequest
(
postOrderBuyerTakeBatch
)
const
intl
=
useIntl
()
const
handleBitchPush
=
async
()
=>
{
if
(
rowSelectionCtl
.
selectRow
.
length
===
0
)
{
...
...
@@ -51,7 +52,7 @@ const ReadyDistributionOrder:React.FC<ReadyDistributionOrderProps> = (props) =>
fetchTableData=
{
params
=>
fetchTableData
(
params
)
}
columns=
{
columns
}
currentRef=
{
ref
}
rowKey=
{
'orderId'
}
rowKey=
'orderId'
formilyLayouts=
{
{
justify
:
'space-between'
}
}
...
...
src/pages/transaction/purchaseOrder/readyDistributionOrder/model/useSelfTable.tsx
View file @
8f3748ad
import
React
,
{
useRef
}
from
'react'
import
{
Button
}
from
'antd'
import
{
baseOrderListColumns
}
from
'../../constant'
import
{
history
,
useIntl
}
from
'umi'
import
{
useIntl
}
from
'umi'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
postOrderBuyerTake
}
from
'@/services/OrderNewV2Api'
export
const
useSelfTable
=
()
=>
{
const
ref
=
useRef
<
any
>
({})
...
...
@@ -10,7 +11,7 @@ export const useSelfTable = () => {
const
intl
=
useIntl
()
const
handleSubmit
=
async
(
id
)
=>
{
history
.
push
(
`/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail?id=
${
id
}
&preview=0`
)
await
postOrderBuyerTake
({
orderId
:
id
}
)
}
const
secondColumns
:
any
[]
=
baseOrderListColumns
().
concat
([
...
...
src/pages/transaction/purchaseOrder/readyDistributionOrder/schema/index.ts
View file @
8f3748ad
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
getPurchaseOrderSelectOption
}
from
'@/pages/transaction/effect'
;
import
{
getPurchaseOrder
ReadyDistributionPage
SelectOption
}
from
'@/pages/transaction/effect'
;
import
{
useIntl
}
from
'umi'
;
export
const
tableListSchema
:
any
=
()
=>
{
const
intl
=
useIntl
()
const
res
=
getPurchaseOrderSelectOption
()
if
(
res
)
{
const
{
orderTypes
:
OrderType
,
}
=
res
const
data
=
getPurchaseOrderReadyDistributionPageSelectOption
()
if
(
data
)
{
return
{
type
:
'object'
,
...
...
@@ -48,7 +45,7 @@ export const tableListSchema: any = () => {
"x-component-props"
:
{
placeholder
:
intl
.
formatMessage
({
id
:
'purchaseOrder.qingxuanzedingdanOrderType'
,
defaultMessage
:
'请选择订单类型'
})
},
enum
:
OrderType
.
map
(
item
=>
({
enum
:
data
.
map
(
item
=>
({
label
:
item
[
'text'
],
value
:
item
[
'id'
],
}))
...
...
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