Commit 8f3748ad authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 对接采购待分配订单

parent 96815898
import { getOrderBuyerCreatePageItems, getOrderBuyerPageItems, GetOrderBuyerPageItemsResponse, getOrderBuyerValidatePageItems, getOrderVendorPageItems, getOrderVendorValidatePageItems } from '@/services/OrderNewV2Api'
import { getOrderBuyerCreatePageItems, getOrderBuyerPageItems, GetOrderBuyerPageItemsResponse, getOrderBuyerTakePageItems, getOrderBuyerValidatePageItems, 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
}
......@@ -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 { getOrderBuyerValidateSubmitPage, postOrderBuyerValidateSubmitBatch } from '@/services/OrderNewV2Api'
import { getOrderBuyerTakePage, postOrderBuyerTakeBatch } 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 getOrderBuyerValidateSubmitPage(params)
const { data } = await getOrderBuyerTakePage(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'
}}
......
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([
......
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getPurchaseOrderSelectOption } from '@/pages/transaction/effect';
import { getPurchaseOrderReadyDistributionPageSelectOption } 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'],
}))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment