yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!157 fix: bugs 

Merge pull request !157 from xingyu/dev
pull/158/MERGE
xingyu 2025-06-24 13:33:50 +00:00 committed by Gitee
parent d870868923 53e049241a
commit d189af253e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
20 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/views/bpm/model/form/modules/form-design.vue
View File

@ -102,7 +102,7 @@ defineExpose({ validate });
DICT_TYPE.BPM_MODEL_FORM_TYPE, DICT_TYPE.BPM_MODEL_FORM_TYPE,
'number', 'number',
)" )"
:key="dict.value as string" :key="dict.value"
:value="dict.value" :value="dict.value"
> >
{{ dict.label }} {{ dict.label }}

2
apps/web-antd/src/views/crm/business/index.vue
View File

@ -86,7 +86,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getBusinessPage({ return await getBusinessPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
...formValues, ...formValues,
}); });

2
apps/web-antd/src/views/crm/business/modules/detail-list-modal.vue
View File

@ -108,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getBusinessPageByCustomer({ return await getBusinessPageByCustomer({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
customerId: props.customerId, customerId: props.customerId,
...formValues, ...formValues,

4
apps/web-antd/src/views/crm/business/modules/detail-list.vue
View File

@ -121,14 +121,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
if (props.bizType === BizTypeEnum.CRM_CUSTOMER) { if (props.bizType === BizTypeEnum.CRM_CUSTOMER) {
return await getBusinessPageByCustomer({ return await getBusinessPageByCustomer({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
customerId: props.customerId, customerId: props.customerId,
...formValues, ...formValues,
}); });
} else if (props.bizType === BizTypeEnum.CRM_CONTACT) { } else if (props.bizType === BizTypeEnum.CRM_CONTACT) {
return await getBusinessPageByContact({ return await getBusinessPageByContact({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
contactId: props.contactId, contactId: props.contactId,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/business/status/index.vue
View File

@ -61,7 +61,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getBusinessStatusPage({ return await getBusinessStatusPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
...formValues, ...formValues,
}); });

2
apps/web-antd/src/views/crm/clue/index.vue
View File

@ -79,7 +79,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getCluePage({ return await getCluePage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
...formValues, ...formValues,
}); });

2
apps/web-antd/src/views/crm/contact/index.vue
View File

@ -90,7 +90,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getContactPage({ return await getContactPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
sceneType: sceneType.value, sceneType: sceneType.value,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/contact/modules/detail-list-modal.vue
View File

@ -108,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getContactPageByCustomer({ return await getContactPageByCustomer({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
customerId: props.customerId, customerId: props.customerId,
...formValues, ...formValues,

4
apps/web-antd/src/views/crm/contact/modules/detail-list.vue
View File

@ -121,14 +121,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
if (props.bizType === BizTypeEnum.CRM_CUSTOMER) { if (props.bizType === BizTypeEnum.CRM_CUSTOMER) {
return await getContactPageByCustomer({ return await getContactPageByCustomer({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
customerId: props.bizId, customerId: props.bizId,
...formValues, ...formValues,
}); });
} else if (props.bizType === BizTypeEnum.CRM_BUSINESS) { } else if (props.bizType === BizTypeEnum.CRM_BUSINESS) {
return await getContactPageByBusiness({ return await getContactPageByBusiness({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
businessId: props.bizId, businessId: props.bizId,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/contract/index.vue
View File

@ -127,7 +127,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getContractPage({ return await getContractPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
sceneType: sceneType.value, sceneType: sceneType.value,
...formValues, ...formValues,

4
apps/web-antd/src/views/crm/contract/modules/detail-list.vue
View File

@ -63,14 +63,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
if (props.bizType === BizTypeEnum.CRM_CUSTOMER) { if (props.bizType === BizTypeEnum.CRM_CUSTOMER) {
return await getContractPageByCustomer({ return await getContractPageByCustomer({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
customerId: props.bizId, customerId: props.bizId,
...formValues, ...formValues,
}); });
} else if (props.bizType === BizTypeEnum.CRM_CONTACT) { } else if (props.bizType === BizTypeEnum.CRM_CONTACT) {
return await getContractPageByBusiness({ return await getContractPageByBusiness({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
businessId: props.bizId, businessId: props.bizId,
...formValues, ...formValues,

6
apps/web-antd/src/views/crm/customer/data.ts
View File

@ -27,7 +27,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '客户来源', label: '客户来源',
component: 'Select', component: 'Select',
componentProps: { componentProps: {
options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE), options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE, 'number'),
}, },
rules: 'required', rules: 'required',
}, },
@ -74,7 +74,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '客户行业', label: '客户行业',
component: 'Select', component: 'Select',
componentProps: { 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: '客户级别', label: '客户级别',
component: 'Select', component: 'Select',
componentProps: { componentProps: {
options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL), options: getDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL, 'number'),
}, },
}, },
{ {

2
apps/web-antd/src/views/crm/customer/index.vue
View File

@ -96,7 +96,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getCustomerPage({ return await getCustomerPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
sceneType: sceneType.value, sceneType: sceneType.value,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/customer/limitConfig/index.vue
View File

@ -73,7 +73,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getCustomerLimitConfigPage({ return await getCustomerLimitConfigPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
type: configType.value, type: configType.value,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/customer/pool/index.vue
View File

@ -40,7 +40,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getCustomerPage({ return await getCustomerPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
pool: true, pool: true,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/receivable/index.vue
View File

@ -122,7 +122,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getReceivablePage({ return await getReceivablePage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
sceneType: sceneType.value, sceneType: sceneType.value,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/receivable/plan/index.vue
View File

@ -101,7 +101,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getReceivablePlanPage({ return await getReceivablePlanPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
sceneType: sceneType.value, sceneType: sceneType.value,
...formValues, ...formValues,

2
apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue
View File

@ -80,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
const queryParams: CrmReceivablePlanApi.PlanPageParam = { const queryParams: CrmReceivablePlanApi.PlanPageParam = {
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
...formValues, ...formValues,
}; };

2
apps/web-antd/src/views/crm/statistics/funnel/index.vue
View File

@ -42,7 +42,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
getChartOptions(activeTabName.value, active.value, res), getChartOptions(activeTabName.value, active.value, res),
); );
return await getDatas(activeTabName.value, { return await getDatas(activeTabName.value, {
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
...formValues, ...formValues,
}); });

2
apps/web-antd/src/views/mall/product/spu/index.vue
View File

@ -185,7 +185,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues) => {
return await getSpuPage({ return await getSpuPage({
page: page.currentPage, pageNo: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
tabType: tabType.value, tabType: tabType.value,
...formValues, ...formValues,