Commit a6e79be4 authored by 卢均锐's avatar 卢均锐

feat: 业务对账&业务对账协同对接完成

-修改对应字段 -发票信息样式修改 -删除多余代码
parent 53f4800e
import React, { Fragment, useEffect, useState, useMemo, useRef } from 'react';
import { Badge, Popconfirm, Button } from 'antd';
import { Row, Col } from 'antd';
import { getIntl, history } from 'umi';
import { CheckCircleOutlined } from '@ant-design/icons';
import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from '@linkseeks/god';
import { GlobalConfig } from '@/global/config'
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat';
import StatusTag from '@/components/StatusTag';
import PeripheralLayout from '@/pages/transaction/purchaseAbility/components/detail';
import Card from '@/pages/transaction/purchaseAbility/components/card';
import ProgressLayout, { ProgressValue } from '@/pages/transaction/purchaseAbility/components/detail/components/progressCommonLayout';
import ProgressLayout from '@/pages/transaction/purchaseAbility/components/detail/components/progressCommonLayout';
import CommonLayout from '@/pages/transaction/purchaseAbility/components/detail/components/bidCommonLayout';
import { getSettleAccountsBusinessReconciliationDetailReconciliation, getSettleAccountsBusinessReconciliationReconciliationRowList } from '@/services/SettleV2Api'
import BusinessFileLayout from '../../components/BusinessFileLayout';
import RecordCommonLayout from '../../components/RecordCommonLayout';
import BusinessInvoiceCard from '../../components/BusinessInvoiceCard';
const intl = getIntl();
const TABLINK = [
......@@ -42,7 +39,6 @@ const SearchDetail = () => {
const [dataSource, setDataSource] = useState<any>({});
const currentRef = useRef({});
const [basicEffect, setBasicEffect] = useState<any>([]);
const [invoiceEffect, setInvoiceEffect] = useState<any>([]);
const _tabs = useMemo(() => {
let _list = [];
......@@ -83,22 +79,6 @@ const SearchDetail = () => {
},
]
)
setInvoiceEffect(
[
{
col: [
{ label: intl.formatMessage({ id: 'balance.kuaididanhao' }), extra: data?.invoiceMessages?.expressNumber || '-', type: 'text' },
{ label: intl.formatMessage({ id: 'balance.kuaidigongsi' }), extra: data?.invoiceMessages?.expressCompany || '-', type: 'text' },
]
},
{
col: [
{ label: intl.formatMessage({ id: 'balance.jisongriqi' }), extra: data?.invoiceMessages?.sendDate || '-', type: 'text' },
{ label: intl.formatMessage({ id: 'balance.fapiaohaoma' }), extra: data?.invoiceMessages?.numbers?.length > 0 ? data?.invoiceMessages?.numbers.map((item) => <div>{item.invoiceNumber}({item.invoiceDate})</div>) : '-', type: 'text' },
]
},
]
)
}
})
}
......@@ -248,7 +228,17 @@ const SearchDetail = () => {
/>
</Card>
<BusinessFileLayout fetchdata={dataSource?.files} editAble={false} />
<CommonLayout layoutId="invoiceLayout" title={intl.formatMessage({ id: 'balance.fapiaoxinxi' })} effect={invoiceEffect} commonSpan={12} />
<Card id='invoiceLayout' title={intl.formatMessage({ id: 'balance.fapiaoxinxi' })}>
{dataSource?.invoiceMessages?.numbers.length > 0 ? (
<Row gutter={[8, 8]}>
{dataSource?.invoiceMessages?.numbers.map((item, index) => (
<Col span={6} key={`BusinessInvoiceCard_${index}`}>
<BusinessInvoiceCard data={item} />
</Col>
))}
</Row>
) : '-'}
</Card>
<RecordCommonLayout effect={{ externalLogs: dataSource?.records ?? [] }} />
</Fragment>
}
......
import React, { useEffect, useState, useMemo, useRef } from 'react';
import { Form, Button, Row, Col, Input, InputNumber, Table, message } from 'antd';
import { Form, Button, Row, Col, Input, Table, message } from 'antd';
import { ColumnType } from 'antd/lib/table/interface';
import { CheckCircleOutlined, PlusOutlined } from '@ant-design/icons';
import { getIntl, history, Prompt } from 'umi';
import { GlobalConfig } from '@/global/config'
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat';
import StatusTag from '@/components/StatusTag';
import { getSettleAccountsBusinessReconciliationDetailReconciliation, getSettleAccountsBusinessReconciliationReconciliationRowList, postSettleAccountsBusinessReconciliationUpdateReconciliation, postSettleAccountsBusinessReconciliationSaveReconciliation, postSettleAccountsBusinessReconciliationGenerateReconciliation } from '@/services/SettleV2Api'
import PeripheralLayout from '@/pages/transaction/purchaseAbility/components/detail';
import Card from '@/pages/transaction/purchaseAbility/components/card';
......
import React, { useRef, useState } from 'react'
import React, { useRef } from 'react'
import { Card, Typography, Space, Button, Popconfirm, Dropdown, Menu, message } from 'antd'
import { CaretDownOutlined } from '@ant-design/icons'
import { ColumnType } from 'antd/lib/table/interface';
......
......@@ -12,7 +12,6 @@ import StatusTag from '@/components/StatusTag';
import { formatTimeString } from '@/utils'
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { getSettleAccountsBusinessReconciliationToReconciliationList, getSettleAccountsBusinessReconciliationItemPayType } from '@/services/SettleV2Api'
import { createFormActions } from '@formily/antd'
import { getIntl, history } from 'umi';
......@@ -89,13 +88,13 @@ const ReadyReconciliation: React.FC = () => {
render: (text: any, record: any) => <StatusTag type='primary' title={text} />
}, {
title: intl.formatMessage({ id: 'balance.dingdanleixing' }),
key: 'orderType',
dataIndex: 'orderType',
key: 'orderTypeName',
dataIndex: 'orderTypeName',
render: (text: any, record: any) => <StatusTag type='primary' title={text} />
}, {
title: intl.formatMessage({ id: 'balance.danjuleixing' }),
key: 'billType',
dataIndex: 'billType',
key: 'billTypeName',
dataIndex: 'billTypeName',
render: (text: any, record: any) => <StatusTag type='primary' title={text} />
}];
......
......@@ -12,7 +12,6 @@ import StatusTag from '@/components/StatusTag';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getAuth } from '@/utils/auth'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import { getSettleAccountsBusinessReconciliationVendorReconciliationList, getSettleAccountsBusinessReconciliationItemReconciliationStatus, getSettleAccountsBusinessReconciliationVendorReconciliationExport } from '@/services/SettleV2Api'
import { createFormActions } from '@formily/antd'
import { getIntl, Link } from 'umi';
......
import React, { Fragment, useEffect, useState, useMemo, useRef } from 'react';
import { Badge, Popconfirm, Button } from 'antd';
import { Row, Col, Popconfirm, Button } from 'antd';
import { getIntl, history } from 'umi';
import { CheckCircleOutlined } from '@ant-design/icons';
import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from '@linkseeks/god';
import { GlobalConfig } from '@/global/config'
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat';
import StatusTag from '@/components/StatusTag';
import PeripheralLayout from '@/pages/transaction/purchaseAbility/components/detail';
import Card from '@/pages/transaction/purchaseAbility/components/card';
import ProgressLayout, { ProgressValue } from '@/pages/transaction/purchaseAbility/components/detail/components/progressCommonLayout';
import ProgressLayout from '@/pages/transaction/purchaseAbility/components/detail/components/progressCommonLayout';
import CommonLayout from '@/pages/transaction/purchaseAbility/components/detail/components/bidCommonLayout';
import { getSettleAccountsBusinessReconciliationDetailReconciliation, getSettleAccountsBusinessReconciliationReconciliationRowList, postSettleAccountsBusinessReconciliationTeamworkConfirmReconciliation, postSettleAccountsBusinessReconciliationTeamworkGenerateApplyMount } from '@/services/SettleV2Api'
import BusinessFileLayout from '../../components/BusinessFileLayout';
import RecordCommonLayout from '../../components/RecordCommonLayout';
import BusinessInvoiceCard from '../../components/BusinessInvoiceCard';
import ModalOperate from '../components/modalOperate'
......@@ -44,7 +43,6 @@ const SearchDetail = () => {
const [dataSource, setDataSource] = useState<any>({});
const currentRef = useRef({});
const [basicEffect, setBasicEffect] = useState<any>([]);
const [invoiceEffect, setInvoiceEffect] = useState<any>([]);
const [modalVisible, setModalVisible] = useState<boolean>(false);
const _editAble = useMemo(() => {
......@@ -90,22 +88,6 @@ const SearchDetail = () => {
},
]
)
setInvoiceEffect(
[
{
col: [
{ label: intl.formatMessage({ id: 'balance.kuaididanhao' }), extra: data?.invoiceMessages?.expressNumber || '-', type: 'text' },
{ label: intl.formatMessage({ id: 'balance.kuaidigongsi' }), extra: data?.invoiceMessages?.expressCompany || '-', type: 'text' },
]
},
{
col: [
{ label: intl.formatMessage({ id: 'balance.jisongriqi' }), extra: data?.invoiceMessages?.sendDate || '-', type: 'text' },
{ label: intl.formatMessage({ id: 'balance.fapiaohaoma' }), extra: data?.invoiceMessages?.numbers?.length > 0 ? data?.invoiceMessages?.numbers.map((item) => <div>{item.invoiceNumber}({item.invoiceDate})</div>) : '-', type: 'text' },
]
},
]
)
}
})
}
......@@ -244,9 +226,10 @@ const SearchDetail = () => {
}
const _handleSubmit = () => {
postSettleAccountsBusinessReconciliationTeamworkGenerateApplyMount({ id }).then((res) => {
const _params: any = { reconciliationId: id }
postSettleAccountsBusinessReconciliationTeamworkGenerateApplyMount(_params).then((res) => {
if (res.code === 1000) {
history.push('/memberCenter/balance/businessReconciliation/readyAdd/funds', { data: res.data })
}
})
}
......@@ -290,7 +273,17 @@ const SearchDetail = () => {
/>
</Card>
<BusinessFileLayout fetchdata={dataSource?.files} editAble={false} />
<CommonLayout layoutId="invoiceLayout" title={intl.formatMessage({ id: 'balance.fapiaoxinxi' })} effect={invoiceEffect} commonSpan={12} />
<Card id='invoiceLayout' title={intl.formatMessage({ id: 'balance.fapiaoxinxi' })}>
{dataSource?.invoiceMessages?.numbers.length > 0 ? (
<Row gutter={[8, 8]}>
{dataSource?.invoiceMessages?.numbers.map((item, index) => (
<Col span={6} key={`BusinessInvoiceCard_${index}`}>
<BusinessInvoiceCard data={item} />
</Col>
))}
</Row>
) : '-'}
</Card>
<RecordCommonLayout effect={{ externalLogs: dataSource?.records ?? [] }} />
</Fragment>
}
......
import React, { useRef, useState } from 'react'
import { Card, Typography, Space, Button } from 'antd'
import React, { useRef } from 'react'
import { Card, Typography, Space } from 'antd'
import { ColumnType } from 'antd/lib/table/interface';
import StandardTable from '@/components/StandardTable';
import { PageHeaderWrapper } from '@ant-design/pro-layout'
......
import React, { useRef, useState } from 'react'
import { Card, Typography, Space, Button } from 'antd'
import React, { useRef } from 'react'
import { Card, Typography, Space } from 'antd'
import { ColumnType } from 'antd/lib/table/interface';
import StandardTable from '@/components/StandardTable';
import { PageHeaderWrapper } from '@ant-design/pro-layout'
......
.invoiceCard {
border: 1px solid #EDEEEF;
padding: 16px;
.title {
font-size: 12px;
color: #91959B;
line-height: 16px;
span {
color: #252D37;
}
}
}
import React from 'react';
import { priceFormat } from '@/utils/numberFomat'
import styles from './index.less';
interface BusinessInvoiceCardData {
invoiceNumber: number,
invoiceDate: string,
invoiceMoney: number
}
interface BusinessInvoiceCardProps {
data: BusinessInvoiceCardData
}
const BusinessInvoiceCard: React.FC<BusinessInvoiceCardProps> = (props: BusinessInvoiceCardProps) => {
const { data } = props;
return (
<div className={styles.invoiceCard}>
<div className={styles.title}>
发票号码:<span>{data.invoiceNumber}</span>
</div>
<div className={styles.title}>
发票日期:<span>{data.invoiceDate}</span>
</div>
<div className={styles.title}>
发票金额:<span>¥ {priceFormat(data.invoiceMoney)}</span>
</div>
</div>
);
}
export default BusinessInvoiceCard;
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