From dfad8e78c48717deaa226ef5a3675b07d0e639f4 Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 00:40:20 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.ts                                       |  5 +++--
 ...ConfDetails.vue => CustomerLimitConfigList.vue} | 14 +++++++++++---
 src/views/crm/customerLimitConfig/index.vue        |  7 +++----
 src/views/crm/customerPoolConf/index.vue           | 10 +++++-----
 4 files changed, 22 insertions(+), 14 deletions(-)
 rename src/api/crm/{customerPoolConf => customerPoolConfig}/index.ts (67%)
 rename src/views/crm/customerLimitConfig/{CustomerLimitConfDetails.vue => CustomerLimitConfigList.vue} (91%)

diff --git a/src/api/crm/customerPoolConf/index.ts b/src/api/crm/customerPoolConfig/index.ts
similarity index 67%
rename from src/api/crm/customerPoolConf/index.ts
rename to src/api/crm/customerPoolConfig/index.ts
index 8234ba367..3cd8ef282 100644
--- a/src/api/crm/customerPoolConf/index.ts
+++ b/src/api/crm/customerPoolConfig/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { ConfigVO } from '@/api/infra/config'
 
 export interface CustomerPoolConfigVO {
   enabled?: boolean
@@ -14,6 +15,6 @@ export const getCustomerPoolConfig = async () => {
 }
 
 // 更新客户公海规则设置
-export const updateCustomerPoolConfig = async (data: ConfigVO) => {
-  return await request.put({ url: `/crm/customer-pool-config/update`, data })
+export const saveCustomerPoolConfig = async (data: ConfigVO) => {
+  return await request.put({ url: `/crm/customer-pool-config/save`, data })
 }
diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue b/src/views/crm/customerLimitConfig/CustomerLimitConfigList.vue
similarity index 91%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue
rename to src/views/crm/customerLimitConfig/CustomerLimitConfigList.vue
index 611bdadf9..864c57768 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue
+++ b/src/views/crm/customerLimitConfig/CustomerLimitConfigList.vue
@@ -19,8 +19,16 @@
   >
     <el-table-column label="编号" align="center" prop="id" />
     <el-table-column label="规则类型" align="center" prop="type" />
-    <el-table-column label="规则适用人群" align="center" prop="userNames" />
-    <el-table-column label="规则适用部门" align="center" prop="deptNames" />
+    <el-table-column
+      label="规则适用人群"
+      align="center"
+      :formatter="(row) => row.users?.map((user: any) => user.nickname).join('，')"
+    />
+    <el-table-column
+      label="规则适用部门"
+      align="center"
+      :formatter="(row) => row.depts?.map((dept: any) => dept.name).join('，')"
+    />
     <el-table-column
       :label="
         confType === LimitConfType.CUSTOMER_QUANTITY_LIMIT ? '拥有客户数上限' : '锁定客户数上限'
@@ -84,7 +92,7 @@ import CustomerLimitConfigForm from '@/views/crm/customerLimitConfig/CustomerLim
 import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
 import { DICT_TYPE } from '@/utils/dict'
 
-defineOptions({ name: 'CustomerLimitConfDetails' })
+defineOptions({ name: 'CustomerLimitConfigList' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
diff --git a/src/views/crm/customerLimitConfig/index.vue b/src/views/crm/customerLimitConfig/index.vue
index 1bccf4d35..6873217bb 100644
--- a/src/views/crm/customerLimitConfig/index.vue
+++ b/src/views/crm/customerLimitConfig/index.vue
@@ -3,17 +3,16 @@
   <ContentWrap>
     <el-tabs>
       <el-tab-pane label="拥有客户数限制">
-        <!-- TODO @wanwan：CustomerLimitConfigList，因为它是列表哈 -->
-        <CustomerLimitConfDetails :confType="LimitConfType.CUSTOMER_QUANTITY_LIMIT" />
+        <CustomerLimitConfigList :confType="LimitConfType.CUSTOMER_QUANTITY_LIMIT" />
       </el-tab-pane>
       <el-tab-pane label="锁定客户数限制">
-        <CustomerLimitConfDetails :confType="LimitConfType.CUSTOMER_LOCK_LIMIT" />
+        <CustomerLimitConfigList :confType="LimitConfType.CUSTOMER_LOCK_LIMIT" />
       </el-tab-pane>
     </el-tabs>
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import CustomerLimitConfDetails from '@/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue'
+import CustomerLimitConfigList from '@/views/crm/customerLimitConfig/CustomerLimitConfigList.vue'
 import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
 
 defineOptions({ name: 'CrmCustomerLimitConfig' })
diff --git a/src/views/crm/customerPoolConf/index.vue b/src/views/crm/customerPoolConf/index.vue
index 5fa98711d..5ec343aa8 100644
--- a/src/views/crm/customerPoolConf/index.vue
+++ b/src/views/crm/customerPoolConf/index.vue
@@ -52,11 +52,11 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import * as CustomerPoolConfApi from '@/api/crm/customerPoolConf'
+import * as CustomerPoolConfigApi from '@/api/crm/customerPoolConfig'
 import { CardTitle } from '@/components/Card'
 
 // TODO @wanwan：CustomerPoolConf =》 CustomerPoolConfig；另外，我们在 crm 目录下，新建一个 config 目录，然后把 customerPoolConfig 和 customerLimitConfig 都挪进
-defineOptions({ name: 'CustomerPoolConf' })
+defineOptions({ name: 'CustomerPoolConfig' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -78,7 +78,7 @@ const formRef = ref() // 表单 Ref
 const getConfig = async () => {
   try {
     formLoading.value = true
-    const data = await CustomerPoolConfApi.getCustomerPoolConfig()
+    const data = await CustomerPoolConfigApi.getCustomerPoolConfig()
     if (data === null) {
       return
     }
@@ -97,8 +97,8 @@ const onSubmit = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as CustomerPoolConfApi.CustomerPoolConfigVO
-    await CustomerPoolConfApi.updateCustomerPoolConfig(data)
+    const data = formData.value as unknown as CustomerPoolConfigApi.CustomerPoolConfigVO
+    await CustomerPoolConfigApi.saveCustomerPoolConfig(data)
     message.success(t('common.updateSuccess'))
     await getConfig()
     formLoading.value = false
-- 
Gitee


From 327f82245a9e31464274316d45e139ff0017e17f Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 01:09:11 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerLimitConfig/CustomerLimitConfigForm.vue             | 2 +-
 .../customerLimitConfig/CustomerLimitConfigList.vue             | 2 +-
 .../crm/{ => config}/customerLimitConfig/customerLimitConf.ts   | 0
 src/views/crm/{ => config}/customerLimitConfig/index.vue        | 2 +-
 .../{customerPoolConf => config/customerPoolConfig}/index.vue   | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/views/crm/{ => config}/customerLimitConfig/CustomerLimitConfigForm.vue (98%)
 rename src/views/crm/{ => config}/customerLimitConfig/CustomerLimitConfigList.vue (97%)
 rename src/views/crm/{ => config}/customerLimitConfig/customerLimitConf.ts (100%)
 rename src/views/crm/{ => config}/customerLimitConfig/index.vue (87%)
 rename src/views/crm/{customerPoolConf => config/customerPoolConfig}/index.vue (98%)

diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
similarity index 98%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue
rename to src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
index 880106f07..ad98e056e 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
@@ -57,7 +57,7 @@
 </template>
 <script setup lang="ts">
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
+import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as UserApi from '@/api/system/user'
diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfigList.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
similarity index 97%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfigList.vue
rename to src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
index 864c57768..5457caff2 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfigList.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
@@ -89,7 +89,7 @@
 import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
 import CustomerLimitConfigForm from '@/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
+import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConfig'
 import { DICT_TYPE } from '@/utils/dict'
 
 defineOptions({ name: 'CustomerLimitConfigList' })
diff --git a/src/views/crm/customerLimitConfig/customerLimitConf.ts b/src/views/crm/config/customerLimitConfig/customerLimitConf.ts
similarity index 100%
rename from src/views/crm/customerLimitConfig/customerLimitConf.ts
rename to src/views/crm/config/customerLimitConfig/customerLimitConf.ts
diff --git a/src/views/crm/customerLimitConfig/index.vue b/src/views/crm/config/customerLimitConfig/index.vue
similarity index 87%
rename from src/views/crm/customerLimitConfig/index.vue
rename to src/views/crm/config/customerLimitConfig/index.vue
index 6873217bb..134536385 100644
--- a/src/views/crm/customerLimitConfig/index.vue
+++ b/src/views/crm/config/customerLimitConfig/index.vue
@@ -13,7 +13,7 @@
 </template>
 <script setup lang="ts">
 import CustomerLimitConfigList from '@/views/crm/customerLimitConfig/CustomerLimitConfigList.vue'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
+import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
 
 defineOptions({ name: 'CrmCustomerLimitConfig' })
 </script>
diff --git a/src/views/crm/customerPoolConf/index.vue b/src/views/crm/config/customerPoolConfig/index.vue
similarity index 98%
rename from src/views/crm/customerPoolConf/index.vue
rename to src/views/crm/config/customerPoolConfig/index.vue
index 5ec343aa8..aaafebb45 100644
--- a/src/views/crm/customerPoolConf/index.vue
+++ b/src/views/crm/config/customerPoolConfig/index.vue
@@ -56,7 +56,7 @@ import * as CustomerPoolConfigApi from '@/api/crm/customerPoolConfig'
 import { CardTitle } from '@/components/Card'
 
 // TODO @wanwan：CustomerPoolConf =》 CustomerPoolConfig；另外，我们在 crm 目录下，新建一个 config 目录，然后把 customerPoolConfig 和 customerLimitConfig 都挪进
-defineOptions({ name: 'CustomerPoolConfig' })
+defineOptions({ name: 'CrmCustomerPoolConfig' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-- 
Gitee


From c9d46fe4a394baffc18877c124a18f71a75ba4bb Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 01:33:20 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/customerLimitConfig/CustomerLimitConfigList.vue    | 4 ++--
 src/views/crm/config/customerLimitConfig/index.vue            | 2 +-
 src/views/crm/config/customerPoolConfig/index.vue             | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
index 5457caff2..763585633 100644
--- a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
@@ -88,8 +88,8 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import CustomerLimitConfigForm from '@/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue'
-import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConfig'
+import CustomerLimitConfigForm from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue'
+import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
 import { DICT_TYPE } from '@/utils/dict'
 
 defineOptions({ name: 'CustomerLimitConfigList' })
diff --git a/src/views/crm/config/customerLimitConfig/index.vue b/src/views/crm/config/customerLimitConfig/index.vue
index 134536385..fda234160 100644
--- a/src/views/crm/config/customerLimitConfig/index.vue
+++ b/src/views/crm/config/customerLimitConfig/index.vue
@@ -12,7 +12,7 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import CustomerLimitConfigList from '@/views/crm/customerLimitConfig/CustomerLimitConfigList.vue'
+import CustomerLimitConfigList from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue'
 import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
 
 defineOptions({ name: 'CrmCustomerLimitConfig' })
diff --git a/src/views/crm/config/customerPoolConfig/index.vue b/src/views/crm/config/customerPoolConfig/index.vue
index aaafebb45..b4c1d096a 100644
--- a/src/views/crm/config/customerPoolConfig/index.vue
+++ b/src/views/crm/config/customerPoolConfig/index.vue
@@ -55,7 +55,6 @@
 import * as CustomerPoolConfigApi from '@/api/crm/customerPoolConfig'
 import { CardTitle } from '@/components/Card'
 
-// TODO @wanwan：CustomerPoolConf =》 CustomerPoolConfig；另外，我们在 crm 目录下，新建一个 config 目录，然后把 customerPoolConfig 和 customerLimitConfig 都挪进
 defineOptions({ name: 'CrmCustomerPoolConfig' })
 
 const message = useMessage() // 消息弹窗
-- 
Gitee


From cc7038dc2b7de88f7026cc8398a41be3098b272a Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 01:39:26 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/customerLimitConfig/index.ts           | 14 ++++++++++++++
 .../CustomerLimitConfigForm.vue                    |  2 +-
 .../CustomerLimitConfigList.vue                    |  2 +-
 ...customerLimitConf.ts => customerLimitConfig.ts} | 10 ----------
 src/views/crm/config/customerLimitConfig/index.vue |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)
 rename src/views/crm/config/customerLimitConfig/{customerLimitConf.ts => customerLimitConfig.ts} (35%)

diff --git a/src/api/crm/customerLimitConfig/index.ts b/src/api/crm/customerLimitConfig/index.ts
index 22fde3ea5..86776326c 100644
--- a/src/api/crm/customerLimitConfig/index.ts
+++ b/src/api/crm/customerLimitConfig/index.ts
@@ -9,6 +9,20 @@ export interface CustomerLimitConfigVO {
   dealCountEnabled?: boolean
 }
 
+/**
+ * 客户限制配置类型
+ */
+export enum LimitConfType {
+  /**
+   * 拥有客户数限制
+   */
+  CUSTOMER_QUANTITY_LIMIT = 1,
+  /**
+   * 锁定客户数限制
+   */
+  CUSTOMER_LOCK_LIMIT = 2
+}
+
 // 查询客户限制配置列表
 export const getCustomerLimitConfigPage = async (params) => {
   return await request.get({ url: `/crm/customer-limit-config/page`, params })
diff --git a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
index ad98e056e..e7dee69fa 100644
--- a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
@@ -57,11 +57,11 @@
 </template>
 <script setup lang="ts">
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as UserApi from '@/api/system/user'
 import { cloneDeep } from 'lodash-es'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
index 763585633..d0181421f 100644
--- a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
@@ -89,8 +89,8 @@
 import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
 import CustomerLimitConfigForm from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue'
-import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
 import { DICT_TYPE } from '@/utils/dict'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
 defineOptions({ name: 'CustomerLimitConfigList' })
 
diff --git a/src/views/crm/config/customerLimitConfig/customerLimitConf.ts b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
similarity index 35%
rename from src/views/crm/config/customerLimitConfig/customerLimitConf.ts
rename to src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
index 1336e1374..7584849a9 100644
--- a/src/views/crm/config/customerLimitConfig/customerLimitConf.ts
+++ b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
@@ -2,13 +2,3 @@
 /**
  * 客户限制配置类型
  */
-export enum LimitConfType {
-  /**
-   * 拥有客户数限制
-   */
-  CUSTOMER_QUANTITY_LIMIT = 1,
-  /**
-   * 锁定客户数限制
-   */
-  CUSTOMER_LOCK_LIMIT = 2
-}
diff --git a/src/views/crm/config/customerLimitConfig/index.vue b/src/views/crm/config/customerLimitConfig/index.vue
index fda234160..d385f46ba 100644
--- a/src/views/crm/config/customerLimitConfig/index.vue
+++ b/src/views/crm/config/customerLimitConfig/index.vue
@@ -13,7 +13,7 @@
 </template>
 <script setup lang="ts">
 import CustomerLimitConfigList from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue'
-import { LimitConfType } from '@/views/crm/config/customerLimitConfig/customerLimitConf'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
 defineOptions({ name: 'CrmCustomerLimitConfig' })
 </script>
-- 
Gitee


From c4bd4f7a85674dbaef81316bd0b4f5cfadaa2a6c Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 01:51:31 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/detail/CustomerDetailsTop.vue    | 85 +++++++++++++++++++
 src/views/crm/customer/detail/index.vue       | 74 +---------------
 2 files changed, 86 insertions(+), 73 deletions(-)
 create mode 100644 src/views/crm/customer/detail/CustomerDetailsTop.vue

diff --git a/src/views/crm/customer/detail/CustomerDetailsTop.vue b/src/views/crm/customer/detail/CustomerDetailsTop.vue
new file mode 100644
index 000000000..509d0a275
--- /dev/null
+++ b/src/views/crm/customer/detail/CustomerDetailsTop.vue
@@ -0,0 +1,85 @@
+<template>
+  <div v-loading="loading">
+    <div class="flex items-start justify-between">
+      <div>
+        <!-- 左上：客户基本信息 -->
+        <CustomerBasicInfo :customer="customer" />
+      </div>
+      <div>
+        <!-- 右上：按钮 -->
+        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
+          编辑
+        </el-button>
+        <el-button>更改成交状态</el-button>
+      </div>
+    </div>
+    <el-row class="mt-10px">
+      <el-button>
+        <Icon class="mr-5px" icon="ph:calendar-fill" />
+        创建任务
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="carbon:email" />
+        发送邮件
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="system-uicons:contacts" />
+        创建联系人
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="ep:opportunity" />
+        创建商机
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="clarity:contract-line" />
+        创建合同
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="icon-park:income-one" />
+        创建回款
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="fluent:people-team-add-20-filled" />
+        添加团队成员
+      </el-button>
+    </el-row>
+  </div>
+  <ContentWrap class="mt-10px">
+    <el-descriptions :column="5" direction="vertical">
+      <el-descriptions-item label="客户级别">
+        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
+      </el-descriptions-item>
+      <el-descriptions-item label="成交状态">
+        {{ customer.dealStatus ? '已成交' : '未成交' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        {{ customer.ownerUserName }}
+      </el-descriptions-item>
+      <!-- TODO wanwan 首要联系人? -->
+      <el-descriptions-item label="首要联系人" />
+      <!-- TODO wanwan 首要联系人电话? -->
+      <el-descriptions-item label="首要联系人电话">
+        {{ customer.mobile }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CustomerForm ref="formRef" @success="emit('refresh')" />
+</template>
+<script setup lang="ts">
+import * as CustomerApi from '@/api/crm/customer'
+import { DICT_TYPE } from '@/utils/dict'
+import CustomerBasicInfo from '@/views/crm/customer/detail/CustomerBasicInfo.vue'
+import CustomerForm from '@/views/crm/customer/CustomerForm.vue'
+
+const { customer, loading } = defineProps<{ customer: CustomerApi.CustomerVO; loading: boolean }>()
+
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+const formRef = ref()
+
+const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
+</script>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index c88137faf..59b18c5b8 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -1,69 +1,5 @@
 <template>
-  <!-- TODO @wanwan：要不要把上面这一整块，搞成一个组件，就是把 下面 + Details + BasitcInfo 合并成一个 -->
-  <div v-loading="loading">
-    <div class="flex items-start justify-between">
-      <div>
-        <!-- 左上：客户基本信息 -->
-        <CustomerBasicInfo :customer="customer" />
-      </div>
-      <div>
-        <!-- 右上：按钮 -->
-        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
-          编辑
-        </el-button>
-        <el-button>更改成交状态</el-button>
-      </div>
-    </div>
-    <el-row class="mt-10px">
-      <el-button>
-        <Icon class="mr-5px" icon="ph:calendar-fill" />
-        创建任务
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="carbon:email" />
-        发送邮件
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="system-uicons:contacts" />
-        创建联系人
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="ep:opportunity" />
-        创建商机
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="clarity:contract-line" />
-        创建合同
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="icon-park:income-one" />
-        创建回款
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="fluent:people-team-add-20-filled" />
-        添加团队成员
-      </el-button>
-    </el-row>
-  </div>
-  <ContentWrap class="mt-10px">
-    <el-descriptions :column="5" direction="vertical">
-      <el-descriptions-item label="客户级别">
-        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
-      </el-descriptions-item>
-      <el-descriptions-item label="成交状态">
-        {{ customer.dealStatus ? '已成交' : '未成交' }}
-      </el-descriptions-item>
-      <el-descriptions-item label="负责人">
-        {{ customer.ownerUserName }}
-      </el-descriptions-item>
-      <!-- TODO wanwan 首要联系人? -->
-      <el-descriptions-item label="首要联系人" />
-      <!-- TODO wanwan 首要联系人电话? -->
-      <el-descriptions-item label="首要联系人电话">
-        {{ customer.mobile }}
-      </el-descriptions-item>
-    </el-descriptions>
-  </ContentWrap>
+  <CustomerDetailsTop :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -107,9 +43,6 @@
       <el-tab-pane label="发票" lazy> 发票</el-tab-pane>
     </el-tabs>
   </el-col>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <CustomerForm ref="formRef" @success="getCustomerData(id)" />
 </template>
 
 <script lang="ts" setup>
@@ -145,11 +78,6 @@ const getCustomerData = async (id: number) => {
   }
 }
 
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
 /**
  * 初始化
  */
-- 
Gitee


From a00ecb7c72838d7d83a69bc00f58224aa03e2df3 Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 02:00:32 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/config/customerPoolConfig/index.vue   | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/views/crm/config/customerPoolConfig/index.vue b/src/views/crm/config/customerPoolConfig/index.vue
index b4c1d096a..c7db33011 100644
--- a/src/views/crm/config/customerPoolConfig/index.vue
+++ b/src/views/crm/config/customerPoolConfig/index.vue
@@ -23,7 +23,7 @@
         </template>
         <!-- 表单 -->
         <el-form-item label="客户公海规则设置" prop="enabled">
-          <el-radio-group v-model="formData.enabled" class="ml-4">
+          <el-radio-group v-model="formData.enabled" @change="changeEnable" class="ml-4">
             <el-radio :label="false" size="large">不启用</el-radio>
             <el-radio :label="true" size="large">启用</el-radio>
           </el-radio-group>
@@ -36,7 +36,11 @@
             天未成交
           </el-form-item>
           <el-form-item label="提前提醒设置" prop="notifyEnabled">
-            <el-radio-group v-model="formData.notifyEnabled" class="ml-4">
+            <el-radio-group
+              v-model="formData.notifyEnabled"
+              @change="changeNotifyEnable"
+              class="ml-4"
+            >
               <el-radio :label="false" size="large">不提醒</el-radio>
               <el-radio :label="true" size="large">提醒</el-radio>
             </el-radio-group>
@@ -106,27 +110,22 @@ const onSubmit = async () => {
   }
 }
 
-// TODO @wanwan：el-radio-group 选择后，触发会不会更好哈；
-watch(
-  () => formData.value.enabled,
-  (val: boolean) => {
-    if (!val) {
-      formData.value.contactExpireDays = undefined
-      formData.value.dealExpireDays = undefined
-      formData.value.notifyEnabled = false
-      formData.value.notifyDays = undefined
-    }
+/** 更改客户公海规则设置 */
+const changeEnable = () => {
+  if (!formData.value.enabled) {
+    formData.value.contactExpireDays = undefined
+    formData.value.dealExpireDays = undefined
+    formData.value.notifyEnabled = false
+    formData.value.notifyDays = undefined
   }
-)
-// TODO @wanwan：el-radio-group 选择后，触发会不会更好哈；
-watch(
-  () => formData.value.notifyEnabled,
-  (val: boolean) => {
-    if (!val) {
-      formData.value.notifyDays = undefined
-    }
+}
+
+/** 更改提前提醒设置 */
+const changeNotifyEnable = () => {
+  if (!formData.value.notifyEnabled) {
+    formData.value.notifyDays = undefined
   }
-)
+}
 
 onMounted(() => {
   getConfig()
-- 
Gitee


From bd829d35c285a0c5bc200dc505c5a676d2b88049 Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sun, 26 Nov 2023 02:12:56 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/clue/ClueForm.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 4321f9522..f0cfcab64 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,9 +10,15 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
-      <!-- TODO wanwan 客户选择 -->
       <el-form-item label="客户" prop="customerId">
-        <el-input v-model="formData.customerId" placeholder="请选择客户" />
+        <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
+          <el-option
+            v-for="item in customerList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="下次联系时间" prop="contactNextTime">
         <el-date-picker
@@ -47,6 +53,7 @@
 </template>
 <script setup lang="ts">
 import * as ClueApi from '@/api/crm/clue'
+import * as CustomerApi from '@/api/crm/customer'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -55,6 +62,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const customerList = ref([]) // 客户列表
 const formData = ref({
   id: undefined,
   name: undefined,
@@ -79,6 +87,12 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  const customerData = await CustomerApi.getCustomerPage({
+    pageNo: 1,
+    pageSize: 100,
+    pool: false
+  })
+  customerList.value = customerData.list
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
-- 
Gitee