From 48693b50f2a50b904198ce787b9abd069d7c2a64 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 15 Jan 2024 22:45:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?wip:=20CRM-=E4=BB=A3=E5=8A=9E=E6=B6=88?= =?UTF-8?q?=E6=81=AF-=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9D=97=E4=B8=BAbacklog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/crm/backlog/index.ts | 18 +++++++++ src/api/crm/message/index.ts | 40 ------------------- src/router/modules/remaining.ts | 6 +-- src/views/crm/{message => backlog}/index.vue | 18 +++++++-- .../tables/FollowLeads.vue | 1 + .../tables/TodayCustomer.vue | 34 ++++------------ 6 files changed, 45 insertions(+), 72 deletions(-) create mode 100644 src/api/crm/backlog/index.ts delete mode 100644 src/api/crm/message/index.ts rename src/views/crm/{message => backlog}/index.vue (78%) rename src/views/crm/{message => backlog}/tables/FollowLeads.vue (82%) rename src/views/crm/{message => backlog}/tables/TodayCustomer.vue (84%) diff --git a/src/api/crm/backlog/index.ts b/src/api/crm/backlog/index.ts new file mode 100644 index 000000000..8e70f7454 --- /dev/null +++ b/src/api/crm/backlog/index.ts @@ -0,0 +1,18 @@ +import request from '@/config/axios' + +import { type CustomerVO } from '../customer' +import { type ClueVO } from '../clue' + + +// 查询客户列表 +// TODO @芋艿：看看是不是后续融合到 getCustomerPage 里； +export const getTodayCustomerPage = async (params) => { + return await request.get({ url: `/crm/backlog/today-customer-page`, params }) +} + +// 查询线索列表 +export const getFollowLeadsPage = async (params) => { + return await request.get({ url: `/crm/backlog/page`, params }) +} + +export { type CustomerVO, type ClueVO } diff --git a/src/api/crm/message/index.ts b/src/api/crm/message/index.ts deleted file mode 100644 index 098729eb8..000000000 --- a/src/api/crm/message/index.ts +++ /dev/null @@ -1,40 +0,0 @@ -import request from '@/config/axios' - -export interface CustomerVO { - id?: number - name: string - industryId: number - level: number - source: number - followUpStatus?: boolean - lockStatus?: boolean - dealStatus?: boolean - mobile: string - telephone: string - website: string - qq: string - wechat: string - email: string - description: string - remark: string - ownerUserId?: number - ownerUserName?: string - ownerUserDept?: string - roUserIds?: string - rwUserIds?: string - areaId?: number - areaName?: string - detailAddress: string - contactLastTime?: Date - contactNextTime: Date - createTime?: Date - updateTime?: Date - creator?: string - creatorName?: string -} - -// 查询客户列表 -// TODO @芋艿：看看是不是后续融合到 getCustomerPage 里； -export const getTodayCustomerPage = async (params) => { - return await request.get({ url: `/crm/message/todayCustomer`, params }) -} diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 7e8051598..7bcd81d22 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -530,15 +530,15 @@ const remainingRouter: AppRouteRecordRaw[] = [ component: () => import('@/views/crm/product/detail/index.vue') }, { - path: 'message', - name: 'CrmMessage', + path: 'backlog', + name: 'CrmBacklog', meta: { title: '待办事项', noCache: true, hidden: true }, // TODO @db52：后面搞，搞成菜单 - component: () => import('@/views/crm/message/index.vue') + component: () => import('@/views/crm/backlog/index.vue') } ] } diff --git a/src/views/crm/message/index.vue b/src/views/crm/backlog/index.vue similarity index 78% rename from src/views/crm/message/index.vue rename to src/views/crm/backlog/index.vue index 1dd972aaf..bbaf3f165 100644 --- a/src/views/crm/message/index.vue +++ b/src/views/crm/backlog/index.vue @@ -17,13 +17,25 @@ + + + + + + - + + + diff --git a/src/views/crm/backlog/tables/CheckReceivables.vue b/src/views/crm/backlog/tables/CheckReceivables.vue new file mode 100644 index 000000000..2e9189052 --- /dev/null +++ b/src/views/crm/backlog/tables/CheckReceivables.vue @@ -0,0 +1,15 @@ + + + + + + + diff --git a/src/views/crm/backlog/tables/EndContract.vue b/src/views/crm/backlog/tables/EndContract.vue new file mode 100644 index 000000000..1910c9707 --- /dev/null +++ b/src/views/crm/backlog/tables/EndContract.vue @@ -0,0 +1,15 @@ + + + + + + + diff --git a/src/views/crm/backlog/tables/FollowCustomer.vue b/src/views/crm/backlog/tables/FollowCustomer.vue new file mode 100644 index 000000000..5d98c04d2 --- /dev/null +++ b/src/views/crm/backlog/tables/FollowCustomer.vue @@ -0,0 +1,15 @@ + + + + + + + diff --git a/src/views/crm/backlog/tables/PutInPoolRemind.vue b/src/views/crm/backlog/tables/PutInPoolRemind.vue new file mode 100644 index 000000000..bb9b17a51 --- /dev/null +++ b/src/views/crm/backlog/tables/PutInPoolRemind.vue @@ -0,0 +1,15 @@ + + + + + + + diff --git a/src/views/crm/backlog/tables/RemindReceivables.vue b/src/views/crm/backlog/tables/RemindReceivables.vue new file mode 100644 index 000000000..fd99b9e6a --- /dev/null +++ b/src/views/crm/backlog/tables/RemindReceivables.vue @@ -0,0 +1,15 @@ + + + + + + + -- Gitee From 7c0c65159270b86a2a791f63bd71a538b24ff602 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sat, 20 Jan 2024 23:08:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20backlog=20=E5=88=86=E9=85=8D?= =?UTF-8?q?=E7=BB=99=E6=88=91=E7=9A=84=E7=BA=BF=E7=B4=A2=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/backlog/tables/FollowCustomer.vue | 161 +++++++++++++++++- src/views/crm/backlog/tables/FollowLeads.vue | 128 +++++++++++++- 2 files changed, 274 insertions(+), 15 deletions(-) diff --git a/src/views/crm/backlog/tables/FollowCustomer.vue b/src/views/crm/backlog/tables/FollowCustomer.vue index 5d98c04d2..72cfaced7 100644 --- a/src/views/crm/backlog/tables/FollowCustomer.vue +++ b/src/views/crm/backlog/tables/FollowCustomer.vue @@ -1,15 +1,162 @@ - +const { push } = useRouter() + +const FOLLOWUP_STATUS = [ + { label: '已跟进', value: true }, + { label: '待跟进', value: false } +] + +const loading = ref(true) // 列表的加载中 +const total = ref(0) // 列表的总页数 +const list = ref([]) // 列表的数据 +const queryParams = ref({ + pageNo: 1, + pageSize: 10, + followUpStatus: false, + sceneType: 1 +}) +const queryFormRef = ref() // 搜索的表单 + +/** 查询列表 */ +const getList = async () => { + loading.value = true + try { + const data = await CustomerApi.getCustomerPage(queryParams.value) + list.value = data.list + total.value = data.total + } finally { + loading.value = false + } +} - + diff --git a/src/views/crm/backlog/tables/FollowLeads.vue b/src/views/crm/backlog/tables/FollowLeads.vue index afb09bcc8..9fa9aa5e2 100644 --- a/src/views/crm/backlog/tables/FollowLeads.vue +++ b/src/views/crm/backlog/tables/FollowLeads.vue @@ -1,15 +1,127 @@ - - + +const FOLLOWUP_STATUS = [ + { label: '已跟进', value: true }, + { label: '待跟进', value: false } +] + +const loading = ref(true) // 列表的加载中 +const total = ref(0) // 列表的总页数 +const list = ref([]) // 列表的数据 +const queryParams = reactive({ + pageNo: 1, + pageSize: 10, + followUpStatus: false +}) +const queryFormRef = ref() // 搜索的表单 + +/** 查询列表 */ +const getList = async () => { + loading.value = true + try { + const data = await ClueApi.getCluePage(queryParams) + list.value = data.list + total.value = data.total + } finally { + loading.value = false + } +} - + -- Gitee From c38bbb99a1902c35d3ea26ead61a8b06af30d352 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 21 Jan 2024 12:47:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E6=8F=90=E5=8F=96=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E9=80=89=E9=A1=B9=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/backlog/tables/FollowCustomer.vue | 10 ++-- src/views/crm/backlog/tables/FollowLeads.vue | 12 ++--- .../crm/backlog/tables/TodayCustomer.vue | 51 +++++++------------ src/views/crm/backlog/tables/common.ts | 19 +++++++ 4 files changed, 45 insertions(+), 47 deletions(-) create mode 100644 src/views/crm/backlog/tables/common.ts diff --git a/src/views/crm/backlog/tables/FollowCustomer.vue b/src/views/crm/backlog/tables/FollowCustomer.vue index 72cfaced7..e60e35593 100644 --- a/src/views/crm/backlog/tables/FollowCustomer.vue +++ b/src/views/crm/backlog/tables/FollowCustomer.vue @@ -1,4 +1,5 @@ +