diff --git a/apps/web-antd/src/views/crm/statistics/customer/data.ts b/apps/web-antd/src/views/crm/statistics/customer/data.ts index db4cd8fa..ec37c668 100644 --- a/apps/web-antd/src/views/crm/statistics/customer/data.ts +++ b/apps/web-antd/src/views/crm/statistics/customer/data.ts @@ -100,9 +100,10 @@ export function useGridFormSchema(): VbenFormSchema[] { component: 'ApiSelect', componentProps: { api: getSimpleUserList, - allowClear: true, labelField: 'nickname', valueField: 'id', + placeholder: '请选择员工', + allowClear: true, }, }, ]; diff --git a/apps/web-antd/src/views/crm/statistics/customer/index.vue b/apps/web-antd/src/views/crm/statistics/customer/index.vue index 513088a8..63967b74 100644 --- a/apps/web-antd/src/views/crm/statistics/customer/index.vue +++ b/apps/web-antd/src/views/crm/statistics/customer/index.vue @@ -36,8 +36,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async (_, formValues) => { const res = await getChartDatas(activeTabName.value, formValues); - renderEcharts(getChartOptions(activeTabName.value, res)); - return await getDatas(activeTabName.value, formValues); + await renderEcharts(getChartOptions(activeTabName.value, res)); + return getDatas(activeTabName.value, formValues); }, }, }, @@ -51,12 +51,13 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, }); +/** tab 切换 */ async function handleTabChange(key: any) { activeTabName.value = key; gridApi.setGridOptions({ columns: useGridColumns(key), }); - gridApi.reload(); + await gridApi.reload(); } diff --git a/apps/web-antd/src/views/crm/statistics/funnel/index.vue b/apps/web-antd/src/views/crm/statistics/funnel/index.vue index b715ebce..1b071a82 100644 --- a/apps/web-antd/src/views/crm/statistics/funnel/index.vue +++ b/apps/web-antd/src/views/crm/statistics/funnel/index.vue @@ -38,10 +38,10 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { const res = await getChartDatas(activeTabName.value, formValues); - renderEcharts( + await renderEcharts( getChartOptions(activeTabName.value, active.value, res), ); - return await getDatas(activeTabName.value, { + return getDatas(activeTabName.value, { pageNo: page.currentPage, pageSize: page.pageSize, ...formValues, @@ -59,6 +59,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, }); +/** tab 切换 */ async function handleTabChange(key: any) { activeTabName.value = key; gridApi.setGridOptions({ @@ -67,9 +68,10 @@ async function handleTabChange(key: any) { enabled: activeTabName.value !== 'funnelRef', }, }); - gridApi.reload(); + await gridApi.reload(); } +/** 视角切换 */ function handleActive(value: boolean) { active.value = value; renderEcharts( diff --git a/apps/web-antd/src/views/crm/statistics/performance/data.ts b/apps/web-antd/src/views/crm/statistics/performance/data.ts index dd08f80c..e56c7ebf 100644 --- a/apps/web-antd/src/views/crm/statistics/performance/data.ts +++ b/apps/web-antd/src/views/crm/statistics/performance/data.ts @@ -65,9 +65,10 @@ export function useGridFormSchema(): VbenFormSchema[] { component: 'ApiSelect', componentProps: { api: getSimpleUserList, - allowClear: true, labelField: 'nickname', valueField: 'id', + placeholder: '请选择员工', + allowClear: true, }, }, ]; diff --git a/apps/web-antd/src/views/crm/statistics/performance/index.vue b/apps/web-antd/src/views/crm/statistics/performance/index.vue index bfa56f5d..ecbcec83 100644 --- a/apps/web-antd/src/views/crm/statistics/performance/index.vue +++ b/apps/web-antd/src/views/crm/statistics/performance/index.vue @@ -53,6 +53,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, }); +/** tab 切换 */ async function handleTabChange(key: any) { activeTabName.value = key; const params = (await gridApi.formApi.getValues()) as any; @@ -128,10 +129,12 @@ async function handleTabChange(key: any) { 100 ).toFixed(2); }); - renderEcharts(getChartOptions(key, data), true); - gridApi.grid.reloadColumn(columnsData); - gridApi.grid.reloadData(tableData); + await renderEcharts(getChartOptions(key, data), true); + await gridApi.grid.reloadColumn(columnsData); + await gridApi.grid.reloadData(tableData); } + +/** 初始化加载 */ onMounted(() => { handleTabChange(activeTabName.value); }); diff --git a/apps/web-antd/src/views/crm/statistics/portrait/data.ts b/apps/web-antd/src/views/crm/statistics/portrait/data.ts index 673d2fda..8eeff969 100644 --- a/apps/web-antd/src/views/crm/statistics/portrait/data.ts +++ b/apps/web-antd/src/views/crm/statistics/portrait/data.ts @@ -69,9 +69,10 @@ export function useGridFormSchema(): VbenFormSchema[] { component: 'ApiSelect', componentProps: { api: getSimpleUserList, - allowClear: true, labelField: 'nickname', valueField: 'id', + placeholder: '请选择员工', + allowClear: true, }, }, ]; diff --git a/apps/web-antd/src/views/crm/statistics/portrait/index.vue b/apps/web-antd/src/views/crm/statistics/portrait/index.vue index d8ceea9d..154ff710 100644 --- a/apps/web-antd/src/views/crm/statistics/portrait/index.vue +++ b/apps/web-antd/src/views/crm/statistics/portrait/index.vue @@ -38,8 +38,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async (_, formValues) => { const res = await getDatas(activeTabName.value, formValues); - renderLeftEcharts(getChartOptions(activeTabName.value, res).left); - renderRightEcharts(getChartOptions(activeTabName.value, res).right); + await renderLeftEcharts(getChartOptions(activeTabName.value, res).left); + await renderRightEcharts(getChartOptions(activeTabName.value, res).right); return res; }, }, @@ -54,12 +54,13 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, }); +/** tab 切换 */ async function handleTabChange(key: any) { activeTabName.value = key; gridApi.setGridOptions({ columns: useGridColumns(key), }); - gridApi.reload(); + await gridApi.reload(); } diff --git a/apps/web-antd/src/views/crm/statistics/rank/index.vue b/apps/web-antd/src/views/crm/statistics/rank/index.vue index 5fa21e51..b311bac9 100644 --- a/apps/web-antd/src/views/crm/statistics/rank/index.vue +++ b/apps/web-antd/src/views/crm/statistics/rank/index.vue @@ -36,7 +36,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async (_, formValues) => { const res = await getDatas(activeTabName.value, formValues); - renderEcharts(getChartOptions(activeTabName.value, res)); + await renderEcharts(getChartOptions(activeTabName.value, res)); return res; }, }, @@ -51,12 +51,13 @@ const [Grid, gridApi] = useVbenVxeGrid({ } as VxeTableGridOptions, }); +/** tab 切换 */ async function handleTabChange(key: any) { activeTabName.value = key; gridApi.setGridOptions({ columns: useGridColumns(key), }); - gridApi.reload(); + await gridApi.reload(); }