Commit d53ca66b authored by 前端-许佳敏's avatar 前端-许佳敏

fix:优化销售订单批量提交体验,防止重复提交

parent 5045abb7
...@@ -10,6 +10,7 @@ import Submit from '@/components/NiceForm/components/Submit' ...@@ -10,6 +10,7 @@ import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import { DatePicker } from '@formily/antd-components'
import { useSelfTable } from './model/useSelfTable' import { useSelfTable } from './model/useSelfTable'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { useHttpRequest } from '@/hooks/useHttpRequest'
// 待提交审核订单 // 待提交审核订单
...@@ -25,11 +26,16 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => { ...@@ -25,11 +26,16 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => {
const { columns, ref } = useSelfTable() const { columns, ref } = useSelfTable()
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'}) const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOneAll)
const handleBitchPush = async () => { const handleBitchPush = async () => {
if (rowSelectionCtl.selectedRowKeys.length > 0) { if (rowSelectionCtl.selectedRowKeys.length > 0) {
await PublicApi.postOrderSubmittedReviewOrderOneAll({ids: rowSelectionCtl.selectedRowKeys}) const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
ref.current.reload() if (code === 1000) {
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
ref.current.reload()
}
} else { } else {
message.error('请勾选要审核的订单') message.error('请勾选要审核的订单')
} }
...@@ -77,7 +83,7 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => { ...@@ -77,7 +83,7 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => {
}} }}
formilyChilds={{ formilyChilds={{
children: <Space> children: <Space>
<Button onClick={handleBitchPush}>批量提交审核</Button> <Button onClick={handleBitchPush} loading={loading}>批量提交审核</Button>
</Space>, </Space>,
layouts: { layouts: {
span: 8 span: 8
......
...@@ -14,6 +14,7 @@ import Submit from '@/components/NiceForm/components/Submit' ...@@ -14,6 +14,7 @@ import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import { DatePicker } from '@formily/antd-components'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants' import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest'
// 待归档订单 // 待归档订单
...@@ -32,6 +33,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -32,6 +33,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelection, rowSelection,
rowSelectionCtl rowSelectionCtl
} = useSelfTable() } = useSelfTable()
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOneAll)
const handleSubmitBatch = async () => { const handleSubmitBatch = async () => {
if (rowSelectionCtl.selectRow.length === 0) { if (rowSelectionCtl.selectRow.length === 0) {
...@@ -40,8 +42,12 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -40,8 +42,12 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
} }
const canBitch = !rowSelectionCtl.selectRow.some(v => v.purchaseOrderInteriorState !== SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) const canBitch = !rowSelectionCtl.selectRow.some(v => v.purchaseOrderInteriorState !== SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER)
if (canBitch) { if (canBitch) {
await PublicApi.postOrderSubmittedReviewOrderOneAll({ids: rowSelectionCtl.selectedRowKeys}) const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
ref.current.reload() if (code === 1000) {
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
ref.current.reload()
}
} else { } else {
message.error('只能批量提交内部状态为审核中的订单') message.error('只能批量提交内部状态为审核中的订单')
} }
...@@ -81,7 +87,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -81,7 +87,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
}} }}
formilyChilds={{ formilyChilds={{
children: <Space> children: <Space>
<Button onClick={handleSubmitBatch}>批量提交审核</Button> <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
</Space>, </Space>,
layouts: { layouts: {
span: 8 span: 8
......
...@@ -13,6 +13,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const' ...@@ -13,6 +13,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import { DatePicker } from '@formily/antd-components'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { useHttpRequest } from '@/hooks/useHttpRequest'
// 二级待审核订单 // 二级待审核订单
...@@ -30,11 +31,18 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -30,11 +31,18 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
ref ref
} = useSelfTable() } = useSelfTable()
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'}) const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderTwoAll)
const handleSubmitBatch = async () => { const handleSubmitBatch = async () => {
await PublicApi.postOrderSubmittedReviewOrderTwoAll({ const { code } = run({
ids: rowSelectionCtl.selectedRowKeys ids: rowSelectionCtl.selectedRowKeys
}) })
if (code === 1000) {
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
ref.current.reload()
}
} }
return <PageHeaderWrapper> return <PageHeaderWrapper>
<Card> <Card>
...@@ -71,7 +79,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -71,7 +79,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
}} }}
formilyChilds={{ formilyChilds={{
children: <Space> children: <Space>
<Button onClick={handleSubmitBatch}>批量提交审核</Button> <Button onClick={handleSubmitBatch} loading={loading}>批量提交审核</Button>
</Space>, </Space>,
layouts: { layouts: {
span: 8 span: 8
......
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