feat: 缓存业务请款相关

-业务对账协同列表字段修改

feat: 缓存业务请款相关
586c1966 · 卢均锐 · 0ffb4659 · 586c1966 · 586c1966 · 586c1966
Commit 586c1966 authored Dec 27, 2021 by 卢均锐
4 changed files
--- a/src/pages/balance/businessReconciliationCollaboration/detail/index.tsx
+++ b/src/pages/balance/businessReconciliationCollaboration/detail/index.tsx
@@ -243,12 +243,15 @@ const SearchDetail = () => {
      case 'readyConfirm':
        return <Button type='primary' icon={<CheckCircleOutlined />} onClick={() => { setModalVisible(true) }}>确认对账单</Button>
      case 'readyPay':
+        return (
          <Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })}>
            <Button type='primary' icon={<CheckCircleOutlined />}>
              {intl.formatMessage({ id: 'balance.tijiao' })}
            </Button>
          </Popconfirm>
-        break;
+        )
+      default:
+        return null
    }
  }


--- a/src/pages/balance/businessReconciliationCollaboration/readyPay/index.tsx
+++ b/src/pages/balance/businessReconciliationCollaboration/readyPay/index.tsx
@@ -78,7 +78,7 @@ const ReadyPay: React.FC = () => {
    title: intl.formatMessage({ id: 'balance.caozuo' }),
    key: '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 (

--- a/src/pages/balance/businessRequestFunds/admin/index.tsx
+++ b/src/pages/balance/businessRequestFunds/admin/index.tsx
 import React, { useRef, useState } from 'react'
-import { Card, Typography, Space, Button } from 'antd'
-import { PlusOutlined } from '@ant-design/icons';
+import { Card, Typography, Space, Button, Popconfirm, Dropdown, Menu } from 'antd'
+import { PlusOutlined, CaretDownOutlined } from '@ant-design/icons';
 import { ColumnType } from 'antd/lib/table/interface';
 import StandardTable from '@/components/StandardTable';
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
@@ -12,12 +12,12 @@ import StatusTag from '@/components/StatusTag';
 import { formatTimeString } from '@/utils'
 import { priceFormat } from '@/utils/numberFomat'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
-
+import { getSettleAccountsBusinessApplyAmountToAddApplyAmountList } from '@/services/SettleV2Api'
 import { createFormActions } from '@formily/antd'
-import { getIntl } from 'umi';
+import { history, getIntl, Link } from 'umi';
 const intl = getIntl();

-const { Link, Text } = Typography;
+const { Text } = Typography;

 // 请款单查询

@@ -25,65 +25,116 @@ const formActions = createFormActions();

 const Admin: React.FC = () => {
  const ref = useRef<any>({})
-  // const loadingTableData = (params) => {
-  //   const { data } = await getPurchaseRequisitionPage(params)
-  //   return data
-  // }
+  const loadingTableData = async (params) => {
+    const _params = { ...params };
+    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 getSettleAccountsBusinessApplyAmountToAddApplyAmountList(_params)
+    return data
+  }

  const columns: ColumnType<any>[] = [{
-    title: intl.formatMessage({id: 'balance.qingkuandanhao'}),
-    key: 'orderNo',
-    dataIndex: 'orderNo',
+    title: intl.formatMessage({ id: 'balance.qingkuandanhao' }),
+    key: 'applyNo',
+    dataIndex: 'applyNo',
    render: (text: any, record: any) => (
-      <Link>{text}</Link>
+      <Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
    )
  }, {
-    title: intl.formatMessage({id: 'balance.danjuzhaiyao'}),
-    key: 'details',
-    dataIndex: 'details',
+    title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
+    key: 'applyAbstract',
+    dataIndex: 'applyAbstract',
    render: (text: any, record: any) => (
      <Space direction='vertical' style={{ width: 300 }}>
        <Text type='secondary'>{text}</Text>
      </Space>
    )
  }, {
-    title: intl.formatMessage({id: 'balance.qingkuanleixing'}),
-    key: 'type',
-    dataIndex: 'type',
+    title: intl.formatMessage({ id: 'balance.qingkuanleixing' }),
+    key: 'applyType',
+    dataIndex: 'applyType',
  }, {
-    title: intl.formatMessage({id: 'balance.qingkuanfang'}),
+    title: intl.formatMessage({ id: 'balance.qingkuanfang' }),
    key: 'payee',
    dataIndex: 'payee',
  }, {
-    title: intl.formatMessage({id: 'balance.qingkuanjine'}),
-    key: 'total',
-    dataIndex: 'total',
+    title: intl.formatMessage({ id: 'balance.qingkuanjine' }),
+    key: 'applyAmount',
+    dataIndex: 'applyAmount',
    render: (text: any, record: any) => `¥${priceFormat(text)}`,
    width: 180
  }, {
-    title: intl.formatMessage({id: 'balance.yujifukuanriqi'}),
-    key: 'payTime',
-    dataIndex: 'payTime',
+    title: intl.formatMessage({ id: 'balance.yujifukuanriqi' }),
+    key: 'expectPayTime',
+    dataIndex: 'expectPayTime',
    render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
    width: 180
  }, {
-    title: intl.formatMessage({id: 'balance.danjushijian'}),
+    title: intl.formatMessage({ id: 'balance.danjushijian' }),
    key: 'createTime',
    dataIndex: 'createTime',
    render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
    width: 180
  }, {
-    title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
-    key: 'externalState',
-    dataIndex: 'externalState',
-    render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
+    title: intl.formatMessage({ id: 'balance.waibuzhuangtai' }),
+    key: 'status',
+    dataIndex: 'status',
+    render: (text: any, record: any) => <StatusTag type='default' title={text} />
+  },
+  {
+    title: intl.formatMessage({ id: 'balance.caozuo' }),
+    dataIndex: 'operate',
+    align: 'center',
+    render: (text: any, record: any) => <>
+      {record.status === 1 && <Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })} onConfirm={() => fetchSubmitBatch(record.reconciliationId)}>
+        <Button type='link'>
+          {intl.formatMessage({ id: 'balance.tijiao' })}
+        </Button>
+      </Popconfirm>}
+      <Dropdown overlay={() => (
+        <Menu onClick={(e) => handleMenuClick(e, record)}>
+          <Menu.Item key="1">{intl.formatMessage({ id: 'balance.bianji' })}</Menu.Item>
+          <Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })} onConfirm={() => fetchDelete(record.reconciliationId)}>
+            <Menu.Item key="2">{intl.formatMessage({ id: 'balance.shanchu' })}</Menu.Item>
+          </Popconfirm>
+        </Menu>
+      )}>
+        <Button type='link'>{intl.formatMessage({ id: 'balance.gengduo' })}<CaretDownOutlined /></Button>
+      </Dropdown>
+    </>
  }];

