Commit d9ee7262de1c8adf048c4f30bcad717bea585ddd
1 parent
f49246a4
feat(invoice): 重发记录表格增加收款单位筛选功能
- 在 ReissueRecord 组件中添加收款单位筛选列 - 使用 getPayees 函数获取收款单位数据 - 优化 OrderDrawer 组件中的平台类型选择逻辑 -移除课题组名称字段的必填规则
Showing
2 changed files
with
27 additions
and
13 deletions
src/pages/Invoice/ReissueRecord/index.tsx
@@ -24,7 +24,7 @@ export const waitTimePromise = async (time: number = 100) => { | @@ -24,7 +24,7 @@ export const waitTimePromise = async (time: number = 100) => { | ||
24 | 24 | ||
25 | export default () => { | 25 | export default () => { |
26 | const actionRef = useRef<ActionType>(); | 26 | const actionRef = useRef<ActionType>(); |
27 | - const { getInvoiceFlushStatus } = useModel('enum'); | 27 | + const { getInvoiceFlushStatus, getPayees } = useModel('enum'); |
28 | const columns: ProColumns[] = [ | 28 | const columns: ProColumns[] = [ |
29 | { | 29 | { |
30 | dataIndex: 'index', | 30 | dataIndex: 'index', |
@@ -186,6 +186,19 @@ export default () => { | @@ -186,6 +186,19 @@ export default () => { | ||
186 | }, | 186 | }, |
187 | }, | 187 | }, |
188 | { | 188 | { |
189 | + title: '收款单位', | ||
190 | + valueType: 'select', | ||
191 | + key: 'payee', | ||
192 | + dataIndex: 'payee', | ||
193 | + filters: true, | ||
194 | + onFilter: true, | ||
195 | + hideInTable: true, | ||
196 | + request: async () => { | ||
197 | + const res = await getPayees(); | ||
198 | + return enumToSelect(res); | ||
199 | + }, | ||
200 | + }, | ||
201 | + { | ||
189 | title: '财务负责人', | 202 | title: '财务负责人', |
190 | dataIndex: 'financeManager', | 203 | dataIndex: 'financeManager', |
191 | ellipsis: true, | 204 | ellipsis: true, |
@@ -306,7 +319,6 @@ export default () => { | @@ -306,7 +319,6 @@ export default () => { | ||
306 | }, | 319 | }, |
307 | }} | 320 | }} |
308 | form={{ | 321 | form={{ |
309 | - // 由于配置了 transform,提交的参数与定义的不同这里需要转化一下 | ||
310 | syncToUrl: (values, type) => { | 322 | syncToUrl: (values, type) => { |
311 | if (type === 'get') { | 323 | if (type === 'get') { |
312 | return { | 324 | return { |
@@ -318,8 +330,12 @@ export default () => { | @@ -318,8 +330,12 @@ export default () => { | ||
318 | }, | 330 | }, |
319 | }} | 331 | }} |
320 | pagination={{ | 332 | pagination={{ |
321 | - pageSize: 5, | ||
322 | - onChange: (page) => console.log(page), | 333 | + //pageSize: 5, // 默认每页展示条数 |
334 | + pageSizeOptions: ['5', '10', '20', '50'], // 可选的条数 | ||
335 | + showSizeChanger: true, // 启用条数选择器 | ||
336 | + /* | ||
337 | + onChange: (page, pageSize) => console.log(`Page: ${page}, PageSize: ${pageSize}`), | ||
338 | +*/ | ||
323 | }} | 339 | }} |
324 | dateFormatter="string" | 340 | dateFormatter="string" |
325 | headerTitle="高级表格" | 341 | headerTitle="高级表格" |
src/pages/Order/OrderList/OrderDrawer.tsx
@@ -1269,6 +1269,9 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1269,6 +1269,9 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
1269 | })); | 1269 | })); |
1270 | }} | 1270 | }} |
1271 | width="md" | 1271 | width="md" |
1272 | + onChange={() => { | ||
1273 | + form.setFieldValue('platformType', ''); | ||
1274 | + }} | ||
1272 | rules={[{ required: true, message: '单位类型必填' }]} | 1275 | rules={[{ required: true, message: '单位类型必填' }]} |
1273 | name="companyType" | 1276 | name="companyType" |
1274 | label="单位类型" | 1277 | label="单位类型" |
@@ -1316,7 +1319,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1316,7 +1319,10 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
1316 | value, | 1319 | value, |
1317 | })); | 1320 | })); |
1318 | }} | 1321 | }} |
1319 | - fieldProps={{ filterOption: () => true }} | 1322 | + fieldProps={{ |
1323 | + filterOption: (input, option) => | ||
1324 | + option?.label.toLowerCase().includes(input.toLowerCase()), // 自定义搜索过滤逻辑 | ||
1325 | + }} | ||
1320 | debounceTime={1000} | 1326 | debounceTime={1000} |
1321 | label="平台类型" | 1327 | label="平台类型" |
1322 | placeholder="请输入平台类型" | 1328 | placeholder="请输入平台类型" |
@@ -1330,7 +1336,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1330,7 +1336,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
1330 | companyType, | 1336 | companyType, |
1331 | ) | 1337 | ) |
1332 | ) { | 1338 | ) { |
1333 | - form.setFieldValue('platformType', ''); | ||
1334 | return ( | 1339 | return ( |
1335 | <Group> | 1340 | <Group> |
1336 | {['ECommercePlatform', 'otherPlatform'].includes( | 1341 | {['ECommercePlatform', 'otherPlatform'].includes( |
@@ -1340,7 +1345,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1340,7 +1345,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
1340 | width="md" | 1345 | width="md" |
1341 | name="institutionContactName" | 1346 | name="institutionContactName" |
1342 | label="课题组名称" | 1347 | label="课题组名称" |
1343 | - rules={[{ required: true, message: '请输入课题组名称!' }]} | ||
1344 | placeholder="请输入名称" | 1348 | placeholder="请输入名称" |
1345 | /> | 1349 | /> |
1346 | </Group> | 1350 | </Group> |
@@ -1372,12 +1376,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1372,12 +1376,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
1372 | width="md" | 1376 | width="md" |
1373 | name="institutionContactName" | 1377 | name="institutionContactName" |
1374 | label="课题组名称" | 1378 | label="课题组名称" |
1375 | - rules={[ | ||
1376 | - { | ||
1377 | - required: true, | ||
1378 | - message: '请输入课题组名称!', | ||
1379 | - }, | ||
1380 | - ]} | ||
1381 | placeholder="请输入名称" | 1379 | placeholder="请输入名称" |
1382 | /> | 1380 | /> |
1383 | ); | 1381 | ); |