From a2de0665eb6088e26cc04dd413dcce463c869adc Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Wed, 14 Feb 2024 23:28:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20Backlog=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=BB=91=E6=9A=97=E6=A8=A1=E5=BC=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/backlog/index.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/crm/backlog/index.vue b/src/views/crm/backlog/index.vue
index 5fb53960..cb92d43a 100644
--- a/src/views/crm/backlog/index.vue
+++ b/src/views/crm/backlog/index.vue
@@ -96,8 +96,8 @@ const leftSides = ref([
 const sideClick = (item) => {
   leftType.value = item.infoType
 }
-// TODO @dhb52: 侧边栏样式，在黑暗模式下，颜色会不对。是不是可以读取主题色哈；
 </script>
+
 <style lang="scss" scoped>
 .side-item-list {
   top: 0;
@@ -105,8 +105,8 @@ const sideClick = (item) => {
   left: 0;
   z-index: 1;
   font-size: 14px;
-  background-color: white;
-  border: 1px solid #e6e6e6;
+  background-color: var(--el-bg-color);
+  border: 1px solid var(--el-border-color);
   border-radius: 5px;
 
   .side-item {
@@ -115,21 +115,17 @@ const sideClick = (item) => {
     padding: 0 20px;
     line-height: 50px;
     cursor: pointer;
-
-    i {
-      color: #999;
-    }
   }
 }
 
 .side-item-default {
-  color: #333;
+  color: var(--el-text-color-primary);
   border-right: 2px solid transparent;
 }
 
 .side-item-select {
-  color: #409eff;
-  background-color: #ecf5ff;
+  color: var(--el-color-primary);
+  background-color: var(--el-color-primary-light-9);
   border-right: 2px solid var(--el-color-primary);
 }
 

From c1c48c20a3733aca5bb109341d9812a8e6ab2b06 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 16 Feb 2024 22:38:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20TodayCustomer=E5=88=A9=E7=94=A8?=
 =?UTF-8?q?CustomerApi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/backlog/tables/TodayCustomer.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/crm/backlog/tables/TodayCustomer.vue b/src/views/crm/backlog/tables/TodayCustomer.vue
index f98107af..5fad2b27 100644
--- a/src/views/crm/backlog/tables/TodayCustomer.vue
+++ b/src/views/crm/backlog/tables/TodayCustomer.vue
@@ -119,7 +119,7 @@
 </template>
 
 <script lang="ts" setup name="TodayCustomer">
-import * as BacklogApi from '@/api/crm/backlog'
+import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import { CONTACT_STATUS, SCENE_TYPES } from './common'
@@ -133,7 +133,8 @@ const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
   contactStatus: 1,
-  sceneType: 1
+  sceneType: 1,
+  pool: null // 是否公海数据
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -141,7 +142,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
-    const data = await BacklogApi.getTodayCustomerPage(queryParams.value)
+    const data = await CustomerApi.getCustomerPage(queryParams.value)
     list.value = data.list
     total.value = data.total
   } finally {

From 42b8df47677a49bfef096e30127fe1fe40016e38 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 18 Feb 2024 00:04:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E3=80=90?=
 =?UTF-8?q?=E5=BE=85=E5=9B=9E=E6=AC=BE=E6=8F=90=E9=86=92=E3=80=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/backlog/tables/RemindReceivables.vue  | 65 -------------------
 1 file changed, 65 deletions(-)

diff --git a/src/views/crm/backlog/tables/RemindReceivables.vue b/src/views/crm/backlog/tables/RemindReceivables.vue
index e375a53b..8ca3fd4d 100644
--- a/src/views/crm/backlog/tables/RemindReceivables.vue
+++ b/src/views/crm/backlog/tables/RemindReceivables.vue
@@ -68,26 +68,6 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" width="130px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['crm:receivable-plan:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['crm:receivable-plan:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -102,16 +82,12 @@
 <script setup lang="ts" name="RemindReceivables">
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
-import download from '@/utils/download'
 import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
 import * as UserApi from '@/api/system/user'
 import { RECEIVABLE_REMIND_TYPE } from './common'
 
 defineOptions({ name: 'ReceivablePlan' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
@@ -122,7 +98,6 @@ const queryParams = reactive({
   remindType: 1
 })
 const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 
 /** 查询列表 */
 const getList = async () => {
@@ -142,46 +117,6 @@ const handleQuery = () => {
   getList()
 }
 
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ReceivablePlanApi.deleteReceivablePlan(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ReceivablePlanApi.exportReceivablePlan(queryParams)
-    download.excel(data, '回款计划.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
 /** 初始化 **/
 onMounted(async () => {
   await getList()

From e067d5073dffb900f51d8b9e0ed6e9d93ffcd335 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sun, 18 Feb 2024 00:04:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20CRM/backlog=20=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/backlog/index.ts    | 46 ++++++++++++++++++++++++--------
 src/views/crm/backlog/index.vue | 47 ++++++++++++++++++++++-----------
 2 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/src/api/crm/backlog/index.ts b/src/api/crm/backlog/index.ts
index e9494aa8..6ff03e3f 100644
--- a/src/api/crm/backlog/index.ts
+++ b/src/api/crm/backlog/index.ts
@@ -1,17 +1,41 @@
 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 })
+// 1. 获得今日需联系客户数量
+export const getTodayCustomerCount = async () => {
+  return await request.get({ url: '/crm/customer/today-customer-count' })
 }
 
-// 查询线索列表
-export const getFollowLeadsPage = async (params) => {
-  return await request.get({ url: `/crm/backlog/page`, params })
+// 2. 获得分配给我的线索数量
+export const getFollowLeadsCount = async () => {
+  return await request.get({ url: '/crm/clue/follow-leads-count' })
 }
 
-export { type CustomerVO, type ClueVO }
+// 3. 获得分配给我的客户数量
+export const getFollowCustomerCount = async () => {
+  return await request.get({ url: '/crm/customer/follow-customer-count' })
+}
+
+// 4. 获得待进入公海的客户数量
+export const getPutInPoolCustomerRemindCount = async () => {
+  return await request.get({ url: '/crm/customer/put-in-pool-remind-count' })
+}
+
+// 5. 获得待审核合同数量
+export const getCheckContractCount = async () => {
+  return await request.get({ url: '/crm/contract/check-contract-count' })
+}
+
+// 6. 获得待审核回款数量
+export const getCheckReceivablesCount = async () => {
+  return await request.get({ url: '/crm/receivable/check-receivables-count' })
+}
+
+// 7. 获得待回款提醒数量
+export const getRemindReceivablePlanCount = async () => {
+  return await request.get({ url: '/crm/receivable-plan/remind-receivable-plan-count' })
+}
+
+// 8. 获得即将到期的合同数量
+export const getEndContractCount = async () => {
+  return await request.get({ url: '/crm/contract/end-contract-count' })
+}
diff --git a/src/views/crm/backlog/index.vue b/src/views/crm/backlog/index.vue
index cb92d43a..bf5a9608 100644
--- a/src/views/crm/backlog/index.vue
+++ b/src/views/crm/backlog/index.vue
@@ -29,6 +29,7 @@
 </template>
 
 <script lang="ts" setup>
+import * as BacklogApi from '@/api/crm/backlog'
 import CheckContract from './tables/CheckContract.vue'
 import CheckReceivables from './tables/CheckReceivables.vue'
 import EndContract from './tables/EndContract.vue'
@@ -39,54 +40,56 @@ import RemindReceivables from './tables/RemindReceivables.vue'
 import TodayCustomer from './tables/TodayCustomer.vue'
 
 const leftType = ref('todayCustomer')
+
+const todayCustomerCountRef = ref(0)
+const followLeadsCountRef = ref(0)
+const followCustomerCountRef = ref(0)
+const putInPoolCustomerRemindCountRef = ref(0)
+const checkContractCountRef = ref(0)
+const checkReceivablesCountRef = ref(0)
+const remindReceivablesCountRef = ref(0)
+const endContractCountRef = ref(0)
+
 const leftSides = ref([
   {
     name: '今日需联系客户',
     infoType: 'todayCustomer',
-    msgCount: 1,
-    tips: '下次跟进时间为今日的客户'
+    msgCount: todayCustomerCountRef
   },
   {
     name: '分配给我的线索',
     infoType: 'followLeads',
-    msgCount: 0,
-    tips: '转移之后未跟进的线索'
+    msgCount: followLeadsCountRef
   },
   {
     name: '分配给我的客户',
     infoType: 'followCustomer',
-    msgCount: 0,
-    tips: '转移、领取、分配之后未跟进的客户，默认显示自己负责的客户'
+    msgCount: followCustomerCountRef
   },
   {
     name: '待进入公海的客户',
     infoType: 'putInPoolRemind',
-    msgCount: 0,
-    tips: ''
+    msgCount: putInPoolCustomerRemindCountRef
   },
   {
     name: '待审核合同',
     infoType: 'checkContract',
-    msgCount: 0,
-    tips: ''
+    msgCount: checkContractCountRef
   },
   {
     name: '待审核回款',
     infoType: 'checkReceivables',
-    msgCount: 0,
-    tips: ''
+    msgCount: checkReceivablesCountRef
   },
   {
     name: '待回款提醒',
     infoType: 'remindReceivables',
-    msgCount: 4,
-    tips: ''
+    msgCount: remindReceivablesCountRef
   },
   {
     name: '即将到期的合同',
     infoType: 'endContract',
-    msgCount: 20,
-    tips: '根据“合同到期时间”及设置的“提前提醒天数”提醒'
+    msgCount: endContractCountRef
   }
 ])
 
@@ -96,6 +99,18 @@ const leftSides = ref([
 const sideClick = (item) => {
   leftType.value = item.infoType
 }
+
+/** 加载时读取待办数量 */
+onMounted(async () => {
+  BacklogApi.getTodayCustomerCount().then(count => todayCustomerCountRef.value = count)
+  BacklogApi.getFollowLeadsCount().then(count => followLeadsCountRef.value = count)
+  BacklogApi.getFollowCustomerCount().then(count => followCustomerCountRef.value = count)
+  BacklogApi.getPutInPoolCustomerRemindCount().then(count => putInPoolCustomerRemindCountRef.value = count)
+  BacklogApi.getCheckContractCount().then(count => checkContractCountRef.value = count)
+  BacklogApi.getCheckReceivablesCount().then(count => checkReceivablesCountRef.value = count)
+  BacklogApi.getRemindReceivablePlanCount().then(count => remindReceivablesCountRef.value = count)
+  BacklogApi.getEndContractCount().then(count => endContractCountRef.value = count)
+})
 </script>
 
 <style lang="scss" scoped>