fix(pl): 证件建档按客户查询可添加合同,避免列表为空。
改用 CRM listContract 按 customerId 拉取,不再只取最近合同再前端过滤。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
71927bedef
commit
eae5654f01
3 files changed
+115
-7
No files matched your search
@@ -0,0 +1,34 @@
|
||||
import assert from 'node:assert/strict'
|
||||
import { test } from 'node:test'
|
||||
import {
|
||||
certArchiveContractListQuery,
|
||||
filterAvailableBindingContracts
|
||||
} from './cert-archive-contract-query'
|
||||
|
||||
test('证件建档合同查询必须带客户 ID,不能只靠前端再过滤最近合同', () => {
|
||||
assert.deepEqual(certArchiveContractListQuery('cust-1', ' HT-01 '), {
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
keyword: 'HT-01',
|
||||
customerId: 'cust-1',
|
||||
excludeStatus: 'invalid',
|
||||
includeProducts: false
|
||||
})
|
||||
assert.equal(certArchiveContractListQuery(''), null)
|
||||
assert.equal(certArchiveContractListQuery(' '), null)
|
||||
assert.deepEqual(certArchiveContractListQuery('cust-2', ' ').keyword, undefined)
|
||||
})
|
||||
|
||||
test('已关联合同与不可选状态不进入添加列表', () => {
|
||||
const rows = [
|
||||
{ id: 'a', status: 'approved' },
|
||||
{ id: 'b', status: 'executing' },
|
||||
{ id: 'c', status: 'draft' },
|
||||
{ id: 'd', status: 'approved' },
|
||||
{ id: '', status: 'approved' }
|
||||
]
|
||||
assert.deepEqual(
|
||||
filterAvailableBindingContracts(rows, ['d', '']).map((item) => item.id),
|
||||
['a', 'b']
|
||||
)
|
||||
})
|
||||
@@ -0,0 +1,49 @@
|
||||
/** 证件建档添加合同时的 CRM 列表查询与本地过滤。 */
|
||||
|
||||
export interface CertArchiveContractListQuery {
|
||||
pageNum: number
|
||||
pageSize: number
|
||||
keyword?: string
|
||||
customerId: string
|
||||
excludeStatus: 'invalid'
|
||||
includeProducts: false
|
||||
}
|
||||
|
||||
/** 已选客户后按客户 ID 分页查询,避免只取最近合同再前端过滤。 */
|
||||
export function certArchiveContractListQuery(
|
||||
customerId: string,
|
||||
keyword = ''
|
||||
): CertArchiveContractListQuery | null {
|
||||
const id = String(customerId || '').trim()
|
||||
if (!id) return null
|
||||
const text = keyword.trim()
|
||||
return {
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
keyword: text || undefined,
|
||||
customerId: id,
|
||||
excludeStatus: 'invalid',
|
||||
includeProducts: false
|
||||
}
|
||||
}
|
||||
|
||||
const DEFAULT_STATUSES = ['approved', 'executing']
|
||||
|
||||
/** 去掉已关联合同和不在可选状态内的行。 */
|
||||
export function filterAvailableBindingContracts<T extends { id?: string | number; status?: string }>(
|
||||
rows: T[],
|
||||
takenIds: Iterable<string>,
|
||||
selectableStatuses: string[] = DEFAULT_STATUSES
|
||||
): T[] {
|
||||
const taken = new Set(
|
||||
[...takenIds].map((id) => String(id || '').trim()).filter(Boolean)
|
||||
)
|
||||
return rows.filter((row) => {
|
||||
const id = String(row.id || '').trim()
|
||||
if (!id || taken.has(id)) return false
|
||||
if (selectableStatuses.length && !selectableStatuses.includes(String(row.status || ''))) {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
})
|
||||
}
|
||||
Reference in new issue
Block a user