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

fix: [22557] 待对账列表缺少查看按钮

-完善业务对账相关按钮权限
parent a0487c5d
# btnCode 是pass 平台配置唯一表示
# btnCode 是pass 平台配置唯一表示
......@@ -1176,8 +1176,39 @@
- 4.应收账款管理-开票管理
invoice.edit 开票管理-开票 开票管理-开票-按钮
invoice.export 开票管理-导出 开票管理-导出-按钮
- 5.业务对账
- 5.待对账列表
businessReconciliationReadyReconciliation.shengchengduizhangdan 待对账列表-生成对账单 待对账列表-生成对账单-按钮
- 5.对帐单查询
businessReconciliationSearch.see 对帐单查询-查看 对帐单查询-查看-按钮
businessReconciliationSearch.export 对帐单查询-导出 对帐单查询-导出-按钮
- 5.待新增对账单
businessReconciliationReadyAdd.see 待新增对账单-查看 待新增对账单-查看-按钮
businessReconciliationReadyAdd.edit 待新增对账单-编辑 待新增对账单-编辑-按钮
businessReconciliationReadyAdd.del 待新增对账单-删除 待新增对账单-删除-按钮
businessReconciliationReadyAdd.submit 待新增对账单-提交 待新增对账单-提交-按钮
- 6.业务对账协同
- 6.对帐单查询
businessReconciliationCollaborationSearch.see 对帐单查询-查看 对帐单查询-查看-按钮
businessReconciliationCollaborationSearch.export 对帐单查询-导出 对帐单查询-导出-按钮
- 6.待确认对账单
businessReconciliationCollaborationReadyConfirm.see 对帐单查询-查看 对帐单查询-查看-按钮
businessReconciliationCollaborationReadyConfirm.confirm 对帐单查询-确认 对帐单查询-确认-按钮
- 6.待请款
businessReconciliationCollaborationReadyPay.see 待请款-查看 待请款-查看-按钮
businessReconciliationCollaborationReadyPay.qingkuan 待请款-请款 待新增对账单-请款-按钮
- 7.业务请款
- 7.请款单查询
businessRequestFundsSearch.see 请款单查询-查看 请款单查询-查看-按钮
- 7.待确认对账单
businessRequestFundsAdmin.see 请款单管理-查看 请款单管理-查看-按钮
businessRequestFundsAdmin.confirm 请款单管理-确认提交 请款单管理-确认提交-按钮
businessRequestFundsAdmin.edit 请款单管理-编辑 请款单管理-编辑-按钮
businessRequestFundsAdmin.del 请款单管理-删除 请款单管理-删除-按钮
businessRequestFundsAdmin.add 请款单管理-新增 请款单管理-新增-按钮
- 8.业务请款协同
- 8.业务请款协同
businessRequestFundsCollaborationSearch.see 业务请款协同-查看 业务请款协同-查看-按钮
......
......@@ -9,6 +9,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import AuthButton from '@/components/AuthButton';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { createFormActions } from '@formily/antd'
......@@ -45,7 +47,7 @@ const ReadyAdd: React.FC = () => {
key: 'reconciliationNo',
dataIndex: 'reconciliationNo',
render: (text: any, record: any) => (
<Link to={`readyAdd/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
AuthUrl('businessReconciliationReadyAdd.see') && <Link to={`readyAdd/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......@@ -82,15 +84,18 @@ const ReadyAdd: React.FC = () => {
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>}
{record.status === 1 &&
<AuthButton btnCode='businessReconciliationReadyAdd.submit'>
<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>
</AuthButton>}
<Dropdown overlay={() => (
<Menu onClick={(e) => handleMenuClick(e, record)}>
<Menu.Item key="1">{intl.formatMessage({ id: 'balance.bianji' })}</Menu.Item>
{record.status === 1 && <Popconfirm title={intl.formatMessage({ id: 'balance.querenyaoshanchuma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })} onConfirm={() => fetchDelete(record.reconciliationId)}>
{AuthUrl('businessReconciliationReadyAdd.edit') && <Menu.Item key="1">{intl.formatMessage({ id: 'balance.bianji' })}</Menu.Item>}
{AuthUrl('businessReconciliationReadyAdd.del') && record.status === 1 && <Popconfirm title={intl.formatMessage({ id: 'balance.querenyaoshanchuma' })} 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>
......
......@@ -9,6 +9,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import AuthButton from '@/components/AuthButton';
import { formatTimeString } from '@/utils'
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import { priceFormat } from '@/utils/numberFomat'
......@@ -513,7 +514,9 @@ const ReadyReconciliation: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button size='middle' onClick={_generate}>{intl.formatMessage({ id: 'balance.shengchengduizhangdan' })}</Button>
<AuthButton btnCode='businessReconciliationReadyReconciliation.shengchengduizhangdan'>
<Button size='middle' onClick={_generate}>{intl.formatMessage({ id: 'balance.shengchengduizhangdan' })}</Button>
</AuthButton>
</Space>
),
}}
......
......@@ -9,6 +9,8 @@ import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import AuthButton from '@/components/AuthButton';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getAuth } from '@/utils/auth'
......@@ -47,7 +49,7 @@ const Search: React.FC = () => {
key: 'reconciliationNo',
dataIndex: 'reconciliationNo',
render: (text: any, record: any) => (
<Link to={`search/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
AuthUrl('businessReconciliationSearch.see') &&<Link to={`search/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......@@ -197,7 +199,9 @@ const Search: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button size='middle' onClick={_exportFunc}>{intl.formatMessage({ id: 'balance.daochu' })}</Button>
<AuthButton btnCode='businessReconciliationSearch.export'>
<Button size='middle' onClick={_exportFunc}>{intl.formatMessage({ id: 'balance.daochu' })}</Button>
</AuthButton>
</Space>
),
}}
......
......@@ -8,6 +8,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getSettleAccountsBusinessReconciliationTeamworkConfirmReconciliationList } from '@/services/SettleV2Api'
......@@ -43,7 +44,7 @@ const ReadyConfirm: React.FC = () => {
key: 'reconciliationNo',
dataIndex: 'reconciliationNo',
render: (text: any, record: any) => (
<Link to={`readyConfirm/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
AuthUrl('businessReconciliationCollaborationReadyConfirm.see') && <Link to={`readyConfirm/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......@@ -78,7 +79,7 @@ const ReadyConfirm: React.FC = () => {
title: intl.formatMessage({ id: 'balance.caozuo' }),
key: 'operate',
dataIndex: 'operate',
render: (text: any, record: any) => <Link to={`readyConfirm/detail?id=${record.reconciliationId}&no=${record.reconciliationNo}`}>{intl.formatMessage({ id: 'balance.queren' })}</Link>
render: (text: any, record: any) => AuthUrl('businessReconciliationCollaborationReadyConfirm.confirm') && <Link to={`readyConfirm/detail?id=${record.reconciliationId}&no=${record.reconciliationNo}`}>{intl.formatMessage({ id: 'balance.queren' })}</Link>
}];
return (
......
......@@ -8,6 +8,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getSettleAccountsBusinessReconciliationTeamworkTobeApplyamountList } from '@/services/SettleV2Api'
......@@ -43,7 +44,7 @@ const ReadyPay: React.FC = () => {
key: 'reconciliationNo',
dataIndex: 'reconciliationNo',
render: (text: any, record: any) => (
<Link to={`readyPay/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
AuthUrl('businessReconciliationCollaborationReadyPay.see') && <Link to={`readyPay/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......@@ -78,7 +79,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=${record.reconciliationNo}`}>{intl.formatMessage({ id: 'balance.qingkuan' })}</Link>
render: (text: any, record: any) => AuthUrl('businessReconciliationCollaborationReadyPay.qingkuan') && <Link to={`readyPay/detail?id=${record.reconciliationId}&no=${record.reconciliationNo}`}>{intl.formatMessage({ id: 'balance.qingkuan' })}</Link>
}];
return (
......
......@@ -9,6 +9,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import AuthButton from '@/components/AuthButton';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getAuth } from '@/utils/auth'
......@@ -48,7 +50,7 @@ const Search: React.FC = () => {
key: 'reconciliationNo',
dataIndex: 'reconciliationNo',
render: (text: any, record: any) => (
<Link to={`search/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
AuthUrl('businessReconciliationCollaborationSearch.see') && <Link to={`search/preview?id=${record.reconciliationId}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......@@ -198,7 +200,9 @@ const Search: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button size='middle' onClick={_exportFunc}>{intl.formatMessage({ id: 'balance.daochu' })}</Button>
<AuthButton btnCode='businessReconciliationCollaborationSearch.export'>
<Button size='middle' onClick={_exportFunc}>{intl.formatMessage({ id: 'balance.daochu' })}</Button>
</AuthButton>
</Space>
),
}}
......
......@@ -9,6 +9,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import AuthButton from '@/components/AuthButton';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getSettleAccountsBusinessApplyAmountToAddApplyAmountList, postSettleAccountsBusinessApplyAmountSubmitApplyAmount, postSettleAccountsBusinessApplyAmountDelete } from '@/services/SettleV2Api'
......@@ -41,7 +43,7 @@ const Admin: React.FC = () => {
key: 'applyNo',
dataIndex: 'applyNo',
render: (text: any, record: any) => (
<Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
AuthUrl('businessRequestFundsAdmin.see') && <Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......@@ -93,15 +95,17 @@ const Admin: React.FC = () => {
dataIndex: 'operate',
align: 'center',
render: (_: any, record: any) => <>
<Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })} onConfirm={() => fetchSubmitBatch(record.id)}>
<Button type='link'>
{intl.formatMessage({ id: 'balance.tijiao' })}
</Button>
</Popconfirm>
<AuthButton btnCode='businessRequestFundsAdmin.confirm'>
<Popconfirm title={intl.formatMessage({ id: 'balance.quedingyaotijiaoma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })} onConfirm={() => fetchSubmitBatch(record.id)}>
<Button type='link'>
{intl.formatMessage({ id: 'balance.tijiao' })}
</Button>
</Popconfirm>
</AuthButton>
<Dropdown overlay={() => (
<Menu onClick={(e) => handleMenuClick(e, record)}>
<Menu.Item key="1">{intl.formatMessage({ id: 'balance.bianji' })}</Menu.Item>
{record.hasSubmit && (
{AuthUrl('businessRequestFundsAdmin.edit') && <Menu.Item key="1">{intl.formatMessage({ id: 'balance.bianji' })}</Menu.Item>}
{AuthUrl('businessRequestFundsAdmin.del') && record.hasSubmit && (
<Popconfirm title={intl.formatMessage({ id: 'balance.querenyaoshanchuma' })} okText={intl.formatMessage({ id: 'balance.shi' })} cancelText={intl.formatMessage({ id: 'balance.fou' })} onConfirm={() => fetchDelete(record.id)}>
<Menu.Item key="2">{intl.formatMessage({ id: 'balance.shanchu' })}</Menu.Item>
</Popconfirm>
......@@ -245,7 +249,9 @@ const Admin: React.FC = () => {
Submit,
controllerBtns: () => (
<Space>
<Button type='primary' size='middle' icon={<PlusOutlined />} onClick={handleAdd}>{intl.formatMessage({ id: 'balance.businessRequestFunds.admin.handleAdd' })}</Button>
<AuthButton btnCode='businessRequestFundsAdmin.add'>
<Button type='primary' size='middle' icon={<PlusOutlined />} onClick={handleAdd}>{intl.formatMessage({ id: 'balance.businessRequestFunds.admin.handleAdd' })}</Button>
</AuthButton>
</Space>
),
}}
......
......@@ -9,6 +9,7 @@ import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
......@@ -44,7 +45,7 @@ const Search: React.FC = () => {
key: 'applyNo',
dataIndex: 'applyNo',
render: (text: any, record: any) => (
<Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
AuthUrl('businessRequestFundsSearch.see') && <Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......
......@@ -9,6 +9,7 @@ import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import Submit from '@/components/NiceForm/components/Submit'
import NiceForm from '@/components/NiceForm'
import StatusTag from '@/components/StatusTag';
import {AuthUrl} from '@/components/AuthButton/AuthUrl';
import { formatTimeString } from '@/utils'
import { priceFormat } from '@/utils/numberFomat'
import { getSettleAccountsBusinessApplyAmountTeamworkVendorApplyAmountList, getSettleAccountsBusinessApplyAmountItemApplyAmountStatus } from '@/services/SettleV2Api'
......@@ -43,7 +44,7 @@ const Search: React.FC = () => {
key: 'applyNo',
dataIndex: 'applyNo',
render: (text: any, record: any) => (
<Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
AuthUrl('businessRequestFundsCollaborationSearch.see') && <Link to={`search/preview?id=${record.id}&no=${text}`}>{text}</Link>
)
}, {
title: intl.formatMessage({ id: 'balance.danjuzhaiyao' }),
......
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