diff --git a/src/pages/Invoice/ReissueRecord/index.tsx b/src/pages/Invoice/ReissueRecord/index.tsx index c386bc5..8c2f2b5 100644 --- a/src/pages/Invoice/ReissueRecord/index.tsx +++ b/src/pages/Invoice/ReissueRecord/index.tsx @@ -34,6 +34,7 @@ export default () => { { title: '重开的发票', dataIndex: 'invoiceNumbers', + width: 200, render: (_, record) => { return ( <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}> @@ -45,50 +46,88 @@ export default () => { hideInSearch: true, }, { + title: '收款单位', + dataIndex: 'payees', + width: 230, + render: (_, record) => { + return ( + <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}> + {record.payees?.join(',\n')} + </div> + ); + }, + ellipsis: true, + hideInSearch: true, + }, + { + title: '联系人', + dataIndex: 'contacts', + width: 100, + render: (_, record) => { + return ( + <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}> + {record.contacts?.join(',\n')} + </div> + ); + }, + ellipsis: true, + hideInSearch: true, + }, + { title: '重开原因', dataIndex: 'notes', + valueType: 'textarea', ellipsis: true, + width: 180, hideInSearch: true, }, { title: '申请人', dataIndex: 'createByName', + width: 80, ellipsis: true, hideInSearch: true, }, { title: '申请时间', dataIndex: 'createTime', + width: 100, ellipsis: true, hideInSearch: true, }, { title: '审核状态', dataIndex: 'statusText', + width: 100, ellipsis: true, hideInSearch: true, }, { title: '冲红状态', dataIndex: 'flushStatusText', + width: 100, ellipsis: true, hideInSearch: true, }, { title: '财务负责人', dataIndex: 'financeManager', + width: 100, ellipsis: true, hideInSearch: true, }, { title: '冲红时间', dataIndex: 'flushDatetime', + width: 100, ellipsis: true, hideInSearch: true, }, { title: '审核备注', dataIndex: 'auditNotes', + width: 100, + width: 180, hideInSearch: true, }, { @@ -285,6 +324,7 @@ export default () => { }} dateFormatter="string" headerTitle="高级表格" + scroll={{ x: 'max-content' }} /> ); }; diff --git a/src/pages/Order/OrderList/InvoicingDrawerForm.tsx b/src/pages/Order/OrderList/InvoicingDrawerForm.tsx index 942509e..c625617 100644 --- a/src/pages/Order/OrderList/InvoicingDrawerForm.tsx +++ b/src/pages/Order/OrderList/InvoicingDrawerForm.tsx @@ -8,15 +8,8 @@ import { postServiceConstListInvoiceDetailNames, postServiceInvoiceApplyInvoice, postServiceInvoiceQueryCompanyInfo, - postServiceInvoiceWaitReissueInvoices, } from '@/services'; -import { - FloatAdd, - FloatMul, - FloatSub, - enum2ReverseSelect, - enumToSelect, -} from '@/utils'; +import { FloatAdd, FloatMul, FloatSub, enumToSelect } from '@/utils'; import { convertCurrency } from '@/utils/numberUtil'; import { DrawerForm, @@ -215,7 +208,7 @@ export default ({ <ProFormText readonly={true} name="value" label="" /> </ProFormGroup> </ProFormList> - <ProFormSelect + {/*<ProFormSelect name="ReissueInvoiceRecordIds" label="重开的发票" fieldProps={{ @@ -236,7 +229,7 @@ export default ({ ? [{ required: true, message: '重开发票必填' }] : [] } - /> + />*/} {type === 'reissue' && ( <ProFormTextArea name="reissueNotes" diff --git a/src/pages/Order/OrderList/OrderList.tsx b/src/pages/Order/OrderList/OrderList.tsx index 9975f5d..8dbf2ee 100644 --- a/src/pages/Order/OrderList/OrderList.tsx +++ b/src/pages/Order/OrderList/OrderList.tsx @@ -1431,39 +1431,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { ) : ( '' )} - {optRecord.paths?.includes('reissue_old') ? ( - /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'|| - optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/ - <Button - className="p-0" - type="link" - onClick={() => { - setCurrentMainId(record.id); - setReissueVisibleOld(true); - }} - > - 重新开票(旧) - </Button> - ) : ( - '' - )} - {optRecord.paths?.includes('reissue') ? ( - /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'|| - optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/ - <Button - className="p-0" - type="link" - onClick={() => { - setCurrentMainId(record.id); - setCurretnOptSubId(optRecord.id); - setReissueVisible(true); - }} - > - 重新开票(新) - </Button> - ) : ( - '' - )} {optRecord.paths?.includes('confirmReissue_old') ? ( <Button @@ -2975,24 +2942,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { '' )} - {record.paths?.includes('reissue_old') ? ( - /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'|| - optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/ - <Button - className="p-0" - type="link" - onClick={() => { - setCurrentMainId(record.id); - setReissueVisibleOld(true); - console.log(reissueVisible); - }} - > - 重新开票(旧) - </Button> - ) : ( - '' - )} - {record.paths?.includes('confirmReissue_old') ? ( <Button className="p-0" @@ -3010,23 +2959,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { '' )} - {record.paths?.includes('reissue') ? ( - /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'|| - optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/ - <Button - className="p-0" - type="link" - onClick={() => { - setCurrentMainId(record.id); - setReissueVisible(true); - }} - > - 重新开票(新) - </Button> - ) : ( - '' - )} - {record.paths?.includes('confirmReissue') ? ( <Button className="p-0"