From 361c06bd6f4d530e16414e466fd29f0fa4300627 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 6 Feb 2024 22:58:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20crm-backlog=20=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/backlog/tables/CheckContract.vue | 174 +++++++++++++++++- src/views/crm/backlog/tables/common.ts | 6 + 2 files changed, 173 insertions(+), 7 deletions(-) diff --git a/src/views/crm/backlog/tables/CheckContract.vue b/src/views/crm/backlog/tables/CheckContract.vue index 2cea0f39..591bebd7 100644 --- a/src/views/crm/backlog/tables/CheckContract.vue +++ b/src/views/crm/backlog/tables/CheckContract.vue @@ -1,15 +1,175 @@ - - + diff --git a/src/views/crm/backlog/tables/common.ts b/src/views/crm/backlog/tables/common.ts index ec999fca..f2ac36a9 100644 --- a/src/views/crm/backlog/tables/common.ts +++ b/src/views/crm/backlog/tables/common.ts @@ -17,3 +17,9 @@ export const CONTACT_STATUS = [ { label: '已逾期', value: 2 }, { label: '已联系', value: 3 } ] + +/** 合同审批状态 */ +export const CONTRACT_AUDIT_STATUS = [ + { label: '已审批', value: 20 }, + { label: '待审批', value: 10 } +] From ae3d44d8bd88660a7b5d6dc279c27eb15b0d5cf6 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 7 Feb 2024 23:52:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=BE=85=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E6=8F=90=E9=86=92,=E5=8D=B3=E5=B0=86=E5=88=B0=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=90=8C,=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=9B=9E=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/crm/backlog/index.ts | 3 +- .../crm/backlog/tables/CheckContract.vue | 4 +- .../crm/backlog/tables/CheckReceivables.vue | 123 ++++++++++- src/views/crm/backlog/tables/EndContract.vue | 176 +++++++++++++++- .../crm/backlog/tables/FollowCustomer.vue | 1 - .../crm/backlog/tables/PutInPoolRemind.vue | 2 +- .../crm/backlog/tables/RemindReceivables.vue | 192 +++++++++++++++++- src/views/crm/backlog/tables/common.ts | 17 +- 8 files changed, 488 insertions(+), 30 deletions(-) diff --git a/src/api/crm/backlog/index.ts b/src/api/crm/backlog/index.ts index 8e70f745..e9494aa8 100644 --- a/src/api/crm/backlog/index.ts +++ b/src/api/crm/backlog/index.ts @@ -3,7 +3,6 @@ import request from '@/config/axios' import { type CustomerVO } from '../customer' import { type ClueVO } from '../clue' - // 查询客户列表 // TODO @芋艿:看看是不是后续融合到 getCustomerPage 里; export const getTodayCustomerPage = async (params) => { @@ -15,4 +14,4 @@ export const getFollowLeadsPage = async (params) => { return await request.get({ url: `/crm/backlog/page`, params }) } -export { type CustomerVO, type ClueVO } +export { type CustomerVO, type ClueVO } diff --git a/src/views/crm/backlog/tables/CheckContract.vue b/src/views/crm/backlog/tables/CheckContract.vue index 591bebd7..87786f5b 100644 --- a/src/views/crm/backlog/tables/CheckContract.vue +++ b/src/views/crm/backlog/tables/CheckContract.vue @@ -18,7 +18,7 @@ @change="handleQuery" > - - + diff --git a/src/views/crm/backlog/tables/EndContract.vue b/src/views/crm/backlog/tables/EndContract.vue index 1910c970..f31bb524 100644 --- a/src/views/crm/backlog/tables/EndContract.vue +++ b/src/views/crm/backlog/tables/EndContract.vue @@ -1,15 +1,175 @@ - - + - + diff --git a/src/views/crm/backlog/tables/FollowCustomer.vue b/src/views/crm/backlog/tables/FollowCustomer.vue index e60e3559..0c768516 100644 --- a/src/views/crm/backlog/tables/FollowCustomer.vue +++ b/src/views/crm/backlog/tables/FollowCustomer.vue @@ -114,7 +114,6 @@ import { DICT_TYPE } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import { FOLLOWUP_STATUS } from './common' - const { push } = useRouter() const loading = ref(true) // 列表的加载中 diff --git a/src/views/crm/backlog/tables/PutInPoolRemind.vue b/src/views/crm/backlog/tables/PutInPoolRemind.vue index bc99a885..5559f656 100644 --- a/src/views/crm/backlog/tables/PutInPoolRemind.vue +++ b/src/views/crm/backlog/tables/PutInPoolRemind.vue @@ -119,7 +119,7 @@ const queryParams = ref({ pageNo: 1, pageSize: 10, sceneType: 1, // 我负责的 - pool: true, // 固定 公海参数为 true + pool: true // 固定 公海参数为 true }) const queryFormRef = ref() // 搜索的表单 diff --git a/src/views/crm/backlog/tables/RemindReceivables.vue b/src/views/crm/backlog/tables/RemindReceivables.vue index fd99b9e6..e375a53b 100644 --- a/src/views/crm/backlog/tables/RemindReceivables.vue +++ b/src/views/crm/backlog/tables/RemindReceivables.vue @@ -1,15 +1,193 @@ - - + diff --git a/src/views/crm/backlog/tables/common.ts b/src/views/crm/backlog/tables/common.ts index f2ac36a9..fafc154f 100644 --- a/src/views/crm/backlog/tables/common.ts +++ b/src/views/crm/backlog/tables/common.ts @@ -18,8 +18,21 @@ export const CONTACT_STATUS = [ { label: '已联系', value: 3 } ] -/** 合同审批状态 */ -export const CONTRACT_AUDIT_STATUS = [ +/** 审批状态 */ +export const AUDIT_STATUS = [ { label: '已审批', value: 20 }, { label: '待审批', value: 10 } ] + +/** 回款提醒类型 */ +export const RECEIVABLE_REMIND_TYPE = [ + { label: '待回款', value: 1 }, + { label: '已逾期', value: 2 }, + { label: '已回款', value: 3 } +] + +/** 合同过期状态 */ +export const CONTRACT_EXPIRY_TYPE = [ + { label: '即将过期', value: 1 }, + { label: '已过期', value: 2 } +]