+  const fetchSubmitBatch = (id: number) => {
+    // postSettleAccountsBusinessReconciliationSubmitReconciliation({ id }).then((res) => {
+    //   if (res.code === 1000) {
+    //     ref.current.reload();
+    //   }
+    // })
+  }
+
+  const fetchDelete = (id: number) => {
+    // postSettleAccountsBusinessReconciliationDeleteReconciliation({ id }).then((res) => {
+    //   if (res.code === 1000) {
+    //     ref.current.reload();
+    //   }
+    // })
+  }
+
+  const handleMenuClick = (e: any, record: any) => {
+    if (e.key === '1') {
+      history.push(`/memberCenter/balance/businessReconciliation/readyAdd/edit?id=${record.reconciliationId}&no=${record.reconciliationNo}`)
+    }
+  }
+
  return (
    <PageHeaderWrapper>
      <Card>
        <StandardTable
-          // fetchTableData={params => loadingTableData(params)}
+          fetchTableData={params => loadingTableData(params)}
          columns={columns}
          currentRef={ref}
          rowKey="id"
@@ -95,7 +146,7 @@ const Admin: React.FC = () => {
                useStateFilterSearchLinkageEffect(
                  $,
                  actions,
-                  'orderNo',
+                  'applyNo',
                  FORM_FILTER_PATH,
                )
              }}
@@ -113,11 +164,11 @@ const Admin: React.FC = () => {
                        type: "object",
                        "x-component": "controllerBtns",
                      },
