From ff5f2543ffcff058ec8b3e38e8f3dddfe93a352e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 24 Feb 2024 15:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20CRM=EF=BC=9A=E5=AE=8C=E5=96=84=20CR?= =?UTF-8?q?M=20=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95=EF=BC=88=E5=95=86?= =?UTF-8?q?=E6=9C=BA=E7=9A=84=E5=B1=95=E7=A4=BA=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 28eb23738c64856bedb57d7182a51dea46288b0a) --- src/api/crm/business/index.ts | 5 -- src/api/crm/followup/index.ts | 25 +++--- .../business/components/BusinessListModal.vue | 9 +- src/views/crm/followup/FollowUpRecordForm.vue | 80 +++++++++-------- .../crm/followup/components/BusinessList.vue | 71 --------------- .../components/BusinessTableSelect.vue | 88 ------------------- .../components/FollowUpRecordBusinessForm.vue | 42 +++++++++ src/views/crm/followup/components/index.ts | 4 +- src/views/crm/followup/index.vue | 80 ++++++++++++----- .../permission/components/PermissionForm.vue | 2 +- 10 files changed, 162 insertions(+), 244 deletions(-) delete mode 100644 src/views/crm/followup/components/BusinessList.vue delete mode 100644 src/views/crm/followup/components/BusinessTableSelect.vue create mode 100644 src/views/crm/followup/components/FollowUpRecordBusinessForm.vue diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts index 32281d2b..b6661765 100644 --- a/src/api/crm/business/index.ts +++ b/src/api/crm/business/index.ts @@ -92,11 +92,6 @@ export const getBusinessPageByContact = async (params) => { return await request.get({ url: `/crm/business/page-by-contact`, params }) } -// 获得 CRM 商机列表 -export const getBusinessListByIds = async (val: number[]) => { - return await request.get({ url: '/crm/business/list-by-ids', params: { ids: val.join(',') } }) -} - // 商机转移 export const transferBusiness = async (data: TransferReqVO) => { return await request.put({ url: '/crm/business/transfer', data }) diff --git a/src/api/crm/followup/index.ts b/src/api/crm/followup/index.ts index 504879d3..414f3f71 100644 --- a/src/api/crm/followup/index.ts +++ b/src/api/crm/followup/index.ts @@ -11,7 +11,17 @@ export interface FollowUpRecordVO { fileUrls: string[] // 附件 nextTime: Date // 下次联系时间 businessIds: number[] // 关联的商机编号数组 + businesses: { + id: number + name: string + }[] // 关联的商机数组 contactIds: number[] // 关联的联系人编号数组 + contacts: { + id: number + name: string + }[] // 关联的联系人数组 + creator: string + creatorName?: string } // 跟进记录 API @@ -21,28 +31,13 @@ export const FollowUpRecordApi = { return await request.get({ url: `/crm/follow-up-record/page`, params }) }, - // 查询跟进记录详情 - getFollowUpRecord: async (id: number) => { - return await request.get({ url: `/crm/follow-up-record/get?id=` + id }) - }, - // 新增跟进记录 createFollowUpRecord: async (data: FollowUpRecordVO) => { return await request.post({ url: `/crm/follow-up-record/create`, data }) }, - // 修改跟进记录 - updateFollowUpRecord: async (data: FollowUpRecordVO) => { - return await request.put({ url: `/crm/follow-up-record/update`, data }) - }, - // 删除跟进记录 deleteFollowUpRecord: async (id: number) => { return await request.delete({ url: `/crm/follow-up-record/delete?id=` + id }) - }, - - // 导出跟进记录 Excel - exportFollowUpRecord: async (params) => { - return await request.download({ url: `/crm/follow-up-record/export-excel`, params }) } } diff --git a/src/views/crm/business/components/BusinessListModal.vue b/src/views/crm/business/components/BusinessListModal.vue index f2a39b10..2832b6ee 100644 --- a/src/views/crm/business/components/BusinessListModal.vue +++ b/src/views/crm/business/components/BusinessListModal.vue @@ -48,8 +48,8 @@ @@ -75,7 +75,7 @@ diff --git a/src/views/crm/followup/components/BusinessList.vue b/src/views/crm/followup/components/BusinessList.vue deleted file mode 100644 index 0dea5cb4..00000000 --- a/src/views/crm/followup/components/BusinessList.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - diff --git a/src/views/crm/followup/components/BusinessTableSelect.vue b/src/views/crm/followup/components/BusinessTableSelect.vue deleted file mode 100644 index de2db616..00000000 --- a/src/views/crm/followup/components/BusinessTableSelect.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - diff --git a/src/views/crm/followup/components/FollowUpRecordBusinessForm.vue b/src/views/crm/followup/components/FollowUpRecordBusinessForm.vue new file mode 100644 index 00000000..620b5fbc --- /dev/null +++ b/src/views/crm/followup/components/FollowUpRecordBusinessForm.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/views/crm/followup/components/index.ts b/src/views/crm/followup/components/index.ts index 48d90daa..6c669fc3 100644 --- a/src/views/crm/followup/components/index.ts +++ b/src/views/crm/followup/components/index.ts @@ -1,6 +1,4 @@ -import BusinessList from './BusinessList.vue' -import BusinessTableSelect from './BusinessTableSelect.vue' import ContactList from './ContactList.vue' import ContactTableSelect from './ContactTableSelect.vue' -export { BusinessList, BusinessTableSelect, ContactList, ContactTableSelect } +export { ContactList, ContactTableSelect } diff --git a/src/views/crm/followup/index.vue b/src/views/crm/followup/index.vue index d03832b0..f4372627 100644 --- a/src/views/crm/followup/index.vue +++ b/src/views/crm/followup/index.vue @@ -2,7 +2,7 @@