Commit 586c1966 authored by 卢均锐's avatar 卢均锐

feat: 缓存业务请款相关

-业务对账协同列表字段修改
parent 0ffb4659
...@@ -243,12 +243,15 @@ const SearchDetail = () => { ...@@ -243,12 +243,15 @@ const SearchDetail = () => {
case 'readyConfirm': case 'readyConfirm':
return <Button type='primary' icon={<CheckCircleOutlined />} onClick={() => { setModalVisible(true) }}>确认对账单</Button> return <Button type='primary' icon={<CheckCircleOutlined />} onClick={() => { setModalVisible(true) }}>确认对账单</Button>
case 'readyPay': case 'readyPay':
return (
<Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })}> <Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })}>
<Button type='primary' icon={<CheckCircleOutlined />}> <Button type='primary' icon={<CheckCircleOutlined />}>
{intl.formatMessage({ id: 'balance.tijiao' })} {intl.formatMessage({ id: 'balance.tijiao' })}
</Button> </Button>
</Popconfirm> </Popconfirm>
break; )
default:
return null
} }
} }
......
...@@ -78,7 +78,7 @@ const ReadyPay: React.FC = () => { ...@@ -78,7 +78,7 @@ const ReadyPay: React.FC = () => {
title: intl.formatMessage({ id: 'balance.caozuo' }), title: intl.formatMessage({ id: 'balance.caozuo' }),
key: 'operate', key: 'operate',
dataIndex: 'operate', dataIndex: 'operate',
render: (text: any, record: any) => <Link to={`readyPay/detail?id=${record.reconciliationId}&no=${text}`}>{intl.formatMessage({ id: 'balance.qingkuan' })}</Link> render: (text: any, record: any) => <Link to={`readyPay/detail?id=${record.reconciliationId}&no=${record.reconciliationNo}`}>{intl.formatMessage({ id: 'balance.qingkuan' })}</Link>
}]; }];
return ( return (
......
...@@ -5,18 +5,21 @@ import StandardTable from '@/components/StandardTable'; ...@@ -5,18 +5,21 @@ import StandardTable from '@/components/StandardTable';
import { PageHeaderWrapper } from '@ant-design/pro-layout' import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm' import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag'; import StatusTag from '@/components/StatusTag';
import { formatTimeString } from '@/utils' import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat' import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'; import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { getSettleAccountsBusinessApplyAmountBuyerApplyAmountList, getSettleAccountsBusinessApplyAmountItemApplyAmountStatus } from '@/services/SettleV2Api'
import { createFormActions } from '@formily/antd' import { createFormActions } from '@formily/antd'
import { getIntl } from 'umi'; import { getIntl, Link } from 'umi';
import { fetchOptions } from '../../common';
const intl = getIntl(); const intl = getIntl();
const { Link, Text } = Typography; const { Text } = Typography;
// 请款单查询 // 请款单查询
...@@ -24,65 +27,72 @@ const formActions = createFormActions(); ...@@ -24,65 +27,72 @@ const formActions = createFormActions();
const Search: React.FC = () => { const Search: React.FC = () => {
const ref = useRef<any>({}) const ref = useRef<any>({})
// const loadingTableData = (params) => { const loadingTableData = async (params) => {
// const { data } = await getPurchaseRequisitionPage(params) const _params = { ...params };
// return data if (params.createTimeStart) {
// } _params.createTimeStart = formatTimeString(Number(params.createTimeStart), 'YYYY-MM-DD');
}
if (params.createTimeEnd) {
_params.createTimeEnd = formatTimeString(Number(params.createTimeEnd), 'YYYY-MM-DD');
}
const { data } = await getSettleAccountsBusinessApplyAmountBuyerApplyAmountList(_params)
return data
}
const columns: ColumnType<any>[] = [{ const columns: ColumnType<any>[] = [{
title: intl.formatMessage({id: 'balance.qingkuandanhao'}), title: intl.formatMessage({ id: 'balance.qingkuandanhao' }),
key: 'orderNo', key: 'applyNo',
dataIndex: 'orderNo', dataIndex: 'applyNo',
render: (text: any, record: any) => ( render: (text: any, record: any) => (
<Link>{text}</Link> <Link to={`search/preivew?id=${record.id}&no=${text}`}>{text}</Link>
) )
}, { }, {
title: intl.formatMessage({id: 'balance.danjuzhaiyao'}), title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
key: 'details', key: 'applyAbstract',
dataIndex: 'details', dataIndex: 'applyAbstract',
render: (text: any, record: any) => ( render: (text: any, record: any) => (
<Space direction='vertical' style={{ width: 300 }}> <Space direction='vertical' style={{ width: 300 }}>
<Text type='secondary'>{text}</Text> <Text type='secondary'>{text}</Text>
</Space> </Space>
) )
}, { }, {
title: intl.formatMessage({id: 'balance.qingkuanleixing'}), title: intl.formatMessage({ id: 'balance.qingkuanleixing' }),
key: 'type', key: 'applyType',
dataIndex: 'type', dataIndex: 'applyType',
}, { }, {
title: intl.formatMessage({id: 'balance.qingkuanfang'}), title: intl.formatMessage({ id: 'balance.qingkuanfang' }),
key: 'payee', key: 'payee',
dataIndex: 'payee', dataIndex: 'payee',
}, { }, {
title: intl.formatMessage({id: 'balance.qingkuanjine'}), title: intl.formatMessage({ id: 'balance.qingkuanjine' }),
key: 'total', key: 'applyAmount',
dataIndex: 'total', dataIndex: 'applyAmount',
render: (text: any, record: any) => ${priceFormat(text)}`, render: (text: any, record: any) => ${priceFormat(text)}`,
width: 180 width: 180
}, { }, {
title: intl.formatMessage({id: 'balance.yujifukuanriqi'}), title: intl.formatMessage({ id: 'balance.yujifukuanriqi' }),
key: 'payTime', key: 'expectPayTime',
dataIndex: 'payTime', dataIndex: 'expectPayTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'), render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180 width: 180
}, { }, {
title: intl.formatMessage({id: 'balance.danjushijian'}), title: intl.formatMessage({ id: 'balance.danjushijian' }),
key: 'createTime', key: 'createTime',
dataIndex: 'createTime', dataIndex: 'createTime',
render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'), render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
width: 180 width: 180
}, { }, {
title: intl.formatMessage({id: 'balance.waibuzhuangtai'}), title: intl.formatMessage({ id: 'balance.waibuzhuangtai' }),
key: 'externalState', key: 'status',
dataIndex: 'externalState', dataIndex: 'status',
render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} /> render: (text: any, record: any) => <StatusTag type='default' title={record.status} />
}]; }];
return ( return (
<PageHeaderWrapper> <PageHeaderWrapper>
<Card> <Card>
<StandardTable <StandardTable
// fetchTableData={params => loadingTableData(params)} fetchTableData={params => loadingTableData(params)}
columns={columns} columns={columns}
currentRef={ref} currentRef={ref}
rowKey="id" rowKey="id"
...@@ -94,9 +104,13 @@ const Search: React.FC = () => { ...@@ -94,9 +104,13 @@ const Search: React.FC = () => {
useStateFilterSearchLinkageEffect( useStateFilterSearchLinkageEffect(
$, $,
actions, actions,
'orderNo', 'applyNo',
FORM_FILTER_PATH, FORM_FILTER_PATH,
) )
useAsyncSelect(
'status',
fetchOptions(getSettleAccountsBusinessApplyAmountItemApplyAmountStatus),
);
}} }}
schema={{ schema={{
type: 'object', type: 'object',
...@@ -108,12 +122,13 @@ const Search: React.FC = () => { ...@@ -108,12 +122,13 @@ const Search: React.FC = () => {
grid: true grid: true
}, },
properties: { properties: {
orderNo: { applyNo: {
type: 'string', type: 'string',
"x-component": 'Search', "x-component": 'Search',
'x-component-props': { 'x-component-props': {
placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanhao'}), placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanhao' }),
align: 'flex-start', align: 'flex-start',
allowClear: true,
}, },
}, },
} }
...@@ -131,42 +146,41 @@ const Search: React.FC = () => { ...@@ -131,42 +146,41 @@ const Search: React.FC = () => {
}, },
}, },
properties: { properties: {
"digest": { "applyAbstract": {
type: 'string', type: 'string',
'x-component-props': { 'x-component-props': {
placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanzhaiyao'}), placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanzhaiyao' }),
allowClear: true,
} }
}, },
"innerStatus": { "status": {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: intl.formatMessage({id: 'balance.qingxuanzezhuangtai'}) placeholder: intl.formatMessage({ id: 'balance.qingxuanzezhuangtai' }),
allowClear: true,
}, },
enum: [ enum: []
{ label: intl.formatMessage({id: 'balance.suoyou'}), value: '' },
{ label: intl.formatMessage({id: 'balance.daitijiao'}), value: 1 },
{ label: intl.formatMessage({id: 'balance.yitijiao'}), value: 2 },
{ label: intl.formatMessage({id: 'balance.yifukuan'}), value: 3 },
]
}, },
"[startDate,endDate]": { "[createTimeStart,createTimeEnd]": {
type: 'string', type: 'string',
"x-component": "dateSelect", "x-component": "dateSelect",
"x-component-props": { "x-component-props": {
placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}), placeholder: intl.formatMessage({ id: 'balance.danjushijianquanbu' }),
allowClear: true,
} }
}, },
"[startPayDate,endPayDate]": { "[expectPayTimeStart,expectPayTimeEnd]": {
type: 'string', type: 'string',
"x-component": "daterange", "x-component": "daterange",
"x-component-props": { "x-component-props": {
placeholder: [intl.formatMessage({id: 'balance.yujifukuankaishishijian'}), intl.formatMessage({id: 'balance.yujifukuanjieshushijian'})], placeholder: [intl.formatMessage({ id: 'balance.yujifukuankaishishijian' }), intl.formatMessage({ id: 'balance.yujifukuanjieshushijian' })],
allowClear: true,
} }
}, },
submit: { submit: {
'x-component': 'Submit', 'x-component': 'Submit',
'x-component-props': { 'x-component-props': {
children: intl.formatMessage({id: 'balance.chaxun'}), children: intl.formatMessage({ id: 'balance.chaxun' }),
}, },
}, },
}, },
......
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