diff --git a/apps/web-antd/src/api/crm/receivable/index.ts b/apps/web-antd/src/api/crm/receivable/index.ts index 36b3db081..3014fce12 100644 --- a/apps/web-antd/src/api/crm/receivable/index.ts +++ b/apps/web-antd/src/api/crm/receivable/index.ts @@ -35,11 +35,6 @@ export namespace CrmReceivableApi { no: string; totalPrice: number; } - - export interface ReceivablePageParam extends PageParam { - contractId?: number; - customerId?: number; - } } /** 查询回款列表 */ @@ -51,9 +46,7 @@ export function getReceivablePage(params: PageParam) { } /** 查询回款列表,基于指定客户 */ -export function getReceivablePageByCustomer( - params: CrmReceivableApi.ReceivablePageParam, -) { +export function getReceivablePageByCustomer(params: PageParam) { return requestClient.get>( '/crm/receivable/page-by-customer', { params }, diff --git a/apps/web-antd/src/api/mall/product/spu/index.ts b/apps/web-antd/src/api/mall/product/spu/index.ts index 0c9f4ce94..d970f060b 100644 --- a/apps/web-antd/src/api/mall/product/spu/index.ts +++ b/apps/web-antd/src/api/mall/product/spu/index.ts @@ -76,9 +76,9 @@ export function getSpuPage(params: PageParam) { }); } -/** 获得商品 SPU 列表 tabsCount */ -export function getTabsCount() { - return requestClient.get>('/product/spu/get-count'); +/** 获得商品 SPU 列表 tabsCount(支持按 name/categoryId/createTime 筛选) */ +export function getTabsCount(params?: Record) { + return requestClient.get>('/product/spu/get-count', { params }); } /** 创建商品 SPU */ diff --git a/apps/web-antd/src/api/system/user/index.ts b/apps/web-antd/src/api/system/user/index.ts index 1f4903682..fa7c05167 100644 --- a/apps/web-antd/src/api/system/user/index.ts +++ b/apps/web-antd/src/api/system/user/index.ts @@ -110,7 +110,10 @@ export function getSimpleUser(id: number | string) { /** 按昵称模糊搜索用户 */ export function getSimpleUserListByNickname(nickname: string) { - return requestClient.get('/system/user/list-by-nickname', { - params: { nickname }, - }); + return requestClient.get( + '/system/user/list-by-nickname', + { + params: { nickname }, + }, + ); } diff --git a/apps/web-antd/src/router/routes/core.ts b/apps/web-antd/src/router/routes/core.ts index f9aec3052..22fd0017c 100644 --- a/apps/web-antd/src/router/routes/core.ts +++ b/apps/web-antd/src/router/routes/core.ts @@ -109,21 +109,6 @@ const coreRoutes: RouteRecordRaw[] = [ }, ], }, - /** - * 用于 bpm 移动端流程表单 web-view 的嵌入 - */ - { - component: () => import('#/views/bpm/form/mobile/index.vue'), - meta: { - hideInBreadcrumb: true, - hideInMenu: true, - hideInTab: true, - ignoreAccess: true, - title: '移动端流程表单展示', - }, - name: 'BpmMobileFormPreview', - path: '/bpm/mobile/form-preview', - }, ]; export { coreRoutes, fallbackNotFoundRoute }; diff --git a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue index 8e1badff0..d823def74 100644 --- a/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue +++ b/apps/web-antd/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue @@ -40,7 +40,7 @@ const props = defineProps({ default: '', }, }); -const prefix = inject('prefix', 'flowable'); // 增加默认值flowable +const prefix = inject('prefix', 'flowable'); const elementListenersList = ref([]); // 监听器列表 const listenerForm = ref({}); // 监听器详情表单 const fieldsListOfListener = ref([]); diff --git a/apps/web-antd/src/views/bpm/form/mobile/index.vue b/apps/web-antd/src/views/bpm/form/mobile/index.vue deleted file mode 100644 index d0e199ba7..000000000 --- a/apps/web-antd/src/views/bpm/form/mobile/index.vue +++ /dev/null @@ -1,405 +0,0 @@ - - - - - diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue index 4ffbb62c0..3f86e68f3 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue @@ -33,6 +33,7 @@ watch( view.value = newModelView; } }, + { immediate: true }, ); /** 监听 bpmnXml */ diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue index 751f390ca..6e4c65982 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue @@ -56,6 +56,7 @@ watch( simpleModel.value = newModelView.simpleModel || {}; } }, + { immediate: true }, ); /** 监控模型结构数据 */ diff --git a/apps/web-antd/src/views/crm/receivable/components/detail-list.vue b/apps/web-antd/src/views/crm/receivable/components/detail-list.vue index 979f5521d..25e3480a3 100644 --- a/apps/web-antd/src/views/crm/receivable/components/detail-list.vue +++ b/apps/web-antd/src/views/crm/receivable/components/detail-list.vue @@ -70,17 +70,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ proxyConfig: { ajax: { query: async ({ page }) => { - const queryParams: CrmReceivableApi.ReceivablePageParam = { + const queryParams = { + ...(props.customerId ? { customerId: props.customerId } : {}), + ...(props.customerId && props.contractId + ? { contractId: props.contractId } + : {}), pageNo: page.currentPage, pageSize: page.pageSize, }; - if (props.customerId && !props.contractId) { - queryParams.customerId = props.customerId; - } else if (props.customerId && props.contractId) { - // 如果是合同的话客户编号也需要带上因为权限基于客户 - queryParams.customerId = props.customerId; - queryParams.contractId = props.contractId; - } return await getReceivablePageByCustomer(queryParams); }, }, diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue index 5c25d3085..035d6b9a8 100644 --- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue +++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue @@ -1,5 +1,5 @@ - - - - diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue index 4ffbb62c0..3f86e68f3 100644 --- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue +++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/bpm-viewer.vue @@ -33,6 +33,7 @@ watch( view.value = newModelView; } }, + { immediate: true }, ); /** 监听 bpmnXml */ diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue index 751f390ca..6e4c65982 100644 --- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue +++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue @@ -56,6 +56,7 @@ watch( simpleModel.value = newModelView.simpleModel || {}; } }, + { immediate: true }, ); /** 监控模型结构数据 */ diff --git a/apps/web-antdv-next/src/views/crm/receivable/components/detail-list.vue b/apps/web-antdv-next/src/views/crm/receivable/components/detail-list.vue index f655adee3..e821c2b28 100644 --- a/apps/web-antdv-next/src/views/crm/receivable/components/detail-list.vue +++ b/apps/web-antdv-next/src/views/crm/receivable/components/detail-list.vue @@ -70,17 +70,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ proxyConfig: { ajax: { query: async ({ page }) => { - const queryParams: CrmReceivableApi.ReceivablePageParam = { + const queryParams = { + ...(props.customerId ? { customerId: props.customerId } : {}), + ...(props.customerId && props.contractId + ? { contractId: props.contractId } + : {}), pageNo: page.currentPage, pageSize: page.pageSize, }; - if (props.customerId && !props.contractId) { - queryParams.customerId = props.customerId; - } else if (props.customerId && props.contractId) { - // 如果是合同的话客户编号也需要带上因为权限基于客户 - queryParams.customerId = props.customerId; - queryParams.contractId = props.contractId; - } return await getReceivablePageByCustomer(queryParams); }, }, diff --git a/apps/web-antdv-next/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antdv-next/src/views/infra/demo/general/demo03/inner/index.vue index c1b9884ca..9d2d86c3e 100644 --- a/apps/web-antdv-next/src/views/infra/demo/general/demo03/inner/index.vue +++ b/apps/web-antdv-next/src/views/infra/demo/general/demo03/inner/index.vue @@ -1,5 +1,5 @@