diff --git a/ry-vue3/src/views/manager/Projects.vue b/ry-vue3/src/views/manager/Projects.vue index d1a87dc..ece7eda 100644 --- a/ry-vue3/src/views/manager/Projects.vue +++ b/ry-vue3/src/views/manager/Projects.vue @@ -3,7 +3,23 @@ - + + + + + @@ -288,7 +304,7 @@ const userStore = useUserStore() const router = useRouter() const route = useRoute() -const q = ref({ sponsorOrgName: '', execOrgName: '', projectNo: '', projectName: '', projectForm: '', startTime: '', endTime: '', isFinished: '', isSettled: '', managerScore: '' }) +const q = ref({ sponsorAdminUserIds: [], execOrgName: '', projectNo: '', projectName: '', projectForm: '', startTime: '', endTime: '', isFinished: '', isSettled: '', managerScore: '' }) const rows = ref([]) const loading = ref(false) const page = reactive({ pageNum: 1, pageSize: 10, total: 0 }) @@ -338,7 +354,7 @@ async function doDelete(row) { } } -function reset() { q.value = { sponsorOrgName:'', execOrgName:'', projectNo:'', projectName:'', projectForm:'', startTime:'', endTime:'', isFinished:'', isSettled:'', managerScore:'' }; page.pageNum = 1; load() } +function reset() { q.value = { sponsorAdminUserIds:[], execOrgName:'', projectNo:'', projectName:'', projectForm:'', startTime:'', endTime:'', isFinished:'', isSettled:'', managerScore:'' }; page.pageNum = 1; load() } // 导出 function exportProjects() { ElMessage.info('导出项目功能开发中') } @@ -627,7 +643,10 @@ const assignForm = reactive({ deadlineDays: 30 }) const sponsorOrgOptions = ref([]) +const sponsorSearching = ref(false) let _supporterTimer = null +let _supporterFilterTimer = null + // 已分配场次合计 (实时) const assignedSessions = computed(() => @@ -701,6 +720,33 @@ async function loadSponsorOrgs(query) { function searchSponsorOrgs(q) { loadSponsorOrgs(q) } +// 顶部筛选区远程搜索 (多选 el-select, 复用 sponsorOrgOptions, 加 loading + 已选项重拉回) +function searchSponsorOrgsForFilter(query) { + if (_supporterFilterTimer) clearTimeout(_supporterFilterTimer) + sponsorSearching.value = true + _supporterFilterTimer = setTimeout(async () => { + try { + const params = {} + if (query) params.orgName = query + const r = await listSponsorOrgs(params) + sponsorOrgOptions.value = r.data || [] + // 已选项不在结果里时按 userId 单独拉回 (multi-select 必须保证每个已选 tag 都有 label) + const ids = q.value.sponsorAdminUserIds || [] + for (const uid of ids) { + if (!sponsorOrgOptions.value.find(u => u.userId === uid)) { + const r2 = await listSponsorOrgs({ userId: uid }) + const sel = (r2.data || []).find(u => u.userId === uid) + if (sel) sponsorOrgOptions.value = [sel, ...sponsorOrgOptions.value] + } + } + } catch (e) { + sponsorOrgOptions.value = [] + } finally { + sponsorSearching.value = false + } + }, 200) +} + // 选中支持方后回填 user_name (缓存到 biz_project.sponsor_admin_user_name) function onSponsorOrgPick(userId) { const u = sponsorOrgOptions.value.find(x => x.userId === userId)