feat(公司tab): 任务看板五个端点按公司筛(一处 resolve 收窄,detail 靠 scope.visible 同宽)
This commit is contained in:
@@ -78,19 +78,33 @@ export interface TaskCenterVariantPage {
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/** 汇总卡:GET /api/admin/task-center/overview */
|
||||
export async function fetchTaskCenterOverview(): Promise<TaskCenterOverview> {
|
||||
const { data } = await http.get('/api/admin/task-center/overview')
|
||||
/**
|
||||
* 汇总卡:GET /api/admin/task-center/overview
|
||||
* companyId = 公司 tab 选中的公司(超管专用,页面只从 companyTab.requestCompanyId 取);
|
||||
* null/undefined 由这里自己丢掉——不发给后端 = 按会话口径看全部,不是「筛成空」。
|
||||
*/
|
||||
export async function fetchTaskCenterOverview(companyId?: number | null): Promise<TaskCenterOverview> {
|
||||
const query: QueryParams = {}
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get('/api/admin/task-center/overview', { params: query })
|
||||
return unwrap<TaskCenterOverview>(data)
|
||||
}
|
||||
|
||||
/** 店铺筛选候选(店铺库内的店铺名,精确匹配):GET /api/admin/task-center/shop-options */
|
||||
export async function fetchTaskCenterShopOptions(): Promise<string[]> {
|
||||
const { data } = await http.get('/api/admin/task-center/shop-options')
|
||||
/**
|
||||
* 店铺筛选候选(店铺库内的店铺名,精确匹配):GET /api/admin/task-center/shop-options
|
||||
* 下拉候选必须跟列表同宽:少了这一支,切 tab 后能选到别家的店铺名(选了又筛不出东西)。
|
||||
*/
|
||||
export async function fetchTaskCenterShopOptions(companyId?: number | null): Promise<string[]> {
|
||||
const query: QueryParams = {}
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get('/api/admin/task-center/shop-options', { params: query })
|
||||
return unwrap<string[]>(data)
|
||||
}
|
||||
|
||||
/** 任务分页列表:GET /api/admin/task-center/tasks */
|
||||
/**
|
||||
* 任务分页列表:GET /api/admin/task-center/tasks
|
||||
* params 由 buildTaskQuery 构造(含 company_id,见 task-center-model.ts)。
|
||||
*/
|
||||
export async function fetchTaskCenterTasks(params: QueryParams): Promise<TaskCenterTaskPage> {
|
||||
const { data } = await http.get('/api/admin/task-center/tasks', { params })
|
||||
return unwrap<TaskCenterTaskPage>(data)
|
||||
@@ -98,14 +112,22 @@ export async function fetchTaskCenterTasks(params: QueryParams): Promise<TaskCen
|
||||
|
||||
/** 任务详情(品牌任务 taskNo 形如 brand-1):GET /api/admin/task-center/tasks/detail
|
||||
* 任务不存在或不在可见范围时后端返回 success + data:null,这里归一为 null 供页面提示(unwrap 对 null data 会回传信封)。 */
|
||||
export async function fetchTaskCenterTaskDetail(taskNo: string): Promise<TaskCenterTaskDetail | null> {
|
||||
const { data } = await http.get('/api/admin/task-center/tasks/detail', { params: { taskNo } })
|
||||
export async function fetchTaskCenterTaskDetail(
|
||||
taskNo: string,
|
||||
companyId?: number | null,
|
||||
): Promise<TaskCenterTaskDetail | null> {
|
||||
const query: QueryParams = { taskNo }
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get('/api/admin/task-center/tasks/detail', { params: query })
|
||||
const envelope = data as { data?: unknown } | null
|
||||
if (envelope && typeof envelope === 'object' && 'data' in envelope && envelope.data == null) return null
|
||||
return unwrap<TaskCenterTaskDetail>(data)
|
||||
}
|
||||
|
||||
/** 变体采集(代理麦象 console,取当前可见用户集合):GET /api/admin/task-center/variant-tasks */
|
||||
/**
|
||||
* 变体采集(代理麦象 console,取当前可见用户集合):GET /api/admin/task-center/variant-tasks
|
||||
* params 由 buildVariantQuery 构造(含 company_id,见 task-center-model.ts)。
|
||||
*/
|
||||
export async function fetchTaskCenterVariantTasks(params: QueryParams): Promise<TaskCenterVariantPage> {
|
||||
const { data } = await http.get('/api/admin/task-center/variant-tasks', { params })
|
||||
return unwrap<TaskCenterVariantPage>(data)
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
* 页签一「客户端任务」= biz_file_task(12 个客户端模块)∪ brand_crawl_tasks;
|
||||
* 页签二「变体采集」= 麦象批量任务(variant-collection),数据口径与列不同故独立页签。
|
||||
* 30s 轮询:页面隐藏暂停、回前台立即刷新、卸载清理;另有手动刷新。 */
|
||||
import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import {
|
||||
fetchTaskCenterOverview,
|
||||
@@ -44,6 +45,10 @@ import {
|
||||
|
||||
const POLL_INTERVAL_MS = 30_000
|
||||
|
||||
/** 公司 tab 的唯一取值出口:非超管恒 null(store 里 companyIdForRequest 已经把它算成 null),
|
||||
* 所以这里不需要再判一次角色——第二把尺子就是第二个口径。 */
|
||||
const companyTab = useCompanyTabStore()
|
||||
|
||||
type BoardTab = 'tasks' | 'variant'
|
||||
const activeTab = ref<BoardTab>('tasks')
|
||||
|
||||
@@ -96,7 +101,7 @@ function errorText(error: unknown, fallback: string): string {
|
||||
|
||||
async function loadOverview() {
|
||||
try {
|
||||
overview.value = await fetchTaskCenterOverview()
|
||||
overview.value = await fetchTaskCenterOverview(companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '汇总数据加载失败'))
|
||||
}
|
||||
@@ -105,7 +110,7 @@ async function loadOverview() {
|
||||
/** 店铺库下拉候选。 */
|
||||
async function loadShopOptions() {
|
||||
try {
|
||||
shopOptions.value = (await fetchTaskCenterShopOptions()) || []
|
||||
shopOptions.value = (await fetchTaskCenterShopOptions(companyTab.requestCompanyId)) || []
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '店铺候选加载失败'))
|
||||
}
|
||||
@@ -114,7 +119,9 @@ async function loadShopOptions() {
|
||||
async function loadTasks(silent = false) {
|
||||
if (!silent) tasksLoading.value = true
|
||||
try {
|
||||
const result = await fetchTaskCenterTasks(buildTaskQuery(filter, taskPage.value, taskPageSize.value))
|
||||
const result = await fetchTaskCenterTasks(
|
||||
buildTaskQuery(filter, taskPage.value, taskPageSize.value, companyTab.requestCompanyId),
|
||||
)
|
||||
tasks.value = result?.items || []
|
||||
taskTotal.value = Number(result?.total || 0)
|
||||
} catch (error) {
|
||||
@@ -128,7 +135,7 @@ async function loadVariants(silent = false) {
|
||||
if (!silent) variantLoading.value = true
|
||||
try {
|
||||
const result = await fetchTaskCenterVariantTasks(
|
||||
buildVariantQuery(variantFilter, variantPage.value, variantPageSize.value),
|
||||
buildVariantQuery(variantFilter, variantPage.value, variantPageSize.value, companyTab.requestCompanyId),
|
||||
)
|
||||
variantRows.value = result?.items || []
|
||||
variantTotal.value = tabCount(result?.total)
|
||||
@@ -160,6 +167,19 @@ async function loadInactiveTabTotal() {
|
||||
else await loadTasks(true)
|
||||
}
|
||||
|
||||
/** 切公司 = 五个取数点全部重取(汇总卡 / 店铺候选 / 当前页签列表 / 另一页签的徽章数)。
|
||||
* filter.shop 必须一起清掉:上一家选中的店铺名在新一家的候选里根本不存在,留着会把切 tab 后的首屏
|
||||
* 筛成「暂无符合条件的任务」——口径同 ShopManagePage 的 filter.groupId(G1 钉着那条)。
|
||||
* 两个页签的页码也回 1:第 7 页对另一家没有意义。详情不在这条链上重取,它按 taskNo 现点现取,
|
||||
* 带的是切换后的 company_id,越权那一侧由后端 scope.visible() 把关。 */
|
||||
watch(() => companyTab.activeId, () => {
|
||||
filter.shop = ''
|
||||
taskPage.value = 1
|
||||
variantPage.value = 1
|
||||
void refreshAll()
|
||||
void loadInactiveTabTotal()
|
||||
})
|
||||
|
||||
function switchTab(tab: BoardTab) {
|
||||
if (activeTab.value === tab) return
|
||||
activeTab.value = tab
|
||||
@@ -223,7 +243,7 @@ async function openDetail(row: TaskCenterTaskRow) {
|
||||
detailLoading.value = true
|
||||
detail.value = null
|
||||
try {
|
||||
detail.value = await fetchTaskCenterTaskDetail(row.taskNo)
|
||||
detail.value = await fetchTaskCenterTaskDetail(row.taskNo, companyTab.requestCompanyId)
|
||||
if (!detail.value) ElMessage.warning('任务不存在或无权查看')
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '任务详情加载失败'))
|
||||
|
||||
@@ -213,13 +213,19 @@ function text(value: unknown): string {
|
||||
return typeof value === 'string' ? value.trim() : ''
|
||||
}
|
||||
|
||||
/** 任务列表查询参数:空白项不下传(后端按缺省处理)。 */
|
||||
/**
|
||||
* 任务列表查询参数:空白项不下传(后端按缺省处理)。
|
||||
* companyId = 公司 tab 选中的公司(超管专用,页面从 companyTab.requestCompanyId 取);
|
||||
* 非超管恒 null ⇒ 这一支压根不发 company_id,后端的会话口径不受前端影响。
|
||||
*/
|
||||
export function buildTaskQuery(
|
||||
filter: TaskCenterTaskFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
companyId?: number | null,
|
||||
): TaskCenterQueryParams {
|
||||
const query: TaskCenterQueryParams = { page, pageSize }
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const put = (key: string, value: string | undefined) => {
|
||||
if (value) query[key] = value
|
||||
}
|
||||
@@ -232,12 +238,15 @@ export function buildTaskQuery(
|
||||
return query
|
||||
}
|
||||
|
||||
/** 变体采集查询参数:companyId 的口径与 buildTaskQuery 同一条(null 不发,不发=不筛)。 */
|
||||
export function buildVariantQuery(
|
||||
filter: TaskCenterVariantFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
companyId?: number | null,
|
||||
): TaskCenterQueryParams {
|
||||
const query: TaskCenterQueryParams = { page, pageSize }
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const status = text(filter.status)
|
||||
if (status !== '') query.status = Number(status)
|
||||
return query
|
||||
|
||||
Reference in New Issue
Block a user