-                      orderNo: {
+                      applyNo: {
                        type: 'string',
                        "x-component": 'Search',
                        'x-component-props': {
-                          placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanhao'}),
+                          placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanhao' }),
                          align: 'flex-end',
                        },
                      },
@@ -136,36 +187,36 @@ const Admin: React.FC = () => {
                      },
                    },
                    properties: {
-                      "digest": {
+                      "applyAbstract": {
                        type: 'string',
                        'x-component-props': {
-                          placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanzhaiyao'}),
+                          placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanzhaiyao' }),
                        }
                      },
-                      "memberName": {
+                      "payee": {
                        type: 'string',
                        "x-component-props": {
-                          placeholder: intl.formatMessage({id: 'balance.qingshurufukuanfang'})
+                          placeholder: intl.formatMessage({ id: 'balance.qingshurufukuanfang' })
                        }
                      },
-                      "[startDate,endDate]": {
+                      "[createTimeStart,createTimeEnd]": {
                        type: 'string',
                        "x-component": "dateSelect",
                        "x-component-props": {
-                          placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
+                          placeholder: intl.formatMessage({ id: 'balance.danjushijianquanbu' }),
                        }
                      },
-                      "[startPayDate,endPayDate]": {
+                      "[expectPayTimeStart,expectPayTimeEnd]": {
                        type: 'string',
                        "x-component": "daterange",
                        "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' })],
                        }
                      },
                      submit: {
                        'x-component': 'Submit',
                        'x-component-props': {
-                          children: intl.formatMessage({id: 'balance.chaxun'}),
+                          children: intl.formatMessage({ id: 'balance.chaxun' }),
                        },
                      },
                    },

--- a/src/pages/balance/businessRequestFunds/search/index.tsx
+++ b/src/pages/balance/businessRequestFunds/search/index.tsx
@@ -5,18 +5,21 @@ import StandardTable from '@/components/StandardTable';
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
+import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
 import Submit from '@/components/NiceForm/components/Submit'
 import NiceForm from '@/components/NiceForm'
 import StatusTag from '@/components/StatusTag';
 import { formatTimeString } from '@/utils'
 import { priceFormat } from '@/utils/numberFomat'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
-
+import { getSettleAccountsBusinessApplyAmountBuyerApplyAmountList, getSettleAccountsBusinessApplyAmountItemApplyAmountStatus } from '@/services/SettleV2Api'
 import { createFormActions } from '@formily/antd'
-import { getIntl } from 'umi';
+import { getIntl, Link } from 'umi';
+import { fetchOptions } from '../../common';
+
 const intl = getIntl();

-const { Link, Text } = Typography;
+const { Text } = Typography;

 // 请款单查询

@@ -24,65 +27,72 @@ const formActions = createFormActions();

 const Search: React.FC = () => {
  const ref = useRef<any>({})
-  // const loadingTableData = (params) => {
-  //   const { data } = await getPurchaseRequisitionPage(params)
-  //   return data
-  // }
+  const loadingTableData = async (params) => {
+    const _params = { ...params };
+    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>[] = [{
-    title: intl.formatMessage({id: 'balance.qingkuandanhao'}),
-    key: 'orderNo',
-    dataIndex: 'orderNo',
+    title: intl.formatMessage({ id: 'balance.qingkuandanhao' }),
+    key: 'applyNo',
+    dataIndex: 'applyNo',
    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'}),
-    key: 'details',
-    dataIndex: 'details',
+    title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
+    key: 'applyAbstract',
+    dataIndex: 'applyAbstract',
    render: (text: any, record: any) => (
      <Space direction='vertical' style={{ width: 300 }}>
        <Text type='secondary'>{text}</Text>
      </Space>
    )
  }, {
-    title: intl.formatMessage({id: 'balance.qingkuanleixing'}),
-    key: 'type',
-    dataIndex: 'type',
+    title: intl.formatMessage({ id: 'balance.qingkuanleixing' }),
+    key: 'applyType',
+    dataIndex: 'applyType',
  }, {
-    title: intl.formatMessage({id: 'balance.qingkuanfang'}),
+    title: intl.formatMessage({ id: 'balance.qingkuanfang' }),
    key: 'payee',
    dataIndex: 'payee',
  }, {
-    title: intl.formatMessage({id: 'balance.qingkuanjine'}),
-    key: 'total',
-    dataIndex: 'total',
+    title: intl.formatMessage({ id: 'balance.qingkuanjine' }),
+    key: 'applyAmount',
+    dataIndex: 'applyAmount',
    render: (text: any, record: any) => `¥${priceFormat(text)}`,
    width: 180
  }, {
-    title: intl.formatMessage({id: 'balance.yujifukuanriqi'}),
-    key: 'payTime',
-    dataIndex: 'payTime',
+    title: intl.formatMessage({ id: 'balance.yujifukuanriqi' }),
+    key: 'expectPayTime',
+    dataIndex: 'expectPayTime',
    render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
    width: 180
  }, {
-    title: intl.formatMessage({id: 'balance.danjushijian'}),
+    title: intl.formatMessage({ id: 'balance.danjushijian' }),
    key: 'createTime',
    dataIndex: 'createTime',
    render: (text: any, record: any) => formatTimeString(text, 'YYYY-MM-DD HH:mm'),
    width: 180
  }, {
-    title: intl.formatMessage({id: 'balance.waibuzhuangtai'}),
-    key: 'externalState',
-    dataIndex: 'externalState',
-    render: (text: any, record: any) => <StatusTag type='default' title={record.externalStateName} />
+    title: intl.formatMessage({ id: 'balance.waibuzhuangtai' }),
+    key: 'status',
+    dataIndex: 'status',
+    render: (text: any, record: any) => <StatusTag type='default' title={record.status} />
  }];

  return (
    <PageHeaderWrapper>
      <Card>
        <StandardTable
-          // fetchTableData={params => loadingTableData(params)}
+          fetchTableData={params => loadingTableData(params)}
          columns={columns}
          currentRef={ref}
          rowKey="id"
@@ -94,9 +104,13 @@ const Search: React.FC = () => {
                useStateFilterSearchLinkageEffect(
                  $,
                  actions,
-                  'orderNo',
+                  'applyNo',
                  FORM_FILTER_PATH,
                )
+                useAsyncSelect(
+                  'status',
+                  fetchOptions(getSettleAccountsBusinessApplyAmountItemApplyAmountStatus),
+                );
              }}
              schema={{
                type: 'object',
@@ -108,12 +122,13 @@ const Search: React.FC = () => {
                      grid: true
                    },
                    properties: {
-                      orderNo: {
+                      applyNo: {
                        type: 'string',
                        "x-component": 'Search',
                        'x-component-props': {
-                          placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanhao'}),
+                          placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanhao' }),
                          align: 'flex-start',
+                          allowClear: true,
                        },
                      },
                    }
@@ -131,42 +146,41 @@ const Search: React.FC = () => {
                      },
                    },
                    properties: {
-                      "digest": {
+                      "applyAbstract": {
                        type: 'string',
                        'x-component-props': {
-                          placeholder: intl.formatMessage({id: 'balance.qingshuruqingkuandanzhaiyao'}),
+                          placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanzhaiyao' }),
+                          allowClear: true,
                        }
                      },
-                      "innerStatus": {
+                      "status": {
                        type: 'string',
                        "x-component-props": {
-                          placeholder: intl.formatMessage({id: 'balance.qingxuanzezhuangtai'})
+                          placeholder: intl.formatMessage({ id: 'balance.qingxuanzezhuangtai' }),
+                          allowClear: true,
                        },
-                        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 },
-                        ]
+                        enum: []
                      },
-                      "[startDate,endDate]": {
+                      "[createTimeStart,createTimeEnd]": {
                        type: 'string',
                        "x-component": "dateSelect",
                        "x-component-props": {
-                          placeholder: intl.formatMessage({id: 'balance.danjushijianquanbu'}),
+                          placeholder: intl.formatMessage({ id: 'balance.danjushijianquanbu' }),
+                          allowClear: true,
                        }
                      },
-                      "[startPayDate,endPayDate]": {
+                      "[expectPayTimeStart,expectPayTimeEnd]": {
                        type: 'string',
                        "x-component": "daterange",
                        "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: {
                        'x-component': 'Submit',
                        'x-component-props': {
-                          children: intl.formatMessage({id: 'balance.chaxun'}),
+                          children: intl.formatMessage({ id: 'balance.chaxun' }),
                        },
                      },
                    },