feat(reconciliation): 添加对账发票列表中的开票公司字段

- 在 DealerPaymentAccountList 组件中新增 accountId 参数
- 在 ReconciliationInvoiceList 中引入 DealerPaymentAccountList 组件并显示开票公司信息
- 新增开票公司列用于显示经销商支付账户信息
- 将发票日期字段从 dateTime 类型改为 dateRange 类型并调整显示格式
- 更新业务服务类型定义中对账发票相关字段
- 添加经销商、公司和支付账户信息的对象类型定义
- 在中文语言包中增加开票公司字段翻译

packages/app-operation/src/components/Dealer/DealerPaymentAccountList.tsx

@@ -14,6 +14,7 @@ import React from 'react';
 interface IDealerPaymentAccountListProps {
 	ghost?: boolean;
 	dealerVO?: BusinessAPI.DealerVO;
+	accountId: BusinessAPI.DealerPaymentAccountVO['accountId'];
 	search?: boolean;
 	onValueChange?: () => void;
 	mode?: ModeType;
@@ -30,6 +31,7 @@ export default function DealerPaymentAccountList(
 		mode = 'page',
 		trigger,
 		onValueChange,
+		accountId,
 	} = props;
 
 	const intl = useIntl();
@@ -239,9 +241,11 @@ export default function DealerPaymentAccountList(
 			update={{
 				formType: 'drawer',
 				formContext,
+				trigger,
 			}}
 			destroy={{}}
 			detail={{
+				rowId: accountId,
 				formType: 'drawer',
 				columns: detailColumns,
 				formContext: detailContext,

packages/app-operation/src/components/Reconciliation/ReconciliationInvoiceList.tsx

@@ -1,6 +1,7 @@
 import {
 	BizContainer,
 	BizValueType,
+	DealerPaymentAccountList,
 	DealerSelect,
 	ModeType,
 	ProFormUploadMaterial,
@@ -17,6 +18,7 @@ import {
 	ProFormSelect,
 } from '@ant-design/pro-components';
 import { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
+import dayjs from 'dayjs';
 import React from 'react';
 
 interface IReconciliationInvoiceListProps {
@@ -61,6 +63,27 @@ export default function ReconciliationInvoiceList(
 			valueType: 'dealer',
 			hidden: !!dealerId,
 		},
+		{
+			title: intl.formatMessage({ id: intlPrefix + '.column.account' }),
+			dataIndex: 'dealerPaymentAccountVO',
+			key: 'accountId',
+			render: (_, record) => {
+				const { dealerPaymentAccountVO } = record;
+				return (
+					dealerPaymentAccountVO && (
+						<DealerPaymentAccountList
+							ghost={true}
+							mode={'detail'}
+							search={false}
+							accountId={dealerPaymentAccountVO.accountId}
+							trigger={() => {
+								return <a>{dealerPaymentAccountVO.companyName}</a>;
+							}}
+						/>
+					)
+				);
+			},
+		},
 		{
 			title: intl.formatMessage({ id: intlPrefix + '.column.company' }),
 			dataIndex: 'companyVO',
@@ -83,8 +106,12 @@ export default function ReconciliationInvoiceList(
 			title: intl.formatMessage({ id: intlPrefix + '.column.invoiceDate' }),
 			dataIndex: 'invoiceDate',
 			key: 'invoiceDate',
-			valueType: 'dateTime',
+			valueType: 'dateRange',
-			search: false,
+			render: (_, record) => (
+				<span>
+					{record.invoiceDate && dayjs(record.invoiceDate).format('YYYY-MM-DD')}
+				</span>
+			),
 		},
 	];
 

packages/app-operation/src/locales/zh-CN.ts

@@ -3136,6 +3136,7 @@ export default {
 			invoiceSn: '发票编码',
 			dealer: '经销商',
 			reconciliationSn: '对账编号',
+			account: '开票公司',
 			company: '入账公司',
 			invoiceAmount: '发票金额',
 			invoiceDate: '发票日期',

packages/app-operation/src/services/business/typings.d.ts

@@ -5644,8 +5644,16 @@ declare namespace BusinessAPI {
 		remark?: string;
 		/** 状态：1_启用；0_禁用； */
 		status?: boolean;
-		/** 对账发票ID */
+		/** 经销商ID */
-		reconciliationInvoiceId?: string;
+		dealerId?: string;
+		/** 公司ID */
+		companyId?: string;
+		/** 对账ID */
+		reconciliationId?: string;
+		/** 发票日期 */
+		invoiceDate?: string;
+		/** 发票编号 */
+		invoiceSn?: string;
 		offset?: number;
 	};
 
@@ -5704,6 +5712,12 @@ declare namespace BusinessAPI {
 		remark?: string;
 		/** 创建时间 */
 		createdAt?: string;
+		/** 经销商信息 */
+		dealerVO?: DealerVO;
+		/** 公司信息 */
+		companyVO?: CompanyVO;
+		/** 经销商账户信息 */
+		dealerPaymentAccountVO?: DealerPaymentAccountVO;
 	};
 
 	type ReconciliationListQry = {