From c9d5ec26a277dcdab9612fdd2df3b65f332bba60 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 28 Feb 2024 09:35:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=B8=BB=E5=AD=90=E8=A1=A8=20demo03?=
 =?UTF-8?q?=20List=20props?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/components/Demo03CourseList.vue       | 42 +++++-----
 .../demo03/erp/components/Demo03GradeList.vue | 42 +++++-----
 src/views/infra/demo/demo03/erp/index.vue     | 80 ++++++++++---------
 3 files changed, 90 insertions(+), 74 deletions(-)

diff --git a/src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue b/src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
index 9d5e27053..3dce77e96 100644
--- a/src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
+++ b/src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
@@ -2,39 +2,40 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-button
-      type="primary"
+      v-hasPermi="['infra:demo03-student:create']"
       plain
+      type="primary"
       @click="openForm('create')"
-      v-hasPermi="['infra:demo03-student:create']"
     >
-      <Icon icon="ep:plus" class="mr-5px" /> 新增
+      <Icon class="mr-5px" icon="ep:plus" />
+      新增
     </el-button>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="名字" align="center" prop="name" />
-      <el-table-column label="分数" align="center" prop="score" />
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="名字" prop="name" />
+      <el-table-column align="center" label="分数" prop="score" />
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
+        label="创建时间"
         prop="createTime"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
+            v-hasPermi="['infra:demo03-student:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['infra:demo03-student:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['infra:demo03-student:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['infra:demo03-student:delete']"
           >
             删除
           </el-button>
@@ -43,9 +44,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -53,7 +54,7 @@
   <Demo03CourseForm ref="formRef" @success="getList" />
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
 import Demo03CourseForm from './Demo03CourseForm.vue'
@@ -62,7 +63,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId?: number // 学生编号（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -70,17 +71,20 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  studentId: undefined
+  studentId: undefined as unknown
 })
 
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.studentId,
-  (val) => {
+  (val: number) => {
+    if (!val) {
+      return
+    }
     queryParams.studentId = val
     handleQuery()
   },
-  { immediate: false }
+  { immediate: true, deep: true }
 )
 
 /** 查询列表 */
diff --git a/src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue b/src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
index e57cb3a49..635f32115 100644
--- a/src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
+++ b/src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
@@ -2,39 +2,40 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-button
-      type="primary"
+      v-hasPermi="['infra:demo03-student:create']"
       plain
+      type="primary"
       @click="openForm('create')"
-      v-hasPermi="['infra:demo03-student:create']"
     >
-      <Icon icon="ep:plus" class="mr-5px" /> 新增
+      <Icon class="mr-5px" icon="ep:plus" />
+      新增
     </el-button>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="名字" align="center" prop="name" />
-      <el-table-column label="班主任" align="center" prop="teacher" />
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="名字" prop="name" />
+      <el-table-column align="center" label="班主任" prop="teacher" />
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
+        label="创建时间"
         prop="createTime"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
+            v-hasPermi="['infra:demo03-student:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['infra:demo03-student:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['infra:demo03-student:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['infra:demo03-student:delete']"
           >
             删除
           </el-button>
@@ -43,9 +44,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -53,7 +54,7 @@
   <Demo03GradeForm ref="formRef" @success="getList" />
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
 import Demo03GradeForm from './Demo03GradeForm.vue'
@@ -62,7 +63,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  studentId: undefined // 学生编号（主表的关联字段）
+  studentId?: number // 学生编号（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -70,17 +71,20 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  studentId: undefined
+  studentId: undefined as unknown
 })
 
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.studentId,
-  (val) => {
+  (val: number) => {
+    if (!val) {
+      return
+    }
     queryParams.studentId = val
     handleQuery()
   },
-  { immediate: false }
+  { immediate: true, deep: true }
 )
 
 /** 查询列表 */
diff --git a/src/views/infra/demo/demo03/erp/index.vue b/src/views/infra/demo/demo03/erp/index.vue
index a4a4e6213..e0f1cf484 100644
--- a/src/views/infra/demo/demo03/erp/index.vue
+++ b/src/views/infra/demo/demo03/erp/index.vue
@@ -4,23 +4,23 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="名字" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入名字"
+          class="!w-240px"
           clearable
+          placeholder="请输入名字"
           @keyup.enter="handleQuery"
-          class="!w-240px"
         />
       </el-form-item>
       <el-form-item label="性别" prop="sex">
-        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable class="!w-240px">
+        <el-select v-model="queryParams.sex" class="!w-240px" clearable placeholder="请选择性别">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
             :key="dict.value"
@@ -32,33 +32,41 @@
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
         <el-button
-          type="primary"
+          v-hasPermi="['infra:demo03-student:create']"
           plain
+          type="primary"
           @click="openForm('create')"
-          v-hasPermi="['infra:demo03-student:create']"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
         </el-button>
         <el-button
-          type="success"
+          v-hasPermi="['infra:demo03-student:export']"
+          :loading="exportLoading"
           plain
+          type="success"
           @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['infra:demo03-student:export']"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
         </el-button>
       </el-form-item>
     </el-form>
