diff --git a/packages/app-operation/src/components/Biz/BizDetail.tsx b/packages/app-operation/src/components/Biz/BizDetail.tsx index bfb84bc..afaccfb 100644 --- a/packages/app-operation/src/components/Biz/BizDetail.tsx +++ b/packages/app-operation/src/components/Biz/BizDetail.tsx @@ -1,5 +1,4 @@ import { BizValueType, ButtonAccess } from '@/components'; -import column from '@/utils/column'; import { formLayout } from '@/utils/formLayout'; import { useIntl } from '@@/exports'; import { @@ -59,25 +58,21 @@ export default function BizDetail< // 平铺模式:直接垂直堆叠所有内容 if (formContextMode === 'flat') { - return ( - - {contextItems?.map((item, index) => ( - - {item.children} - - ))} + return contextItems?.map((item, index) => ( + + {item.children} - ); + )); } // Tab 模式:使用 tabs 渲染 @@ -149,17 +144,14 @@ export default function BizDetail< {(data, form) => { return ( - + params={{ data: data[`${method}VO`] }} @@ -170,10 +162,9 @@ export default function BizDetail< }) } columns={[...columns]} - column={column(data.isMobile, formContext)} /> - {renderFormContext(data, form, data.isMobile ? 24 : 18)} + {renderFormContext(data, form, 24)} ); }} @@ -207,13 +198,14 @@ export default function BizDetail< {(data, form) => { return ( - + params={{ data: data[`${method}VO`] }} @@ -224,10 +216,9 @@ export default function BizDetail< }) } columns={[...columns]} - column={column(data.isMobile, formContext)} /> - {renderFormContext(data, form, data.isMobile ? 24 : 18)} + {renderFormContext(data, form, 24)} ); }} diff --git a/packages/app-operation/src/components/PaymentRecord/PaymentRecordList.tsx b/packages/app-operation/src/components/PaymentRecord/PaymentRecordList.tsx index baac304..e52a28a 100644 --- a/packages/app-operation/src/components/PaymentRecord/PaymentRecordList.tsx +++ b/packages/app-operation/src/components/PaymentRecord/PaymentRecordList.tsx @@ -10,6 +10,7 @@ import React, { useRef, useState } from 'react'; interface IPaymentRecordListProps { ghost?: boolean; paymentRecordId?: BusinessAPI.PaymentRecordVO['paymentRecordId']; + paymentTaskVO?: BusinessAPI.PaymentTaskVO; search?: boolean; onValueChange?: () => void; mode?: ModeType; @@ -24,6 +25,7 @@ export default function PaymentRecordList(props: IPaymentRecordListProps) { mode = 'page', trigger, onValueChange, + paymentTaskVO, } = props; const intl = useIntl(); const intlPrefix = 'paymentRecord'; @@ -132,7 +134,6 @@ export default function PaymentRecordList(props: IPaymentRecordListProps) { dataIndex: 'accountNumber', key: 'accountNumber', ellipsis: true, - width: 180, }, { title: intl.formatMessage({ id: intlPrefix + '.column.paidAmount' }), @@ -277,6 +278,7 @@ export default function PaymentRecordList(props: IPaymentRecordListProps) { modeType={mode} onValueChange={onValueChange} container={{ + ghost, fieldProps: { ghost, }, @@ -330,6 +332,9 @@ export default function PaymentRecordList(props: IPaymentRecordListProps) { ...(activeKey !== 'ALL' && { paidState: activeKey, }), + ...(paymentTaskVO && { + paymentTaskId: paymentTaskVO.paymentTaskId, + }), targetType: 'SUPPLIER', }, toolbar: { diff --git a/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx b/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx index aed5763..b6ac318 100644 --- a/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx +++ b/packages/app-operation/src/components/PaymentTask/PaymentTaskList.tsx @@ -4,6 +4,7 @@ import { InvoicerStatisticCard, ModeType, OrderSupplierInvoiceList, + PaymentRecordList, PaymentTaskCreate, PaymentTaskPay, SupplierFarmerList, @@ -416,6 +417,20 @@ export default function PaymentTaskList(props: IPaymentTaskListProps) { }, ] : []), + // 付款记录 Tab + { + label: intl.formatMessage({ + id: intlPrefix + '.detail.tab.paymentRecord', + }), + key: 'paymentRecord', + children: ( + + ), + }, ]; }; diff --git a/packages/app-operation/src/locales/zh-CN.ts b/packages/app-operation/src/locales/zh-CN.ts index 0c3b66c..819910b 100644 --- a/packages/app-operation/src/locales/zh-CN.ts +++ b/packages/app-operation/src/locales/zh-CN.ts @@ -2641,6 +2641,7 @@ export default { '(实际瓜农≠开票方,注意核实收款人)', noInvoiceList: '无发票车次列表', 'noInvoiceList.subTitle': '(需微信个人支付,必须上传截图)', + paymentRecord: '付款记录', }, invoiceType: { selfInvoice: '自开票', @@ -2720,7 +2721,7 @@ export default { totalAmount: '总应付金额', paidAmount: '已付金额', unpaidAmount: '剩余付款金额', - paymentRecordSn: '任务编号', + paymentTaskSn: '任务编号', taskName: '任务名称', }, currentPayment: { diff --git a/packages/app-operation/src/utils/column.ts b/packages/app-operation/src/utils/column.ts deleted file mode 100644 index 5f83bf5..0000000 --- a/packages/app-operation/src/utils/column.ts +++ /dev/null @@ -1,14 +0,0 @@ -export default function column(isMobile?: boolean, formContext?: any) { - if (isMobile || formContext !== undefined) { - return 1; - } - - return { - xs: 1, - sm: 1, - md: 2, - lg: 2, - xl: 2, - xxl: 3, - }; -}