Commit 29a50c01 authored by Bill's avatar Bill

fix: 修改开票管理税率小数点问题

parent b0f1f83a
...@@ -14,7 +14,7 @@ import { schema } from './schema'; ...@@ -14,7 +14,7 @@ import { schema } from './schema';
import StatusTag, { STATUS_TYPE } from '@/components/StatusTag' import StatusTag, { STATUS_TYPE } from '@/components/StatusTag'
import { fetchOptions } from '../../common'; import { fetchOptions } from '../../common';
import useSetSearchValueInTable from '@/hooks/useSetSearchValueInTable'; import useSetSearchValueInTable from '@/hooks/useSetSearchValueInTable';
import { priceFormat } from '@/utils/numberFomat'; import { numFormat, priceFormat } from '@/utils/numberFomat';
import { import {
getSettleAccountsCommonGetPayStatus, getSettleAccountsCommonGetPayStatus,
getSettleAccountsCommonGetReceiptInvoiceStatus, getSettleAccountsCommonGetReceiptInvoiceStatus,
...@@ -143,9 +143,6 @@ const SettlementList: React.FC = () => { ...@@ -143,9 +143,6 @@ const SettlementList: React.FC = () => {
return { return {
...rest, ...rest,
// TODO, 修改
// kind: kindName == intl.formatMessage({id: 'balance.zengzhishuiputongfapiao'}) ? 1 : 2,
// type: typeName == intl.formatMessage({id: 'balance.qiye'}) ? 1 : 2,
proveList: res[`list-${key}`] proveList: res[`list-${key}`]
} }
}) })
...@@ -166,8 +163,6 @@ const SettlementList: React.FC = () => { ...@@ -166,8 +163,6 @@ const SettlementList: React.FC = () => {
const defaultPostData = { const defaultPostData = {
receiptInvoiceId: activeData.id, receiptInvoiceId: activeData.id,
...rest, ...rest,
// kind: kindName == intl.formatMessage({id: 'balance.zengzhishuiputongfapiao'}) ? 1 : 2,
// type: typeName == intl.formatMessage({id: 'balance.qiye'}) ? 1 : 2,
proveList: res[`list-0`] proveList: res[`list-0`]
} }
setSubmitLoading(true); setSubmitLoading(true);
...@@ -236,7 +231,7 @@ const SettlementList: React.FC = () => { ...@@ -236,7 +231,7 @@ const SettlementList: React.FC = () => {
title: intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.tax' }), title: intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.tax' }),
dataIndex: 'tax', dataIndex: 'tax',
render: (text, record) => { render: (text, record) => {
return record.isHasTax ? `${record.isHasTaxName}/${record.taxRate * 100}%` : intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.tax.none' }); return record.isHasTax ? `${record.isHasTaxName}/${priceFormat(record.taxRate * 100)}%` : intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.tax.none' });
} }
}, },
{ {
...@@ -294,7 +289,13 @@ const SettlementList: React.FC = () => { ...@@ -294,7 +289,13 @@ const SettlementList: React.FC = () => {
title: intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.operation' }), title: intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.operation' }),
render: (text, record) => { render: (text, record) => {
return ( return (
<a onClick={() => handleShow(record)}>{record.invoiceStatus == 1 ? intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.operation.1' }) : intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.operation.2' })}</a> <a onClick={() => handleShow(record)}>
{
record.invoiceStatus == 1
? intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.operation.1' })
: intl.formatMessage({ id: 'balance.accountsReceivable.invoice.columns.operation.2' })
}
</a>
) )
} }
} }
......
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