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 938c08f9dbc31d3cb6c96f967986f0e0c303c21d..2e671b2e521939305872a19dca27bb11eb9d5f1e 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/business/index.vue b/apps/web-antd/src/views/crm/business/index.vue index b14c7b42baed8ae75366e1d081cd0229b198cae3..1dec06d410cff0e430dd83dc7502882aa33676c8 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 7f20dc443a73c255df2173f5141f3f57957ddc5f..e24b6b4a63a4b80e7cf982aa023305370fd9f653 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 81cbaa1ea388c4653e40753805b751271f39a533..1780b96b68b7ed7d96aac87ac91b932f285ab153 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 df07faeba7b4b8c521244a4bd68aa0dc0456db6f..1b20532ee8af49a26f4b357dccf3e393df1e003a 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 7ad36e1eb906f9769e6aa9ce3a82ff8cc889d3b8..26ab94a7603a4bdfc7e43fe027781fdf08077f84 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 5b317a9f6568b49bea1aacb2a381c8c68d7179dd..b96d2175544a2a464c459e4a81f74a618b899200 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 66179558c788843a4483df99245062eec53f37bd..44c233752c0c333c52024a007d01eedd277bba17 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 2ad66d514286cf612a231476cd1a6567cf053d16..287fb46d7d5a37ea84569aa25d327039fed2c28c 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 0f4304c971939fccfa1bbf4a937a52445a8a55ea..a99def71c06a5d6b9c1d3dd206ec5af6eadfc703 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 d6ceee2856c9d2a2fb06792abafec5712c72cc63..183a652f636e2fadb0ec801629f3335f52591bf0 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/data.ts b/apps/web-antd/src/views/crm/customer/data.ts index 61731e20b11466c25823b81d0d996383d31ba752..7fb0671c3939fcbbd82c88f542835c6d38809444 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'), }, }, { diff --git a/apps/web-antd/src/views/crm/customer/index.vue b/apps/web-antd/src/views/crm/customer/index.vue index fca220ccd37e019c31cad44e3740facd9f43a5cb..64baa7d418a8c2983ef3a2d8bfbce9f0ca60d58c 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 3fcfff7ee1e10ad509018238c97296b1fe4b205d..5e93e49722a355cc6e3d7dfd8a446672e52e84b0 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 eb74e5a278bd53b44b23847493591669a91e812e..adc0bb8d745697adedbf651c3a4878022ecfc648 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 13fc6af3492e3addfee775eb0291615b77b553e0..be7bbfc2415db03ec60001534effc500c13e97b2 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 e760b5fb7e6581d989482de97529ac5b670f943f..d4a8ce98765bd79a0f0a3e5510a1d770076b826c 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 8929bb491996ee354ed748342586f469b1f0f79a..42c1ff2b4e995d07eecd61fe726295137195fef8 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 f4754b1f974cf6af6075e4ccd61377cdb4a05531..b715ebce8d4352b7d333463cab2807380ee8b9b2 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 0b78024968cfdcb56e0e0e5134ba8d19c7bff2c5..aa408522ce034418671f8225313ed1da27443d4f 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,