diff --git a/src/pages/Bid/CostConfig/index.tsx b/src/pages/Bid/CostConfig/index.tsx index cc4adb5..c7aaf35 100644 --- a/src/pages/Bid/CostConfig/index.tsx +++ b/src/pages/Bid/CostConfig/index.tsx @@ -1,5 +1,5 @@ -import React, { useEffect, useState } from 'react'; -import ProTable, { ProColumns } from '@ant-design/pro-table'; +import React, { useEffect, useRef, useState } from 'react'; +import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; import { Button, Descriptions, Form, Input, message, Radio, Spin } from 'antd'; import styles from './indexStyles.less'; import '@/assets/xsy_style.less' @@ -83,25 +83,40 @@ const costConfig: React.FC<{}> = () => { { title: '序号', valueType: 'index', width: 50 }, { title: showName.sec, dataIndex: 'sectionName', }, { - title: showName.bsf + '(元)', dataIndex: 'expenses1Amount', + title: showName.bsf + '(元)', dataIndex: 'expenses1Amount', width: '20%', render: (_, record) => { return (
) } diff --git a/src/pages/Finance/Cost/components/Complete.tsx b/src/pages/Finance/Cost/components/Complete.tsx index cc489ed..3436be1 100644 --- a/src/pages/Finance/Cost/components/Complete.tsx +++ b/src/pages/Finance/Cost/components/Complete.tsx @@ -43,13 +43,15 @@ const Complete: React.FC<{}> = () => { { title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%' }, { title: '下单时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime' }, { title: '支付时间', dataIndex: 'paymentTime', width: '10%', valueType: 'dateTime' }, - { title: '金额(元)', dataIndex: 'amount', width: '4%' }, + { title: '金额(元)', dataIndex: 'amount', width: '6%', render: (_, record) => record.chargeType == "0" ? "免费" : record.amount }, { title: '操作', dataIndex: 'option', - width: '3%', valueType: 'option', render: (_, record) => { + if (record.chargeType == "0") {//免费无需申请发票 + return null; + } if (record.bidInvoice == null) { return