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

feat: 业务对账&业务对账协同详情字段修改

parent e9161e62
...@@ -53,7 +53,11 @@ const SearchDetail = () => { ...@@ -53,7 +53,11 @@ const SearchDetail = () => {
}, [pathPci]) }, [pathPci])
const _getDetail = () => { const _getDetail = () => {
getSettleAccountsBusinessReconciliationDetailReconciliation({ reconciliationId: id, reconciliationNo: no }).then((res) => { const _param: any = {
reconciliationId: id,
reconciliationNo: no
}
getSettleAccountsBusinessReconciliationDetailReconciliation(_param).then((res) => {
if (res.code === 1000) { if (res.code === 1000) {
const data = res.data; const data = res.data;
setDataSource(data); setDataSource(data);
...@@ -65,7 +69,7 @@ const SearchDetail = () => { ...@@ -65,7 +69,7 @@ const SearchDetail = () => {
{ label: intl.formatMessage({ id: 'balance.danjuzhaiyao' }), extra: data.reconciliationAbstract, type: 'text' }, { label: intl.formatMessage({ id: 'balance.danjuzhaiyao' }), extra: data.reconciliationAbstract, type: 'text' },
{ label: intl.formatMessage({ id: 'balance.duizhangdanleixing' }), extra: data.reconciliationType, type: 'text' }, { label: intl.formatMessage({ id: 'balance.duizhangdanleixing' }), extra: data.reconciliationType, type: 'text' },
{ label: intl.formatMessage({ id: 'balance.beizhu' }), extra: data.remark, type: 'text' }, { label: intl.formatMessage({ id: 'balance.beizhu' }), extra: data.remark, type: 'text' },
{ label: intl.formatMessage({ id: 'balance.zhuangtai' }), extra: <StatusTag type='primary' title={data.status} />, type: 'text' }, { label: intl.formatMessage({ id: 'balance.zhuangtai' }), extra: <StatusTag type='primary' title={data.statusName} />, type: 'text' },
] ]
}, },
{ {
...@@ -121,7 +125,8 @@ const SearchDetail = () => { ...@@ -121,7 +125,8 @@ const SearchDetail = () => {
title: '发货批次', title: '发货批次',
key: 'deliveryBatch', key: 'deliveryBatch',
dataIndex: 'deliveryBatch', dataIndex: 'deliveryBatch',
width: 150 width: 150,
render: (text: any, record: any) => `第${text}批`,
}, },
{ {
title: '发货单号', title: '发货单号',
...@@ -231,7 +236,7 @@ const SearchDetail = () => { ...@@ -231,7 +236,7 @@ const SearchDetail = () => {
tabLink={_tabs} tabLink={_tabs}
components={ components={
<Fragment> <Fragment>
<ProgressLayout effect={[{ title: '外部流转', state: 1, logs: [] }]} /> <ProgressLayout effect={[{ title: '外部流转', state: 1, logs: dataSource?.externalLogStates }]} />
<CommonLayout layoutId="basicLayout" title={intl.formatMessage({ id: 'balance.jibenxinxi' })} effect={basicEffect} commonSpan={12} /> <CommonLayout layoutId="basicLayout" title={intl.formatMessage({ id: 'balance.jibenxinxi' })} effect={basicEffect} commonSpan={12} />
<Card id='billLayout' title={intl.formatMessage({ id: 'balance.duizhangdanmingxi' })}> <Card id='billLayout' title={intl.formatMessage({ id: 'balance.duizhangdanmingxi' })}>
<StandardTable <StandardTable
......
...@@ -60,7 +60,11 @@ const SearchDetail = () => { ...@@ -60,7 +60,11 @@ const SearchDetail = () => {
}, [pathPci]) }, [pathPci])
const _getDetail = () => { const _getDetail = () => {
getSettleAccountsBusinessReconciliationDetailReconciliation({ reconciliationId: id, reconciliationNo: no }).then((res) => { const _params: any = {
reconciliationId: id,
reconciliationNo: no
}
getSettleAccountsBusinessReconciliationDetailReconciliation(_params).then((res) => {
if (res.code === 1000) { if (res.code === 1000) {
const data = res.data; const data = res.data;
setDataSource(data); setDataSource(data);
...@@ -72,7 +76,7 @@ const SearchDetail = () => { ...@@ -72,7 +76,7 @@ const SearchDetail = () => {
{ label: intl.formatMessage({ id: 'balance.danjuzhaiyao' }), extra: data.reconciliationAbstract, type: 'text' }, { label: intl.formatMessage({ id: 'balance.danjuzhaiyao' }), extra: data.reconciliationAbstract, type: 'text' },
{ label: intl.formatMessage({ id: 'balance.duizhangdanleixing' }), extra: data.reconciliationType, type: 'text' }, { label: intl.formatMessage({ id: 'balance.duizhangdanleixing' }), extra: data.reconciliationType, type: 'text' },
{ label: intl.formatMessage({ id: 'balance.beizhu' }), extra: data.remark, type: 'text' }, { label: intl.formatMessage({ id: 'balance.beizhu' }), extra: data.remark, type: 'text' },
{ label: intl.formatMessage({ id: 'balance.zhuangtai' }), extra: <StatusTag type='primary' title={data.status} />, type: 'text' }, { label: intl.formatMessage({ id: 'balance.zhuangtai' }), extra: <StatusTag type='primary' title={data.statusName} />, type: 'text' },
] ]
}, },
{ {
...@@ -128,7 +132,8 @@ const SearchDetail = () => { ...@@ -128,7 +132,8 @@ const SearchDetail = () => {
title: '发货批次', title: '发货批次',
key: 'deliveryBatch', key: 'deliveryBatch',
dataIndex: 'deliveryBatch', dataIndex: 'deliveryBatch',
width: 150 width: 150,
render: (text: any, record: any) => `第${text}批`,
}, },
{ {
title: '发货单号', title: '发货单号',
...@@ -265,7 +270,7 @@ const SearchDetail = () => { ...@@ -265,7 +270,7 @@ const SearchDetail = () => {
tabLink={_tabs} tabLink={_tabs}
components={ components={
<Fragment> <Fragment>
<ProgressLayout effect={[{ title: '外部流转', state: 1, logs: [] }]} /> <ProgressLayout effect={[{ title: '外部流转', state: 1, logs: dataSource?.externalLogStates }]} />
<CommonLayout layoutId="basicLayout" title={intl.formatMessage({ id: 'balance.jibenxinxi' })} effect={basicEffect} commonSpan={12} /> <CommonLayout layoutId="basicLayout" title={intl.formatMessage({ id: 'balance.jibenxinxi' })} effect={basicEffect} commonSpan={12} />
<Card id='billLayout' title={intl.formatMessage({ id: 'balance.duizhangdanmingxi' })}> <Card id='billLayout' title={intl.formatMessage({ id: 'balance.duizhangdanmingxi' })}>
<StandardTable <StandardTable
......
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