@@ -69,48 +77,48 @@
     <el-table
       v-loading="loading"
       :data="list"
-      :stripe="true"
       :show-overflow-tooltip="true"
+      :stripe="true"
       highlight-current-row
       @current-change="handleCurrentChange"
     >
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="名字" align="center" prop="name" />
-      <el-table-column label="性别" align="center" prop="sex">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="名字" prop="name" />
+      <el-table-column align="center" label="性别" prop="sex">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
         </template>
       </el-table-column>
       <el-table-column
-        label="出生日期"
+        :formatter="dateFormatter"
         align="center"
+        label="出生日期"
         prop="birthday"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="简介" align="center" prop="description" />
+      <el-table-column align="center" label="简介" prop="description" />
       <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
         align="center"
+        label="创建时间"
         prop="createTime"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
+            v-hasPermi="['infra:demo03-student:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['infra:demo03-student:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['infra:demo03-student:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['infra:demo03-student:delete']"
           >
             删除
           </el-button>
@@ -119,9 +127,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -132,17 +140,17 @@
   <ContentWrap>
     <el-tabs model-value="demo03Course">
       <el-tab-pane label="学生课程" name="demo03Course">
-        <Demo03CourseList :student-id="currentRow.id" />
+        <Demo03CourseList :student-id="currentRow?.id" />
       </el-tab-pane>
       <el-tab-pane label="学生班级" name="demo03Grade">
-        <Demo03GradeList :student-id="currentRow.id" />
+        <Demo03GradeList :student-id="currentRow?.id" />
       </el-tab-pane>
     </el-tabs>
   </ContentWrap>
 </template>
 
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as Demo03StudentApi from '@/api/infra/demo/demo03/erp'
-- 
Gitee


