diff --git a/src/api/crm/receivable/index.ts b/src/api/crm/receivable/index.ts index 0828bf4b..a9812a76 100644 --- a/src/api/crm/receivable/index.ts +++ b/src/api/crm/receivable/index.ts @@ -6,46 +6,47 @@ export interface ReceivableVO { planId: number customerId: number contractId: number - checkStatus: number + auditStatus: number processInstanceId: number returnTime: Date returnType: string price: number ownerUserId: number - batchId: number sort: number - dataScope: number - dataScopeDeptIds: string - status: number remark: string } -// 查询回款管理列表 +// 查询回款列表 export const getReceivablePage = async (params) => { return await request.get({ url: `/crm/receivable/page`, params }) } -// 查询回款管理详情 +// 查询回款列表 +export const getReceivablePageByCustomer = async (params) => { + return await request.get({ url: `/crm/receivable/page-by-customer`, params }) +} + +// 查询回款详情 export const getReceivable = async (id: number) => { return await request.get({ url: `/crm/receivable/get?id=` + id }) } -// 新增回款管理 +// 新增回款 export const createReceivable = async (data: ReceivableVO) => { return await request.post({ url: `/crm/receivable/create`, data }) } -// 修改回款管理 +// 修改回款 export const updateReceivable = async (data: ReceivableVO) => { return await request.put({ url: `/crm/receivable/update`, data }) } -// 删除回款管理 +// 删除回款 export const deleteReceivable = async (id: number) => { return await request.delete({ url: `/crm/receivable/delete?id=` + id }) } -// 导出回款管理 Excel +// 导出回款 Excel export const exportReceivable = async (params) => { return await request.download({ url: `/crm/receivable/export-excel`, params }) } diff --git a/src/api/crm/receivablePlan/index.ts b/src/api/crm/receivable/plan/index.ts similarity index 88% rename from src/api/crm/receivablePlan/index.ts rename to src/api/crm/receivable/plan/index.ts index f80f0572..3ddbd7db 100644 --- a/src/api/crm/receivablePlan/index.ts +++ b/src/api/crm/receivable/plan/index.ts @@ -23,6 +23,11 @@ export const getReceivablePlanPage = async (params) => { return await request.get({ url: `/crm/receivable-plan/page`, params }) } +// 查询回款计划列表 +export const getReceivablePlanPageByCustomer = async (params) => { + return await request.get({ url: `/crm/receivable-plan/page-by-customer`, params }) +} + // 查询回款计划详情 export const getReceivablePlan = async (id: number) => { return await request.get({ url: `/crm/receivable-plan/get?id=` + id }) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index f82a28b8..65d185b7 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -192,7 +192,7 @@ export enum DICT_TYPE { // ========== CRM - 客户管理模块 ========== CRM_AUDIT_STATUS = 'crm_audit_status', // CRM 审批状态 CRM_BIZ_TYPE = 'crm_biz_type', // CRM 业务类型 - CRM_RETURN_TYPE = 'crm_return_type', + CRM_RECEIVABLE_RETURN_TYPE = 'crm_receivable_return_type', // CRM 回款的还款方式 CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry', CRM_CUSTOMER_LEVEL = 'crm_customer_level', CRM_CUSTOMER_SOURCE = 'crm_customer_source', diff --git a/src/views/crm/contact/components/ContactList.vue b/src/views/crm/contact/components/ContactList.vue index 8aa40960..b41c5456 100644 --- a/src/views/crm/contact/components/ContactList.vue +++ b/src/views/crm/contact/components/ContactList.vue @@ -25,6 +25,7 @@ + - TODO待开发 + + + + TODO 待开发 @@ -31,6 +34,8 @@ import CustomerDetailsHeader from './CustomerDetailsHeader.vue' // 客户明细 import ContactList from '@/views/crm/contact/components/ContactList.vue' // 联系人列表 import ContractList from '@/views/crm/contract/components/ContractList.vue' // 合同列表 import BusinessList from '@/views/crm/business/components/BusinessList.vue' // 商机列表 +import ReceivableList from '@/views/crm/receivable/components/ReceivableList.vue' // 回款列表 +import ReceivablePlanList from '@/views/crm/receivable/plan/components/ReceivablePlanList.vue' // 回款计划列表 import PermissionList from '@/views/crm/permission/components/PermissionList.vue' // 团队成员列表(权限) import { BizTypeEnum } from '@/api/crm/permission' diff --git a/src/views/crm/receivable/ReceivableForm.vue b/src/views/crm/receivable/ReceivableForm.vue index c338fe97..60206bf7 100644 --- a/src/views/crm/receivable/ReceivableForm.vue +++ b/src/views/crm/receivable/ReceivableForm.vue @@ -43,7 +43,7 @@ + + + + + 创建回款 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/crm/receivable/index.vue b/src/views/crm/receivable/index.vue index 58d7423b..c5478c2f 100644 --- a/src/views/crm/receivable/index.vue +++ b/src/views/crm/receivable/index.vue @@ -17,15 +17,6 @@ class="!w-240px" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 搜索 重置 @@ -207,7 +73,7 @@ /> @@ -266,7 +132,7 @@ diff --git a/src/views/crm/receivablePlan/index.vue b/src/views/crm/receivable/plan/index.vue similarity index 66% rename from src/views/crm/receivablePlan/index.vue rename to src/views/crm/receivable/plan/index.vue index 2d0cf612..decd79bc 100644 --- a/src/views/crm/receivablePlan/index.vue +++ b/src/views/crm/receivable/plan/index.vue @@ -26,96 +26,6 @@ class="!w-240px" /> - - - - - - - - - - - - - - - - - - - 搜索 重置 @@ -224,10 +134,10 @@