From 291dc518499cf9bf634a72829b065f42b3046208 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 Mar 2024 11:48:41 +0800
Subject: [PATCH] =?UTF-8?q?CRM=EF=BC=9A=E5=AE=8C=E5=96=84=E3=80=90?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E7=89=88=E3=80=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContactCountRank.vue}                     |  2 +-
 .../{ => components}/ContractCountRank.vue    |  0
 .../{ => components}/ContractPriceRank.vue    |  9 +++-
 .../{ => components}/CustomerCountRank.vue    |  0
 .../rank/{ => components}/FollowCountRank.vue |  0
 .../FollowCustomerCountRank.vue               |  0
 .../{ => components}/ProductSalesRank.vue     |  0
 .../{ => components}/ReceivablePriceRank.vue  |  9 +++-
 src/views/crm/statistics/rank/index.vue       | 41 ++++++++++---------
 9 files changed, 38 insertions(+), 23 deletions(-)
 rename src/views/crm/statistics/rank/{ContactsCountRank.vue => components/ContactCountRank.vue} (98%)
 rename src/views/crm/statistics/rank/{ => components}/ContractCountRank.vue (100%)
 rename src/views/crm/statistics/rank/{ => components}/ContractPriceRank.vue (91%)
 rename src/views/crm/statistics/rank/{ => components}/CustomerCountRank.vue (100%)
 rename src/views/crm/statistics/rank/{ => components}/FollowCountRank.vue (100%)
 rename src/views/crm/statistics/rank/{ => components}/FollowCustomerCountRank.vue (100%)
 rename src/views/crm/statistics/rank/{ => components}/ProductSalesRank.vue (100%)
 rename src/views/crm/statistics/rank/{ => components}/ReceivablePriceRank.vue (91%)

diff --git a/src/views/crm/statistics/rank/ContactsCountRank.vue b/src/views/crm/statistics/rank/components/ContactCountRank.vue
similarity index 98%
rename from src/views/crm/statistics/rank/ContactsCountRank.vue
rename to src/views/crm/statistics/rank/components/ContactCountRank.vue
index 199d94bd..5edc118b 100644
--- a/src/views/crm/statistics/rank/ContactsCountRank.vue
+++ b/src/views/crm/statistics/rank/components/ContactCountRank.vue
@@ -22,7 +22,7 @@ import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/ra
 import { EChartsOption } from 'echarts'
 import { clone } from 'lodash-es'
 
-defineOptions({ name: 'ContactsCountRank' })
+defineOptions({ name: 'ContactCountRank' })
 const props = defineProps<{ queryParams: any }>() // 搜索参数
 
 const loading = ref(false) // 加载中
diff --git a/src/views/crm/statistics/rank/ContractCountRank.vue b/src/views/crm/statistics/rank/components/ContractCountRank.vue
similarity index 100%
rename from src/views/crm/statistics/rank/ContractCountRank.vue
rename to src/views/crm/statistics/rank/components/ContractCountRank.vue
diff --git a/src/views/crm/statistics/rank/ContractPriceRank.vue b/src/views/crm/statistics/rank/components/ContractPriceRank.vue
similarity index 91%
rename from src/views/crm/statistics/rank/ContractPriceRank.vue
rename to src/views/crm/statistics/rank/components/ContractPriceRank.vue
index 79794c4e..b69ebd20 100644
--- a/src/views/crm/statistics/rank/ContractPriceRank.vue
+++ b/src/views/crm/statistics/rank/components/ContractPriceRank.vue
@@ -13,7 +13,13 @@
       <el-table-column label="公司排名" align="center" type="index" width="80" />
       <el-table-column label="签订人" align="center" prop="nickname" min-width="200" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="200" />
-      <el-table-column label="合同金额（元）" align="center" prop="count" min-width="200" />
+      <el-table-column
+        label="合同金额（元）"
+        align="center"
+        prop="count"
+        min-width="200"
+        :formatter="erpPriceTableColumnFormatter"
+      />
     </el-table>
   </el-card>
 </template>
@@ -21,6 +27,7 @@
 import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank'
 import { EChartsOption } from 'echarts'
 import { clone } from 'lodash-es'
+import { erpPriceTableColumnFormatter } from '@/utils'
 
 defineOptions({ name: 'ContractPriceRank' })
 const props = defineProps<{ queryParams: any }>() // 搜索参数
diff --git a/src/views/crm/statistics/rank/CustomerCountRank.vue b/src/views/crm/statistics/rank/components/CustomerCountRank.vue
similarity index 100%
rename from src/views/crm/statistics/rank/CustomerCountRank.vue
rename to src/views/crm/statistics/rank/components/CustomerCountRank.vue
diff --git a/src/views/crm/statistics/rank/FollowCountRank.vue b/src/views/crm/statistics/rank/components/FollowCountRank.vue
similarity index 100%
rename from src/views/crm/statistics/rank/FollowCountRank.vue
rename to src/views/crm/statistics/rank/components/FollowCountRank.vue
diff --git a/src/views/crm/statistics/rank/FollowCustomerCountRank.vue b/src/views/crm/statistics/rank/components/FollowCustomerCountRank.vue
similarity index 100%
rename from src/views/crm/statistics/rank/FollowCustomerCountRank.vue
rename to src/views/crm/statistics/rank/components/FollowCustomerCountRank.vue
diff --git a/src/views/crm/statistics/rank/ProductSalesRank.vue b/src/views/crm/statistics/rank/components/ProductSalesRank.vue
similarity index 100%
rename from src/views/crm/statistics/rank/ProductSalesRank.vue
rename to src/views/crm/statistics/rank/components/ProductSalesRank.vue
diff --git a/src/views/crm/statistics/rank/ReceivablePriceRank.vue b/src/views/crm/statistics/rank/components/ReceivablePriceRank.vue
similarity index 91%
rename from src/views/crm/statistics/rank/ReceivablePriceRank.vue
rename to src/views/crm/statistics/rank/components/ReceivablePriceRank.vue
index a2f38422..06d7d9f3 100644
--- a/src/views/crm/statistics/rank/ReceivablePriceRank.vue
+++ b/src/views/crm/statistics/rank/components/ReceivablePriceRank.vue
@@ -13,7 +13,13 @@
       <el-table-column label="公司排名" align="center" type="index" width="80" />
       <el-table-column label="签订人" align="center" prop="nickname" min-width="200" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="200" />
