fix(pl): 独立组合统计编号筛选与关键词搜索以避免条件被忽略。
This commit is contained in:
1 parent
da56a1e319
commit
726575aaf2
7 files changed
+62
-12
No files matched your search
@@ -358,6 +358,8 @@ export interface CertificateStatistics extends CertificateStatisticsSummary {
|
||||
unattributedUsedQty: QuotaQuantity
|
||||
}
|
||||
export interface StatisticsQuery {
|
||||
contractNo?: string
|
||||
certNo?: string
|
||||
keyword?: string
|
||||
page?: number
|
||||
pageSize?: number
|
||||
|
||||
@@ -210,7 +210,7 @@
|
||||
['validFrom', '有效期起'],
|
||||
['validTo', '有效期止']
|
||||
]
|
||||
).map(([prop, label]) => ({ prop, label, type: 'text', queryKey: 'keyword' }))
|
||||
).map(([prop, label]) => ({ prop, label, type: 'text', queryKey: prop }))
|
||||
const { visibleColumns, checkAll, isIndeterminate, resetToDefault } = usePersistedListColumns(
|
||||
`pl-${props.mode}-statistics-v1`,
|
||||
columns
|
||||
@@ -252,7 +252,8 @@
|
||||
query: {
|
||||
page: page.value,
|
||||
pageSize: 20,
|
||||
keyword: toQueryParams().keyword || keyword.value,
|
||||
keyword: keyword.value,
|
||||
...toQueryParams(),
|
||||
...(props.mode === 'certificate' ? { certType: certType.value } : {})
|
||||
}
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user