From 3660cd26ae554383865e3e288acdc15568291830 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 2 Mar 2024 23:38:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?CRM:=20=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=9B=9E=E6=AC=BE=E8=AE=A1=E5=88=92=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=88=E5=90=8C=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/receivable/index.ts               | 10 ++++---
 src/api/crm/receivable/plan/index.ts          |  2 +-
 src/views/crm/receivable/ReceivableForm.vue   | 27 ++++++++++---------
 .../receivable/plan/ReceivablePlanForm.vue    | 15 ++++++-----
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/api/crm/receivable/index.ts b/src/api/crm/receivable/index.ts
index 069d6c4a7..32ecd25aa 100644
--- a/src/api/crm/receivable/index.ts
+++ b/src/api/crm/receivable/index.ts
@@ -3,18 +3,20 @@ import request from '@/config/axios'
 export interface ReceivableVO {
   id: number
   no: string
-  planId: number
-  customerId: number
+  planId?: number
+  customerId?: number
   customerName?: string
-  contractId: number
+  contractId?: number
   contract?: {
+    id?: number
+    name?: string
     no: string
     totalPrice: number
   }
   auditStatus: number
   processInstanceId: number
   returnTime: Date
-  returnType: string
+  returnType: number
   price: number
   ownerUserId: number
   ownerUserName?: string
diff --git a/src/api/crm/receivable/plan/index.ts b/src/api/crm/receivable/plan/index.ts
index 6e0cab4ad..770b3477b 100644
--- a/src/api/crm/receivable/plan/index.ts
+++ b/src/api/crm/receivable/plan/index.ts
@@ -11,7 +11,7 @@ export interface ReceivablePlanVO {
   remindTime: Date
   customerId: number
   customerName?: string
-  contractId: number
+  contractId?: number
   contractNo?: string
   ownerUserId: number
   ownerUserName?: string
diff --git a/src/views/crm/receivable/ReceivableForm.vue b/src/views/crm/receivable/ReceivableForm.vue
index 17ce1cbe4..a44164a32 100644
--- a/src/views/crm/receivable/ReceivableForm.vue
+++ b/src/views/crm/receivable/ReceivableForm.vue
@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="回款编号" prop="no">
-            <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
+            <el-input v-model="formData.no" disabled placeholder="保存时自动生成" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -38,8 +38,8 @@
               :disabled="formType !== 'create'"
               class="w-1/1"
               filterable
-              @change="handleCustomerChange"
               placeholder="请选择客户"
+              @change="handleCustomerChange"
             >
               <el-option
                 v-for="item in customerList"
@@ -57,15 +57,15 @@
               :disabled="formType !== 'create' || !formData.customerId"
               class="w-1/1"
               filterable
-              @change="handleContractChange"
               placeholder="请选择合同"
+              @change="handleContractChange"
             >
               <el-option
                 v-for="data in contractList"
                 :key="data.id"
+                :disabled="data.auditStatus !== 20"
                 :label="data.name"
                 :value="data.id!"
-                :disabled="data.auditStatus !== 20"
               />
             </el-select>
           </el-form-item>
@@ -78,15 +78,15 @@
               v-model="formData.planId"
               :disabled="formType !== 'create' || !formData.contractId"
               class="!w-1/1"
-              @change="handleReceivablePlanChange"
               placeholder="请选择回款期数"
+              @change="handleReceivablePlanChange"
             >
               <el-option
                 v-for="data in receivablePlanList"
                 :key="data.id"
+                :disabled="data.receivableId"
                 :label="'第 ' + data.period + ' 期'"
                 :value="data.id!"
-                :disabled="data.receivableId"
               />
             </el-select>
           </el-form-item>
@@ -109,11 +109,11 @@
           <el-form-item label="回款金额" prop="price">
             <el-input-number
               v-model="formData.price"
+              :min="0.01"
+              :precision="2"
               class="!w-100%"
               controls-position="right"
               placeholder="请输入回款金额"
-              :min="0.01"
-              :precision="2"
             />
           </el-form-item>
         </el-col>
@@ -145,12 +145,12 @@
 <script lang="ts" setup>
 import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
 import * as ReceivableApi from '@/api/crm/receivable'
+import { ReceivableVO } from '@/api/crm/receivable'
 import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
 import * as ContractApi from '@/api/crm/contract'
 import { useUserStore } from '@/store/modules/user'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import form from '@/components/Form/src/Form.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -185,9 +185,10 @@ const open = async (
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await ReceivableApi.getReceivable(id)
-      await handleCustomerChange(formData.value.customerId)
-      formData.value.contractId = formData.value.contract.id
+      const data = (await ReceivableApi.getReceivable(id)) as ReceivableVO
+      formData.value = data
+      await handleCustomerChange(data.customerId!)
+      formData.value.contractId = data?.contract?.id
     } finally {
       formLoading.value = false
     }
@@ -266,7 +267,7 @@ const handleContractChange = async (contractId: number) => {
     // 获得回款计划列表
     receivablePlanList.value = []
     receivablePlanList.value = await ReceivablePlanApi.getReceivablePlanSimpleList(
-      formData.value.customerId,
+      formData.value.customerId!,
       contractId
     )
     // 设置金额
diff --git a/src/views/crm/receivable/plan/ReceivablePlanForm.vue b/src/views/crm/receivable/plan/ReceivablePlanForm.vue
index 5cb294290..0d4ef179a 100644
--- a/src/views/crm/receivable/plan/ReceivablePlanForm.vue
+++ b/src/views/crm/receivable/plan/ReceivablePlanForm.vue
@@ -10,7 +10,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="还款期数" prop="period">
-            <el-input disabled v-model="formData.period" placeholder="保存时自动生成" />
+            <el-input v-model="formData.period" disabled placeholder="保存时自动生成" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -38,8 +38,8 @@
               :disabled="formType !== 'create'"
               class="w-1/1"
               filterable
-              @change="handleCustomerChange"
               placeholder="请选择客户"
+              @change="handleCustomerChange"
             >
               <el-option
                 v-for="item in customerList"
@@ -74,11 +74,11 @@
           <el-form-item label="计划回款金额" prop="price">
             <el-input-number
               v-model="formData.price"
+              :min="0.01"
+              :precision="2"
               class="!w-100%"
               controls-position="right"
               placeholder="请输入计划回款金额"
-              :min="0.01"
-              :precision="2"
             />
           </el-form-item>
         </el-col>
@@ -136,7 +136,7 @@ import * as CustomerApi from '@/api/crm/customer'
 import * as ContractApi from '@/api/crm/contract'
 import { useUserStore } from '@/store/modules/user'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { aw } from '../../../../../dist-prod/assets/index-9eac537b'
+import { cloneDeep } from 'lodash-es'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -167,7 +167,10 @@ const open = async (type: string, id?: number, customerId?: number, contractId?:
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await ReceivablePlanApi.getReceivablePlan(id)
+      const data = await ReceivablePlanApi.getReceivablePlan(id)
+      formData.value = cloneDeep(data)
+      await handleCustomerChange(data.customerId!)
+      formData.value.contractId = data?.contractId
     } finally {
       formLoading.value = false
     }
-- 
Gitee


From 13e925e29f63a17014c3a2740aa6ecd69aa518a5 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 3 Mar 2024 20:11:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?CRM=EF=BC=9A=E5=AE=8C=E5=96=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=EF=BC=8C=E5=AE=9E=E7=8E=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E5=90=8C=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E3=80=81=E5=90=8C=E6=97=B6=E8=BD=AC=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/business/index.ts                 |  2 +-
 src/api/crm/clue/index.ts                     |  2 +-
 src/api/crm/contact/index.ts                  |  2 +-
 src/api/crm/contract/index.ts                 |  2 +-
 src/api/crm/customer/index.ts                 |  7 +-
 src/api/crm/permission/index.ts               |  8 ++
 src/views/crm/business/detail/index.vue       | 22 ++---
 src/views/crm/clue/detail/index.vue           |  6 +-
 .../crm/contact/components/ContactList.vue    | 45 ++++++-----
 .../contact/components/ContactListModal.vue   | 50 +++++++-----
 src/views/crm/contact/detail/index.vue        | 16 ++--
 src/views/crm/contract/detail/index.vue       |  5 +-
 src/views/crm/customer/detail/index.vue       |  4 +-
 .../permission/components/PermissionForm.vue  | 17 ++--
 .../permission/components/TransferForm.vue    | 80 +++++++++++++------
 15 files changed, 158 insertions(+), 110 deletions(-)

diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
index b66617659..242042551 100644
--- a/src/api/crm/business/index.ts
+++ b/src/api/crm/business/index.ts
@@ -1,5 +1,5 @@
 import request from '@/config/axios'
-import { TransferReqVO } from '@/api/crm/customer'
+import { TransferReqVO } from '@/api/crm/permission'
 
 export interface BusinessVO {
   id: number
diff --git a/src/api/crm/clue/index.ts b/src/api/crm/clue/index.ts
index 170f244da..9736514dd 100644
--- a/src/api/crm/clue/index.ts
+++ b/src/api/crm/clue/index.ts
@@ -1,5 +1,5 @@
 import request from '@/config/axios'
-import { TransferReqVO } from '@/api/crm/customer'
+import { TransferReqVO } from '@/api/crm/permission'
 
 export interface ClueVO {
   id: number // 编号
diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index 670361947..7c24dfa97 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -1,5 +1,5 @@
 import request from '@/config/axios'
-import { TransferReqVO } from '@/api/crm/customer'
+import { TransferReqVO } from '@/api/crm/permission'
 
 export interface ContactVO {
   id: number // 编号
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index faee94953..7028b774a 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -1,5 +1,5 @@
 import request from '@/config/axios'
-import { TransferReqVO } from '@/api/crm/customer'
+import { TransferReqVO } from '@/api/crm/permission'
 
 export interface ContractVO {
   id: number
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index c684e98d6..d149d4e78 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { TransferReqVO } from '@/api/crm/permission'
 
 export interface CustomerVO {
   id: number // 编号
@@ -102,12 +103,6 @@ export const getCustomerSimpleList = async () => {
 
 // ======================= 业务操作 =======================
 
-export interface TransferReqVO {
-  id: number | undefined // 客户编号
-  newOwnerUserId: number | undefined // 新负责人的用户编号
-  oldOwnerPermissionLevel: number | undefined // 老负责人加入团队后的权限级别
-}
-
 // 客户转移
 export const transferCustomer = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/customer/transfer', data })
diff --git a/src/api/crm/permission/index.ts b/src/api/crm/permission/index.ts
index 31f9e18da..e1f317473 100644
--- a/src/api/crm/permission/index.ts
+++ b/src/api/crm/permission/index.ts
@@ -6,6 +6,7 @@ export interface PermissionVO {
   bizType: number // Crm 类型
   bizId: number // Crm 类型数据编号
   level: number // 权限级别
+  toBizTypes?: number[] // 同时添加至
   deptName?: string // 部门名称
   nickname?: string // 用户昵称
   postNames?: string[] // 岗位名称数组
@@ -13,6 +14,13 @@ export interface PermissionVO {
   ids?: number[]
 }
 
+export interface TransferReqVO {
+  bizId: number // 模块编号
+  newOwnerUserId: number // 新负责人的用户编号
+  oldOwnerPermissionLevel: number // 老负责人加入团队后的权限级别
+  toBizTypes?: number[] // 转移客户时，需要额外有【联系人】【商机】【合同】的 checkbox 选择
+}
+
 /**
  * CRM 业务类型枚举
  *
diff --git a/src/views/crm/business/detail/index.vue b/src/views/crm/business/detail/index.vue
index 6b86a41ee..0c2807341 100644
--- a/src/views/crm/business/detail/index.vue
+++ b/src/views/crm/business/detail/index.vue
@@ -4,8 +4,8 @@
       编辑
     </el-button>
     <el-button
-      :disabled="business.endStatus"
       v-if="permissionListRef?.validateWrite"
+      :disabled="business.endStatus"
       type="success"
       @click="openStatusForm()"
     >
@@ -53,13 +53,12 @@
   </el-col>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BusinessForm ref="formRef" @success="getBusiness(business.id)" />
-  <BusinessUpdateStatusForm ref="statusFormRef" @success="getBusiness(business.id)" />
-  <CrmTransferForm ref="transferFormRef" @success="close" />
+  <BusinessForm ref="formRef" @success="getBusiness" />
+  <BusinessUpdateStatusForm ref="statusFormRef" @success="getBusiness" />
+  <CrmTransferForm ref="transferFormRef" :biz-type="BizTypeEnum.CRM_BUSINESS" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
-import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import BusinessDetailsHeader from './BusinessDetailsHeader.vue'
 import BusinessDetailsInfo from './BusinessDetailsInfo.vue'
@@ -73,6 +72,7 @@ import FollowUpList from '@/views/crm/followup/index.vue'
 import ContactList from '@/views/crm/contact/components/ContactList.vue'
 import BusinessUpdateStatusForm from '@/views/crm/business/BusinessUpdateStatusForm.vue'
 import ContractList from '@/views/crm/contract/components/ContractList.vue'
+import BusinessProductList from '@/views/crm/business/detail/BusinessProductList.vue'
 
 defineOptions({ name: 'CrmBusinessDetail' })
 
@@ -80,15 +80,15 @@ const message = useMessage()
 
 const businessId = ref(0) // 线索编号
 const loading = ref(true) // 加载中
-const business = ref<ContactApi.ContactVO>({} as ContactApi.ContactVO) // 联系人详情
+const business = ref<BusinessApi.BusinessVO>({} as BusinessApi.BusinessVO) // 商机详情
 const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
 
 /** 获取详情 */
-const getBusiness = async (id: number) => {
+const getBusiness = async () => {
   loading.value = true
   try {
-    business.value = await BusinessApi.getBusiness(id)
-    await getOperateLog(id)
+    business.value = await BusinessApi.getBusiness(businessId.value)
+    await getOperateLog(businessId.value)
   } finally {
     loading.value = false
   }
@@ -109,7 +109,7 @@ const openStatusForm = () => {
 /** 联系人转移 */
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 联系人转移表单 ref
 const transfer = () => {
-  transferFormRef.value?.open('商机转移', business.value.id, BusinessApi.transferBusiness)
+  transferFormRef.value?.open(business.value.id)
 }
 
 /** 获取操作日志 */
@@ -141,6 +141,6 @@ onMounted(async () => {
     return
   }
   businessId.value = params.id as unknown as number
-  await getBusiness(businessId.value)
+  await getBusiness()
 })
 </script>
diff --git a/src/views/crm/clue/detail/index.vue b/src/views/crm/clue/detail/index.vue
index f9074c141..8f005e1c6 100644
--- a/src/views/crm/clue/detail/index.vue
+++ b/src/views/crm/clue/detail/index.vue
@@ -18,7 +18,7 @@
     >
       转化为客户
     </el-button>
-    <el-button v-else type="success" disabled>已转化客户</el-button>
+    <el-button v-else disabled type="success">已转化客户</el-button>
   </ClueDetailsHeader>
   <el-col>
     <el-tabs>
@@ -45,7 +45,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ClueForm ref="formRef" @success="getClue" />
-  <CrmTransferForm ref="transferFormRef" @success="close" />
+  <CrmTransferForm ref="transferFormRef" :biz-type="BizTypeEnum.CRM_CLUE" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -91,7 +91,7 @@ const openForm = () => {
 /** 线索转移 */
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 线索转移表单 ref
 const transfer = () => {
-  transferFormRef.value?.open('线索转移', clueId.value, ClueApi.transferClue)
+  transferFormRef.value?.open(clueId.value)
 }
 
 /** 转化为客户 */
diff --git a/src/views/crm/contact/components/ContactList.vue b/src/views/crm/contact/components/ContactList.vue
index 83af1e52d..1c12ca81e 100644
--- a/src/views/crm/contact/components/ContactList.vue
+++ b/src/views/crm/contact/components/ContactList.vue
@@ -6,18 +6,20 @@
       创建联系人
     </el-button>
     <el-button
-      @click="openBusinessModal"
-      v-hasPermi="['crm:contact:create-business']"
       v-if="queryParams.businessId"
+      v-hasPermi="['crm:contact:create-business']"
+      @click="openBusinessModal"
     >
-      <Icon class="mr-5px" icon="ep:circle-plus" />关联
+      <Icon class="mr-5px" icon="ep:circle-plus" />
+      关联
     </el-button>
     <el-button
-      @click="deleteContactBusinessList"
-      v-hasPermi="['crm:contact:delete-business']"
       v-if="queryParams.businessId"
+      v-hasPermi="['crm:contact:delete-business']"
+      @click="deleteContactBusinessList"
     >
-      <Icon class="mr-5px" icon="ep:remove" />解除关联
+      <Icon class="mr-5px" icon="ep:remove" />
+      解除关联
     </el-button>
   </el-row>
 
@@ -27,21 +29,21 @@
       ref="contactRef"
       v-loading="loading"
       :data="list"
-      :stripe="true"
       :show-overflow-tooltip="true"
+      :stripe="true"
     >
-      <el-table-column type="selection" width="55" v-if="queryParams.businessId" />
-      <el-table-column label="姓名" fixed="left" align="center" prop="name">
+      <el-table-column v-if="queryParams.businessId" type="selection" width="55" />
+      <el-table-column align="center" fixed="left" label="姓名" prop="name">
         <template #default="scope">
-          <el-link type="primary" :underline="false" @click="openDetail(scope.row.id)">
+          <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column label="手机号" align="center" prop="mobile" />
-      <el-table-column label="职位" align="center" prop="post" />
-      <el-table-column label="直属上级" align="center" prop="parentName" />
-      <el-table-column label="是否关键决策人" align="center" prop="master" min-width="100">
+      <el-table-column align="center" label="手机号" prop="mobile" />
+      <el-table-column align="center" label="职位" prop="post" />
+      <el-table-column align="center" label="直属上级" prop="parentName" />
+      <el-table-column align="center" label="是否关键决策人" min-width="100" prop="master">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
         </template>
@@ -49,9 +51,9 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -60,12 +62,13 @@
   <ContactForm ref="formRef" @success="getList" />
   <!-- 关联商机选择弹框 -->
   <ContactListModal
+    v-if="customerId"
     ref="contactModalRef"
-    :customer-id="props.customerId"
+    :customer-id="customerId"
     @success="createContactBusinessList"
   />
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import * as ContactApi from '@/api/crm/contact'
 import ContactForm from './../ContactForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
@@ -76,8 +79,8 @@ defineOptions({ name: 'CrmContactList' })
 const props = defineProps<{
   bizType: number // 业务类型
   bizId: number // 业务编号
-  customerId: number // 特殊：客户编号；在【商机】详情中，可以传递客户编号，默认新建的联系人关联到该客户
-  businessId: number // 特殊：商机编号；在【商机】详情中，可以传递商机编号，默认新建的联系人关联到该商机
+  customerId?: number // 特殊：客户编号；在【商机】详情中，可以传递客户编号，默认新建的联系人关联到该客户
+  businessId?: number // 特殊：商机编号；在【商机】详情中，可以传递商机编号，默认新建的联系人关联到该商机
 }>()
 
 const loading = ref(true) // 列表的加载中
@@ -147,7 +150,7 @@ const createContactBusinessList = async (contactIds: number[]) => {
     contactIds: contactIds
   } as ContactApi.ContactBusiness2ReqVO
   contactRef.value.getSelectionRows().forEach((row: ContactApi.ContactVO) => {
-    data.businessIds.push(row.id)
+    data.contactIds.push(row.id)
   })
   await ContactApi.createContactBusinessList2(data)
   // 刷新列表
diff --git a/src/views/crm/contact/components/ContactListModal.vue b/src/views/crm/contact/components/ContactListModal.vue
index 82071896c..8b655c139 100644
--- a/src/views/crm/contact/components/ContactListModal.vue
+++ b/src/views/crm/contact/components/ContactListModal.vue
@@ -1,28 +1,35 @@
 <template>
-  <Dialog title="关联联系人" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" title="关联联系人">
     <!-- 搜索工作栏 -->
     <ContentWrap>
       <el-form
-        class="-mb-15px"
-        :model="queryParams"
         ref="queryFormRef"
         :inline="true"
+        :model="queryParams"
+        class="-mb-15px"
         label-width="90px"
       >
         <el-form-item label="联系人名称" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="请输入联系人名称"
+            class="!w-240px"
             clearable
+            placeholder="请输入联系人名称"
             @keyup.enter="handleQuery"
-            class="!w-240px"
           />
         </el-form-item>
         <el-form-item>
-          <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-          <el-button type="primary" @click="openForm()" v-hasPermi="['crm:business:create']">
-            <Icon icon="ep:plus" class="mr-5px" /> 新增
+          <el-button @click="handleQuery">
+            <Icon class="mr-5px" icon="ep:search" />
+            搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon class="mr-5px" icon="ep:refresh" />
+            重置
+          </el-button>
+          <el-button v-hasPermi="['crm:business:create']" type="primary" @click="openForm()">
+            <Icon class="mr-5px" icon="ep:plus" />
+            新增
           </el-button>
         </el-form-item>
       </el-form>
@@ -31,24 +38,24 @@
     <!-- 列表 -->
     <ContentWrap class="mt-10px">
       <el-table
-        v-loading="loading"
         ref="contactRef"
+        v-loading="loading"
         :data="list"
-        :stripe="true"
         :show-overflow-tooltip="true"
+        :stripe="true"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column label="姓名" fixed="left" align="center" prop="name">
+        <el-table-column align="center" fixed="left" label="姓名" prop="name">
           <template #default="scope">
-            <el-link type="primary" :underline="false" @click="openDetail(scope.row.id)">
+            <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
               {{ scope.row.name }}
             </el-link>
           </template>
         </el-table-column>
-        <el-table-column label="手机号" align="center" prop="mobile" />
-        <el-table-column label="职位" align="center" prop="post" />
-        <el-table-column label="直属上级" align="center" prop="parentName" />
-        <el-table-column label="是否关键决策人" align="center" prop="master" min-width="100">
+        <el-table-column align="center" label="手机号" prop="mobile" />
+        <el-table-column align="center" label="职位" prop="post" />
+        <el-table-column align="center" label="直属上级" prop="parentName" />
+        <el-table-column align="center" label="是否关键决策人" min-width="100" prop="master">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
           </template>
@@ -56,14 +63,14 @@
       </el-table>
       <!-- 分页 -->
       <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNo"
+        :total="total"
         @pagination="getList"
       />
     </ContentWrap>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
 
@@ -71,10 +78,9 @@
     <ContactForm ref="formRef" @success="getList" />
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import * as ContactApi from '@/api/crm/contact'
 import ContactForm from '../ContactForm.vue'
-import { erpPriceTableColumnFormatter } from '@/utils'
 import { DICT_TYPE } from '@/utils/dict'
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index 21967e8c5..8da86eb33 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -31,15 +31,15 @@
         <BusinessList
           :biz-id="contact.id!"
           :biz-type="BizTypeEnum.CRM_CONTACT"
-          :customer-id="contact.customerId"
           :contact-id="contact.id"
+          :customer-id="contact.customerId"
         />
       </el-tab-pane>
     </el-tabs>
   </el-col>
   <!-- 表单弹窗：添加/修改 -->
-  <ContactForm ref="formRef" @success="getContact(contact.id)" />
-  <CrmTransferForm ref="transferFormRef" @success="close" />
+  <ContactForm ref="formRef" @success="getContact" />
+  <CrmTransferForm ref="transferFormRef" :biz-type="BizTypeEnum.CRM_CONTACT" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -65,11 +65,11 @@ const contact = ref<ContactApi.ContactVO>({} as ContactApi.ContactVO) // 联系
 const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
 
 /** 获取详情 */
-const getContact = async (id: number) => {
+const getContact = async () => {
   loading.value = true
   try {
-    contact.value = await ContactApi.getContact(id)
-    await getOperateLog(id)
+    contact.value = await ContactApi.getContact(contactId.value)
+    await getOperateLog(contactId.value)
   } finally {
     loading.value = false
   }
@@ -84,7 +84,7 @@ const openForm = (type: string, id?: number) => {
 /** 联系人转移 */
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 联系人转移表单 ref
 const transfer = () => {
-  transferFormRef.value?.open('联系人转移', contact.value.id, ContactApi.transferContact)
+  transferFormRef.value?.open(contact.value.id)
 }
 
 /** 获取操作日志 */
@@ -116,6 +116,6 @@ onMounted(async () => {
     return
   }
   contactId.value = params.id as unknown as number
-  await getContact(contactId.value)
+  await getContact()
 })
 </script>
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index bd30489a4..f3b038ed7 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -48,7 +48,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ContractForm ref="formRef" @success="getContractData" />
-  <CrmTransferForm ref="transferFormRef" @success="close" />
+  <CrmTransferForm ref="transferFormRef" :biz-type="BizTypeEnum.CRM_CONTRACT" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -113,10 +113,9 @@ const createReceivable = (planData: any) => {
 }
 
 /** 转移 */
-// TODO @puhui999：这个组件，要不传递业务类型，然后组件里判断 title 和 api 能调用哪个；整体治理掉；好呢
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 合同转移表单 ref
 const transferContract = () => {
-  transferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transferContract)
+  transferFormRef.value?.open(contract.value.id)
 }
 
 /** 关闭 */
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 031fcfbf7..b02ef416d 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -76,7 +76,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <CustomerForm ref="formRef" @success="getCustomer" />
   <CustomerDistributeForm ref="distributeForm" @success="getCustomer" />
-  <CrmTransferForm ref="transferFormRef" @success="getCustomer" />
+  <CrmTransferForm ref="transferFormRef" :biz-type="BizTypeEnum.CRM_CUSTOMER" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -142,7 +142,7 @@ const handleUpdateDealStatus = async () => {
 /** 客户转移 */
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 客户转移表单 ref
 const transfer = () => {
-  transferFormRef.value?.open('客户转移', customerId.value, CustomerApi.transferCustomer)
+  transferFormRef.value?.open(customerId.value)
 }
 
 /** 锁定客户 */
diff --git a/src/views/crm/permission/components/PermissionForm.vue b/src/views/crm/permission/components/PermissionForm.vue
index c86e8bd0a..9cf8867f2 100644
--- a/src/views/crm/permission/components/PermissionForm.vue
+++ b/src/views/crm/permission/components/PermissionForm.vue
@@ -29,12 +29,15 @@
           </template>
         </el-radio-group>
       </el-form-item>
-      <!-- TODO @puhui999：同时添加至,还没想好下次搞 -->
-      <el-form-item v-if="false && formType === 'create'" label="同时添加至" prop="toBizType">
-        <el-select v-model="formData.userId">
-          <el-option :value="1" label="联系人" />
-          <el-option :value="1" label="商机" />
-        </el-select>
+      <el-form-item
+        v-if="formType === 'create' && formData.bizType === BizTypeEnum.CRM_CUSTOMER"
+        label="同时添加至"
+      >
+        <el-checkbox-group v-model="formData.toBizTypes">
+          <el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
+          <el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
+          <el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -46,7 +49,7 @@
 <script lang="ts" setup>
 import * as UserApi from '@/api/system/user'
 import * as PermissionApi from '@/api/crm/permission'
-import { PermissionLevelEnum } from '@/api/crm/permission'
+import { BizTypeEnum, PermissionLevelEnum } from '@/api/crm/permission'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
 defineOptions({ name: 'CrmPermissionForm' })
diff --git a/src/views/crm/permission/components/TransferForm.vue b/src/views/crm/permission/components/TransferForm.vue
index 3b4e6dfb2..0205faca4 100644
--- a/src/views/crm/permission/components/TransferForm.vue
+++ b/src/views/crm/permission/components/TransferForm.vue
@@ -19,10 +19,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="老负责人">
-        <el-radio-group
-          v-model="oldOwnerHandler"
-          @change="formData.oldOwnerPermissionLevel = undefined"
-        >
+        <el-radio-group v-model="oldOwnerHandler" @change="formData.oldOwnerPermissionLevel">
           <el-radio :label="false" size="large">移除</el-radio>
           <el-radio :label="true" size="large">加入团队</el-radio>
         </el-radio-group>
@@ -39,8 +36,14 @@
           </template>
         </el-radio-group>
       </el-form-item>
+      <el-form-item v-if="bizType === BizTypeEnum.CRM_CUSTOMER" label="同时转移">
+        <el-checkbox-group v-model="formData.toBizTypes">
+          <el-checkbox :label="BizTypeEnum.CRM_CONTACT">联系人</el-checkbox>
+          <el-checkbox :label="BizTypeEnum.CRM_BUSINESS">商机</el-checkbox>
+          <el-checkbox :label="BizTypeEnum.CRM_CONTRACT">合同</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
     </el-form>
-    <!-- TODO @puhui999 转移客户时，需要额外有【联系人】【商机】【合同】的 checkbox 选择 -->
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -49,23 +52,27 @@
 </template>
 <script lang="ts" setup>
 import * as UserApi from '@/api/system/user'
-import type { TransferReqVO } from '@/api/crm/customer'
+import * as BusinessApi from '@/api/crm/business'
+import * as ClueApi from '@/api/crm/clue'
+import * as ContactApi from '@/api/crm/contact'
+import * as CustomerApi from '@/api/crm/customer'
+import * as ContractApi from '@/api/crm/contract'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { PermissionLevelEnum } from '@/api/crm/permission'
+import { BizTypeEnum, PermissionLevelEnum, TransferReqVO } from '@/api/crm/permission'
 
 defineOptions({ name: 'CrmTransferForm' })
 
+const props = defineProps<{
+  bizType: number
+}>()
+
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const oldOwnerHandler = ref(false) // 老负责人的处理方式
-const formData = ref<TransferReqVO>({
-  id: undefined, // 客户编号
-  newOwnerUserId: undefined, // 新负责人的用户编号
-  oldOwnerPermissionLevel: undefined // 老负责人加入团队后的权限级别
-})
+const formData = ref<TransferReqVO>({} as TransferReqVO)
 const formRules = reactive({
   newOwnerUserId: [{ required: true, message: '新负责人不能为空', trigger: 'blur' }],
   oldOwnerPermissionLevel: [
@@ -73,15 +80,13 @@ const formRules = reactive({
   ]
 })
 const formRef = ref() // 表单 Ref
-const transferFuncRef = ref<Function>(() => {}) // 转移所需回调
 
 /** 打开弹窗 */
-const open = async (title: string, bizId: number, transferFunc: Function) => {
+const open = async (bizId: number) => {
   dialogVisible.value = true
-  dialogTitle.value = title
-  transferFuncRef.value = transferFunc
+  dialogTitle.value = getDialogTitle()
   resetForm()
-  formData.value.id = bizId
+  formData.value.bizId = bizId
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -96,7 +101,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value
-    await transferFuncRef.value(unref(data))
+    await transfer(unref(data))
     message.success(dialogTitle.value + '成功')
     dialogVisible.value = false
     // 发送操作成功的事件
@@ -105,15 +110,44 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
+const transfer = async (data: TransferReqVO) => {
+  switch (props.bizType) {
+    case BizTypeEnum.CRM_CLUE:
+      return await ClueApi.transferClue(data)
+    case BizTypeEnum.CRM_CUSTOMER:
+      return await CustomerApi.transferCustomer(data)
+    case BizTypeEnum.CRM_CONTACT:
+      return await ContactApi.transferContact(data)
+    case BizTypeEnum.CRM_BUSINESS:
+      return await BusinessApi.transferBusiness(data)
+    case BizTypeEnum.CRM_CONTRACT:
+      return await ContractApi.transferContract(data)
+    default:
+      message.error('【转移失败】没有转移接口')
+      throw new Error('【转移失败】没有转移接口')
+  }
+}
+const getDialogTitle = () => {
+  switch (props.bizType) {
+    case BizTypeEnum.CRM_CLUE:
+      return '线索转移'
+    case BizTypeEnum.CRM_CUSTOMER:
+      return '客户转移'
+    case BizTypeEnum.CRM_CONTACT:
+      return '联系人转移'
+    case BizTypeEnum.CRM_BUSINESS:
+      return '商机转移'
+    case BizTypeEnum.CRM_CONTRACT:
+      return '合同转移'
+    default:
+      return '转移'
+  }
+}
 
 /** 重置表单 */
 const resetForm = () => {
   formRef.value?.resetFields()
-  formData.value = {
-    id: undefined, // 客户编号
-    newOwnerUserId: undefined, // 新负责人的用户编号
-    oldOwnerPermissionLevel: undefined // 老负责人加入团队后的权限级别
-  }
+  formData.value = {} as TransferReqVO
 }
 onMounted(async () => {
   // 获得用户列表
-- 
Gitee