-      <el-table-column label="回款金额（元）" align="center" prop="count" min-width="200" />
+      <el-table-column
+        label="回款金额（元）"
+        align="center"
+        prop="count"
+        min-width="200"
+        :formatter="erpPriceTableColumnFormatter"
+      />
     </el-table>
   </el-card>
 </template>
@@ -21,6 +27,7 @@
 import { StatisticsRankApi, StatisticsRankRespVO } from '@/api/crm/statistics/rank'
 import { EChartsOption } from 'echarts'
 import { clone } from 'lodash-es'
+import { erpPriceTableColumnFormatter } from '@/utils'
 
 defineOptions({ name: 'ReceivablePriceRank' })
 const props = defineProps<{ queryParams: any }>() // 搜索参数
diff --git a/src/views/crm/statistics/rank/index.vue b/src/views/crm/statistics/rank/index.vue
index 50f2f43f..98340cc5 100644
--- a/src/views/crm/statistics/rank/index.vue
+++ b/src/views/crm/statistics/rank/index.vue
@@ -29,6 +29,7 @@
           check-strictly
           node-key="id"
           placeholder="请选择归属部门"
+          class="!w-240px"
         />
       </el-form-item>
       <el-form-item>
@@ -62,8 +63,8 @@
         <CustomerCountRank :query-params="queryParams" ref="customerCountRankRef" />
       </el-tab-pane>
       <!-- 新增联系人数排行 -->
-      <el-tab-pane label="新增联系人数排行" name="contactsCountRank" lazy>
-        <ContactsCountRank :query-params="queryParams" ref="contactsCountRankRef" />
+      <el-tab-pane label="新增联系人数排行" name="contactCountRank" lazy>
+        <ContactCountRank :query-params="queryParams" ref="contactCountRankRef" />
       </el-tab-pane>
       <!-- 跟进次数排行 -->
       <el-tab-pane label="跟进次数排行" name="followCountRank" lazy>
@@ -77,14 +78,14 @@
   </el-col>
 </template>
 <script lang="ts" setup>
-import ContractPriceRank from './ContractPriceRank.vue'
-import ReceivablePriceRank from './ReceivablePriceRank.vue'
-import ContractCountRank from './ContractCountRank.vue'
-import ProductSalesRank from './ProductSalesRank.vue'
-import CustomerCountRank from './CustomerCountRank.vue'
-import ContactsCountRank from './ContactsCountRank.vue'
-import FollowCountRank from './FollowCountRank.vue'
-import FollowCustomerCountRank from './FollowCustomerCountRank.vue'
+import ContractPriceRank from './components/ContractPriceRank.vue'
+import ReceivablePriceRank from './components/ReceivablePriceRank.vue'
+import ContractCountRank from './components/ContractCountRank.vue'
+import ProductSalesRank from './components/ProductSalesRank.vue'
+import CustomerCountRank from './components/CustomerCountRank.vue'
+import ContactCountRank from './components/ContactCountRank.vue'
+import FollowCountRank from './components/FollowCountRank.vue'
+import FollowCustomerCountRank from './components/FollowCustomerCountRank.vue'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
@@ -109,35 +110,35 @@ const receivablePriceRankRef = ref() // ReceivablePriceRank 组件的引用
 const contractCountRankRef = ref() // ContractCountRank 组件的引用
 const productSalesRankRef = ref() // ProductSalesRank 组件的引用
 const customerCountRankRef = ref() // CustomerCountRank 组件的引用
-const contactsCountRankRef = ref() // ContactsCountRank 组件的引用
+const contactCountRankRef = ref() // ContactCountRank 组件的引用
 const followCountRankRef = ref() // FollowCountRank 组件的引用
 const followCustomerCountRankRef = ref() // FollowCustomerCountRank 组件的引用
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   switch (activeTab.value) {
-    case 'contractPriceRank':
+    case 'contractPriceRank': // 合同金额排行
       contractPriceRankRef.value?.loadData?.()
       break
-    case 'receivablePriceRank':
+    case 'receivablePriceRank': // 回款金额排行
       receivablePriceRankRef.value?.loadData?.()
       break
-    case 'contractCountRank':
+    case 'contractCountRank': // 签约合同排行
       contractCountRankRef.value?.loadData?.()
       break
-    case 'productSalesRank':
+    case 'productSalesRank': // 产品销量排行
       productSalesRankRef.value?.loadData?.()
       break
-    case 'customerCountRank':
+    case 'customerCountRank': // 新增客户数排行
       customerCountRankRef.value?.loadData?.()
       break
-    case 'contactsCountRank':
-      contactsCountRankRef.value?.loadData?.()
+    case 'contactCountRank': // 新增联系人数排行
+      contactCountRankRef.value?.loadData?.()
       break
-    case 'followCountRank':
+    case 'followCountRank': // 跟进次数排行
       followCountRankRef.value?.loadData?.()
       break
-    case 'followCustomerCountRank':
+    case 'followCustomerCountRank': // 跟进客户数排行
       followCustomerCountRankRef.value?.loadData?.()
       break
   }