Commit 399798d00e9cda3557c8732f7f7f24001f92aa3a
1 parent
02013bbc
feat(invoice): 优化重开记录表格并添加新列
- 为表格添加水平滚动条,优化长表格展示 - 新增"收款单位"和"联系人"列,提供更多详细信息 - 调整列宽和内容显示方式,提高可读性- 隐藏重开的发票号码列,简化界面
Showing
2 changed files
with
43 additions
and
10 deletions
src/pages/Invoice/ReissueRecord/index.tsx
... | ... | @@ -34,6 +34,7 @@ export default () => { |
34 | 34 | { |
35 | 35 | title: '重开的发票', |
36 | 36 | dataIndex: 'invoiceNumbers', |
37 | + width: 200, | |
37 | 38 | render: (_, record) => { |
38 | 39 | return ( |
39 | 40 | <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}> |
... | ... | @@ -45,50 +46,88 @@ export default () => { |
45 | 46 | hideInSearch: true, |
46 | 47 | }, |
47 | 48 | { |
49 | + title: '收款单位', | |
50 | + dataIndex: 'payees', | |
51 | + width: 230, | |
52 | + render: (_, record) => { | |
53 | + return ( | |
54 | + <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}> | |
55 | + {record.payees?.join(',\n')} | |
56 | + </div> | |
57 | + ); | |
58 | + }, | |
59 | + ellipsis: true, | |
60 | + hideInSearch: true, | |
61 | + }, | |
62 | + { | |
63 | + title: '联系人', | |
64 | + dataIndex: 'contacts', | |
65 | + width: 100, | |
66 | + render: (_, record) => { | |
67 | + return ( | |
68 | + <div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}> | |
69 | + {record.contacts?.join(',\n')} | |
70 | + </div> | |
71 | + ); | |
72 | + }, | |
73 | + ellipsis: true, | |
74 | + hideInSearch: true, | |
75 | + }, | |
76 | + { | |
48 | 77 | title: '重开原因', |
49 | 78 | dataIndex: 'notes', |
79 | + valueType: 'textarea', | |
50 | 80 | ellipsis: true, |
81 | + width: 180, | |
51 | 82 | hideInSearch: true, |
52 | 83 | }, |
53 | 84 | { |
54 | 85 | title: '申请人', |
55 | 86 | dataIndex: 'createByName', |
87 | + width: 80, | |
56 | 88 | ellipsis: true, |
57 | 89 | hideInSearch: true, |
58 | 90 | }, |
59 | 91 | { |
60 | 92 | title: '申请时间', |
61 | 93 | dataIndex: 'createTime', |
94 | + width: 100, | |
62 | 95 | ellipsis: true, |
63 | 96 | hideInSearch: true, |
64 | 97 | }, |
65 | 98 | { |
66 | 99 | title: '审核状态', |
67 | 100 | dataIndex: 'statusText', |
101 | + width: 100, | |
68 | 102 | ellipsis: true, |
69 | 103 | hideInSearch: true, |
70 | 104 | }, |
71 | 105 | { |
72 | 106 | title: '冲红状态', |
73 | 107 | dataIndex: 'flushStatusText', |
108 | + width: 100, | |
74 | 109 | ellipsis: true, |
75 | 110 | hideInSearch: true, |
76 | 111 | }, |
77 | 112 | { |
78 | 113 | title: '财务负责人', |
79 | 114 | dataIndex: 'financeManager', |
115 | + width: 100, | |
80 | 116 | ellipsis: true, |
81 | 117 | hideInSearch: true, |
82 | 118 | }, |
83 | 119 | { |
84 | 120 | title: '冲红时间', |
85 | 121 | dataIndex: 'flushDatetime', |
122 | + width: 100, | |
86 | 123 | ellipsis: true, |
87 | 124 | hideInSearch: true, |
88 | 125 | }, |
89 | 126 | { |
90 | 127 | title: '审核备注', |
91 | 128 | dataIndex: 'auditNotes', |
129 | + width: 100, | |
130 | + width: 180, | |
92 | 131 | hideInSearch: true, |
93 | 132 | }, |
94 | 133 | { |
... | ... | @@ -285,6 +324,7 @@ export default () => { |
285 | 324 | }} |
286 | 325 | dateFormatter="string" |
287 | 326 | headerTitle="高级表格" |
327 | + scroll={{ x: 'max-content' }} | |
288 | 328 | /> |
289 | 329 | ); |
290 | 330 | }; | ... | ... |
src/pages/Order/OrderList/InvoicingDrawerForm.tsx
... | ... | @@ -8,15 +8,8 @@ import { |
8 | 8 | postServiceConstListInvoiceDetailNames, |
9 | 9 | postServiceInvoiceApplyInvoice, |
10 | 10 | postServiceInvoiceQueryCompanyInfo, |
11 | - postServiceInvoiceWaitReissueInvoices, | |
12 | 11 | } from '@/services'; |
13 | -import { | |
14 | - FloatAdd, | |
15 | - FloatMul, | |
16 | - FloatSub, | |
17 | - enum2ReverseSelect, | |
18 | - enumToSelect, | |
19 | -} from '@/utils'; | |
12 | +import { FloatAdd, FloatMul, FloatSub, enumToSelect } from '@/utils'; | |
20 | 13 | import { convertCurrency } from '@/utils/numberUtil'; |
21 | 14 | import { |
22 | 15 | DrawerForm, |
... | ... | @@ -215,7 +208,7 @@ export default ({ |
215 | 208 | <ProFormText readonly={true} name="value" label="" /> |
216 | 209 | </ProFormGroup> |
217 | 210 | </ProFormList> |
218 | - <ProFormSelect | |
211 | + {/*<ProFormSelect | |
219 | 212 | name="ReissueInvoiceRecordIds" |
220 | 213 | label="重开的发票" |
221 | 214 | fieldProps={{ |
... | ... | @@ -236,7 +229,7 @@ export default ({ |
236 | 229 | ? [{ required: true, message: '重开发票必填' }] |
237 | 230 | : [] |
238 | 231 | } |
239 | - /> | |
232 | + />*/} | |
240 | 233 | {type === 'reissue' && ( |
241 | 234 | <ProFormTextArea |
242 | 235 | name="reissueNotes" | ... | ... |