From d258af35d7b4ae3064db759592e8a58c8a004bb4 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 24 Jun 2025 21:28:14 +0800 Subject: [PATCH 1/2] fix: pageNo error --- apps/web-antd/src/views/crm/business/index.vue | 2 +- .../src/views/crm/business/modules/detail-list-modal.vue | 2 +- apps/web-antd/src/views/crm/business/modules/detail-list.vue | 4 ++-- apps/web-antd/src/views/crm/business/status/index.vue | 2 +- apps/web-antd/src/views/crm/clue/index.vue | 2 +- apps/web-antd/src/views/crm/contact/index.vue | 2 +- .../src/views/crm/contact/modules/detail-list-modal.vue | 2 +- apps/web-antd/src/views/crm/contact/modules/detail-list.vue | 4 ++-- apps/web-antd/src/views/crm/contract/index.vue | 2 +- apps/web-antd/src/views/crm/contract/modules/detail-list.vue | 4 ++-- apps/web-antd/src/views/crm/customer/index.vue | 2 +- apps/web-antd/src/views/crm/customer/limitConfig/index.vue | 2 +- apps/web-antd/src/views/crm/customer/pool/index.vue | 2 +- apps/web-antd/src/views/crm/receivable/index.vue | 2 +- apps/web-antd/src/views/crm/receivable/plan/index.vue | 2 +- .../src/views/crm/receivable/plan/modules/detail-list.vue | 2 +- apps/web-antd/src/views/crm/statistics/funnel/index.vue | 2 +- apps/web-antd/src/views/mall/product/spu/index.vue | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/web-antd/src/views/crm/business/index.vue b/apps/web-antd/src/views/crm/business/index.vue index b14c7b42b..1dec06d41 100644 --- a/apps/web-antd/src/views/crm/business/index.vue +++ b/apps/web-antd/src/views/crm/business/index.vue @@ -86,7 +86,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getBusinessPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, ...formValues, }); diff --git a/apps/web-antd/src/views/crm/business/modules/detail-list-modal.vue b/apps/web-antd/src/views/crm/business/modules/detail-list-modal.vue index 7f20dc443..e24b6b4a6 100644 --- a/apps/web-antd/src/views/crm/business/modules/detail-list-modal.vue +++ b/apps/web-antd/src/views/crm/business/modules/detail-list-modal.vue @@ -108,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getBusinessPageByCustomer({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, customerId: props.customerId, ...formValues, diff --git a/apps/web-antd/src/views/crm/business/modules/detail-list.vue b/apps/web-antd/src/views/crm/business/modules/detail-list.vue index 81cbaa1ea..1780b96b6 100644 --- a/apps/web-antd/src/views/crm/business/modules/detail-list.vue +++ b/apps/web-antd/src/views/crm/business/modules/detail-list.vue @@ -121,14 +121,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ query: async ({ page }, formValues) => { if (props.bizType === BizTypeEnum.CRM_CUSTOMER) { return await getBusinessPageByCustomer({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, customerId: props.customerId, ...formValues, }); } else if (props.bizType === BizTypeEnum.CRM_CONTACT) { return await getBusinessPageByContact({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, contactId: props.contactId, ...formValues, diff --git a/apps/web-antd/src/views/crm/business/status/index.vue b/apps/web-antd/src/views/crm/business/status/index.vue index df07faeba..1b20532ee 100644 --- a/apps/web-antd/src/views/crm/business/status/index.vue +++ b/apps/web-antd/src/views/crm/business/status/index.vue @@ -61,7 +61,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getBusinessStatusPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, ...formValues, }); diff --git a/apps/web-antd/src/views/crm/clue/index.vue b/apps/web-antd/src/views/crm/clue/index.vue index 7ad36e1eb..26ab94a76 100644 --- a/apps/web-antd/src/views/crm/clue/index.vue +++ b/apps/web-antd/src/views/crm/clue/index.vue @@ -79,7 +79,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getCluePage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, ...formValues, }); diff --git a/apps/web-antd/src/views/crm/contact/index.vue b/apps/web-antd/src/views/crm/contact/index.vue index 5b317a9f6..b96d21755 100644 --- a/apps/web-antd/src/views/crm/contact/index.vue +++ b/apps/web-antd/src/views/crm/contact/index.vue @@ -90,7 +90,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getContactPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, sceneType: sceneType.value, ...formValues, diff --git a/apps/web-antd/src/views/crm/contact/modules/detail-list-modal.vue b/apps/web-antd/src/views/crm/contact/modules/detail-list-modal.vue index 66179558c..44c233752 100644 --- a/apps/web-antd/src/views/crm/contact/modules/detail-list-modal.vue +++ b/apps/web-antd/src/views/crm/contact/modules/detail-list-modal.vue @@ -108,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getContactPageByCustomer({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, customerId: props.customerId, ...formValues, diff --git a/apps/web-antd/src/views/crm/contact/modules/detail-list.vue b/apps/web-antd/src/views/crm/contact/modules/detail-list.vue index 2ad66d514..287fb46d7 100644 --- a/apps/web-antd/src/views/crm/contact/modules/detail-list.vue +++ b/apps/web-antd/src/views/crm/contact/modules/detail-list.vue @@ -121,14 +121,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ query: async ({ page }, formValues) => { if (props.bizType === BizTypeEnum.CRM_CUSTOMER) { return await getContactPageByCustomer({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, customerId: props.bizId, ...formValues, }); } else if (props.bizType === BizTypeEnum.CRM_BUSINESS) { return await getContactPageByBusiness({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, businessId: props.bizId, ...formValues, diff --git a/apps/web-antd/src/views/crm/contract/index.vue b/apps/web-antd/src/views/crm/contract/index.vue index 0f4304c97..a99def71c 100644 --- a/apps/web-antd/src/views/crm/contract/index.vue +++ b/apps/web-antd/src/views/crm/contract/index.vue @@ -127,7 +127,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getContractPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, sceneType: sceneType.value, ...formValues, diff --git a/apps/web-antd/src/views/crm/contract/modules/detail-list.vue b/apps/web-antd/src/views/crm/contract/modules/detail-list.vue index d6ceee285..183a652f6 100644 --- a/apps/web-antd/src/views/crm/contract/modules/detail-list.vue +++ b/apps/web-antd/src/views/crm/contract/modules/detail-list.vue @@ -63,14 +63,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ query: async ({ page }, formValues) => { if (props.bizType === BizTypeEnum.CRM_CUSTOMER) { return await getContractPageByCustomer({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, customerId: props.bizId, ...formValues, }); } else if (props.bizType === BizTypeEnum.CRM_CONTACT) { return await getContractPageByBusiness({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, businessId: props.bizId, ...formValues, diff --git a/apps/web-antd/src/views/crm/customer/index.vue b/apps/web-antd/src/views/crm/customer/index.vue index fca220ccd..64baa7d41 100644 --- a/apps/web-antd/src/views/crm/customer/index.vue +++ b/apps/web-antd/src/views/crm/customer/index.vue @@ -96,7 +96,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getCustomerPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, sceneType: sceneType.value, ...formValues, diff --git a/apps/web-antd/src/views/crm/customer/limitConfig/index.vue b/apps/web-antd/src/views/crm/customer/limitConfig/index.vue index 3fcfff7ee..5e93e4972 100644 --- a/apps/web-antd/src/views/crm/customer/limitConfig/index.vue +++ b/apps/web-antd/src/views/crm/customer/limitConfig/index.vue @@ -73,7 +73,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getCustomerLimitConfigPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, type: configType.value, ...formValues, diff --git a/apps/web-antd/src/views/crm/customer/pool/index.vue b/apps/web-antd/src/views/crm/customer/pool/index.vue index eb74e5a27..adc0bb8d7 100644 --- a/apps/web-antd/src/views/crm/customer/pool/index.vue +++ b/apps/web-antd/src/views/crm/customer/pool/index.vue @@ -40,7 +40,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getCustomerPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, pool: true, ...formValues, diff --git a/apps/web-antd/src/views/crm/receivable/index.vue b/apps/web-antd/src/views/crm/receivable/index.vue index 13fc6af34..be7bbfc24 100644 --- a/apps/web-antd/src/views/crm/receivable/index.vue +++ b/apps/web-antd/src/views/crm/receivable/index.vue @@ -122,7 +122,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getReceivablePage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, sceneType: sceneType.value, ...formValues, diff --git a/apps/web-antd/src/views/crm/receivable/plan/index.vue b/apps/web-antd/src/views/crm/receivable/plan/index.vue index e760b5fb7..d4a8ce987 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/index.vue +++ b/apps/web-antd/src/views/crm/receivable/plan/index.vue @@ -101,7 +101,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getReceivablePlanPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, sceneType: sceneType.value, ...formValues, diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue index 8929bb491..42c1ff2b4 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue +++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue @@ -80,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { const queryParams: CrmReceivablePlanApi.PlanPageParam = { - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, ...formValues, }; 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 f4754b1f9..b715ebce8 100644 --- a/apps/web-antd/src/views/crm/statistics/funnel/index.vue +++ b/apps/web-antd/src/views/crm/statistics/funnel/index.vue @@ -42,7 +42,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ getChartOptions(activeTabName.value, active.value, res), ); return await getDatas(activeTabName.value, { - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, ...formValues, }); diff --git a/apps/web-antd/src/views/mall/product/spu/index.vue b/apps/web-antd/src/views/mall/product/spu/index.vue index 0b7802496..aa408522c 100644 --- a/apps/web-antd/src/views/mall/product/spu/index.vue +++ b/apps/web-antd/src/views/mall/product/spu/index.vue @@ -185,7 +185,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ ajax: { query: async ({ page }, formValues) => { return await getSpuPage({ - page: page.currentPage, + pageNo: page.currentPage, pageSize: page.pageSize, tabType: tabType.value, ...formValues, From 53e049241a4d47aa38bf1060e792c0b306d18093 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 24 Jun 2025 21:32:42 +0800 Subject: [PATCH 2/2] fix: bugs --- .../src/views/bpm/model/form/modules/form-design.vue | 2 +- apps/web-antd/src/views/crm/customer/data.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue b/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue index 938c08f9d..2e671b2e5 100644 --- a/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue +++ b/apps/web-antd/src/views/bpm/model/form/modules/form-design.vue @@ -102,7 +102,7 @@ defineExpose({ validate }); DICT_TYPE.BPM_MODEL_FORM_TYPE, 'number', )" - :key="dict.value as string" + :key="dict.value" :value="dict.value" > {{ dict.label }} diff --git a/apps/web-antd/src/views/crm/customer/data.ts b/apps/web-antd/src/views/crm/customer/data.ts index 61731e20b..7fb0671c3 100644 --- a/apps/web-antd/src/views/crm/customer/data.ts +++ b/apps/web-antd/src/views/crm/customer/data.ts @@ -27,7 +27,7 @@ export function useFormSchema(): VbenFormSchema[] { label: '客户来源', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE), + options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE, 'number'), }, rules: 'required', }, @@ -74,7 +74,7 @@ export function useFormSchema(): VbenFormSchema[] { label: '客户行业', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_INDUSTRY), + options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_INDUSTRY, 'number'), }, }, { @@ -82,7 +82,7 @@ export function useFormSchema(): VbenFormSchema[] { label: '客户级别', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL), + options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL, 'number'), }, }, {