From acc3a6bcfdb83a24d541bf4e7904cfbf328fc85f Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Fri, 26 Jan 2024 21:54:17 +0800
Subject: [PATCH 01/19] fix: warning  UnoCSS utilities are not ordered

---
 src/views/Login/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index e8b03a93..5d349ce3 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     :class="prefixCls"
-    class="relative h-[100%] lt-xl:px-10px lt-md:px-10px lt-sm:px-10px lt-xl:px-10px"
+    class="relative h-[100%] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px lt-xl:px-10px"
   >
     <div class="relative mx-auto h-full flex">
       <div

From 26daa3a1ff1e270666a964ea04430c443c53bfb4 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 27 Jan 2024 15:02:25 +0800
Subject: [PATCH 02/19] =?UTF-8?q?CRM-=E5=AE=A2=E6=88=B7=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/customer/index.ts                 |   5 +
 src/views/crm/customer/CustomerImportForm.vue | 134 ++++++++++++++++++
 src/views/crm/customer/index.vue              |  11 +-
 src/views/system/user/UserImportForm.vue      |   1 +
 4 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 src/views/crm/customer/CustomerImportForm.vue

diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index 4542c86a..004f642d 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -63,6 +63,11 @@ export const exportCustomer = async (params: any) => {
   return await request.download({ url: `/crm/customer/export-excel`, params })
 }
 
+// 下载客户导入模板
+export const importCustomerTemplate = () => {
+  return request.download({ url: '/crm/customer/get-import-template' })
+}
+
 // 客户列表
 export const getSimpleCustomerList = async () => {
   return await request.get({ url: `/crm/customer/list-all-simple` })
diff --git a/src/views/crm/customer/CustomerImportForm.vue b/src/views/crm/customer/CustomerImportForm.vue
new file mode 100644
index 00000000..7a74acf9
--- /dev/null
+++ b/src/views/crm/customer/CustomerImportForm.vue
@@ -0,0 +1,134 @@
+<template>
+  <Dialog v-model="dialogVisible" title="客户导入" width="400">
+    <el-upload
+      ref="uploadRef"
+      v-model:file-list="fileList"
+      :action="importUrl + '?updateSupport=' + updateSupport"
+      :auto-upload="false"
+      :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      accept=".xlsx, .xls"
+      drag
+    >
+      <Icon icon="ep:upload" />
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <template #tip>
+        <div class="el-upload__tip text-center">
+          <div class="el-upload__tip">
+            <el-checkbox v-model="updateSupport" />
+            是否更新已经存在的客户数据
+          </div>
+          <span>仅允许导入 xls、xlsx 格式文件。</span>
+          <el-link
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            type="primary"
+            @click="importTemplate"
+          >
+            下载模板
+          </el-link>
+        </div>
+      </template>
+    </el-upload>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import * as CustomerApi from '@/api/crm/customer'
+import { getAccessToken, getTenantId } from '@/utils/auth'
+import download from '@/utils/download'
+
+defineOptions({ name: 'SystemUserImportForm' })
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const uploadRef = ref()
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/crm/customer/import'
+const uploadHeaders = ref() // 上传 Header 头
+const fileList = ref([]) // 文件列表
+const updateSupport = ref(0) // 是否更新已经存在的客户数据
+
+/** 打开弹窗 */
+const open = () => {
+  dialogVisible.value = true
+  fileList.value = []
+  resetForm()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async () => {
+  if (fileList.value.length == 0) {
+    message.error('请上传文件')
+    return
+  }
+  // 提交请求
+  uploadHeaders.value = {
+    Authorization: 'Bearer ' + getAccessToken(),
+    'tenant-id': getTenantId()
+  }
+  formLoading.value = true
+  uploadRef.value!.submit()
+}
+
+/** 文件上传成功 */
+const emits = defineEmits(['success'])
+const submitFormSuccess = (response: any) => {
+  if (response.code !== 0) {
+    message.error(response.msg)
+    formLoading.value = false
+    return
+  }
+  // 拼接提示语
+  const data = response.data
+  let text = '上传成功数量：' + data.createCustomerNames.length + ';'
+  for (let customerName of data.createCustomerNames) {
+    text += '< ' + customerName + ' >'
+  }
+  text += '更新成功数量：' + data.updateCustomerNames.length + ';'
+  for (const customerName of data.updateCustomerNames) {
+    text += '< ' + customerName + ' >'
+  }
+  text += '更新失败数量：' + Object.keys(data.failureCustomerNames).length + ';'
+  for (const customerName in data.failureCustomerNames) {
+    text += '< ' + customerName + ': ' + data.failureCustomerNames[customerName] + ' >'
+  }
+  message.alert(text)
+  // 发送操作成功的事件
+  emits('success')
+}
+
+/** 上传错误提示 */
+const submitFormError = (): void => {
+  message.error('上传失败，请您重新上传！')
+  formLoading.value = false
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  // 重置上传状态和文件
+  formLoading.value = false
+  uploadRef.value?.clearFiles()
+}
+
+/** 文件数超出提示 */
+const handleExceed = (): void => {
+  message.error('最多只能上传一个文件！')
+}
+
+/** 下载模板操作 */
+const importTemplate = async () => {
+  const res = await CustomerApi.importCustomerTemplate()
+  download.excel(res, '客户导入模版.xls')
+}
+</script>
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index b2cee2f7..2c441d99 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -84,6 +84,10 @@
           <Icon class="mr-5px" icon="ep:plus" />
           新增
         </el-button>
+        <el-button v-hasPermi="['crm:customer:import']" plain type="warning" @click="handleImport">
+          <Icon icon="ep:upload" />
+          导入
+        </el-button>
         <el-button
           v-hasPermi="['crm:customer:export']"
           :loading="exportLoading"
@@ -204,6 +208,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <CustomerForm ref="formRef" @success="getList" />
+  <CustomerImportForm ref="customerImportFormRef" @success="getList" />
 </template>
 
 <script lang="ts" setup>
@@ -212,6 +217,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as CustomerApi from '@/api/crm/customer'
 import CustomerForm from './CustomerForm.vue'
+import CustomerImportForm from './CustomerImportForm.vue'
 import { TabsPaneContext } from 'element-plus'
 
 defineOptions({ name: 'CrmCustomer' })
@@ -333,7 +339,10 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
-
+const customerImportFormRef = ref<InstanceType<typeof CustomerImportForm>>()
+const handleImport = () => {
+  customerImportFormRef.value?.open()
+}
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {
diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue
index ad9eae38..9b82d51f 100644
--- a/src/views/system/user/UserImportForm.vue
+++ b/src/views/system/user/UserImportForm.vue
@@ -61,6 +61,7 @@ const updateSupport = ref(0) // 是否更新已经存在的用户数据
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
+  fileList.value = []
   resetForm()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗

From 5adf75d15b8143cb327b338f43c4bd27a0e84fcb Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 27 Jan 2024 15:15:07 +0800
Subject: [PATCH 03/19] =?UTF-8?q?CRM=EF=BC=9A=E7=BB=9F=E4=B8=80=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contact/index.ts            |  5 -----
 src/api/crm/customer/index.ts           |  5 -----
 src/api/crm/operateLog/index.ts         | 11 +++++++++++
 src/api/crm/permission/index.ts         |  7 +++++--
 src/api/crm/product/index.ts            |  5 -----
 src/views/crm/contact/detail/index.vue  |  6 ++++--
 src/views/crm/customer/detail/index.vue |  6 +++++-
 src/views/crm/product/detail/index.vue  | 12 ++++++++----
 8 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 src/api/crm/operateLog/index.ts

diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index 4144c931..2386b5fe 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -85,8 +85,3 @@ export const createContactBusinessList = async (data: ContactBusinessReqVO) => {
 export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
   return await request.delete({ url: `/crm/contact/delete-business-list`, data })
 }
-
-// 查询联系人操作日志
-export const getOperateLogPage = async (params: any) => {
-  return await request.get({ url: '/crm/contact/operate-log-page', params })
-}
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index 004f642d..f32d3bd3 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -73,11 +73,6 @@ export const getSimpleCustomerList = async () => {
   return await request.get({ url: `/crm/customer/list-all-simple` })
 }
 
-// 查询客户操作日志
-export const getOperateLogPage = async (id: number) => {
-  return await request.get({ url: '/crm/customer/operate-log-page?id=' + id })
-}
-
 // ======================= 业务操作 =======================
 
 export interface TransferReqVO {
diff --git a/src/api/crm/operateLog/index.ts b/src/api/crm/operateLog/index.ts
new file mode 100644
index 00000000..d0f25b6b
--- /dev/null
+++ b/src/api/crm/operateLog/index.ts
@@ -0,0 +1,11 @@
+import request from '@/config/axios'
+
+export interface OperateLogVO extends PageParam {
+  bizType: number
+  bizId: number
+}
+
+// 获得操作日志
+export const getOperateLogPage = async (params: OperateLogVO) => {
+  return await request.get({ url: `/crm/operate-log/page`, params })
+}
diff --git a/src/api/crm/permission/index.ts b/src/api/crm/permission/index.ts
index e616a404..5c829b6a 100644
--- a/src/api/crm/permission/index.ts
+++ b/src/api/crm/permission/index.ts
@@ -22,8 +22,11 @@ export enum BizTypeEnum {
   CRM_LEADS = 1, // 线索
   CRM_CUSTOMER = 2, // 客户
   CRM_CONTACT = 3, // 联系人
-  CRM_BUSINESS = 5, // 商机
-  CRM_CONTRACT = 6 // 合同
+  CRM_BUSINESS = 4, // 商机
+  CRM_CONTRACT = 5, // 合同
+  CRM_PRODUCT = 6, // 产品
+  CRM_RECEIVABLE = 7, // 回款
+  CRM_RECEIVABLE_PLAN = 8 // 回款计划
 }
 
 /**
diff --git a/src/api/crm/product/index.ts b/src/api/crm/product/index.ts
index 2d88cb09..c6d5dfdb 100644
--- a/src/api/crm/product/index.ts
+++ b/src/api/crm/product/index.ts
@@ -41,8 +41,3 @@ export const deleteProduct = async (id: number) => {
 export const exportProduct = async (params) => {
   return await request.download({ url: `/crm/product/export-excel`, params })
 }
-
-// 查询产品操作日志
-export const getOperateLogPage = async (params: any) => {
-  return await request.get({ url: '/crm/product/operate-log-page', params })
-}
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index cb8eea16..4932292c 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -21,7 +21,7 @@
     </el-tabs>
   </el-col>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import * as ContactApi from '@/api/crm/contact'
 import ContactDetailsHeader from '@/views/crm/contact/detail/ContactDetailsHeader.vue'
@@ -30,6 +30,7 @@ import BusinessList from '@/views/crm/business/components/BusinessList.vue' // 
 import PermissionList from '@/views/crm/permission/components/PermissionList.vue' // 团队成员列表（权限）
 import { BizTypeEnum } from '@/api/crm/permission'
 import { OperateLogV2VO } from '@/api/system/operatelog'
+import { getOperateLogPage } from '@/api/crm/operateLog'
 
 defineOptions({ name: 'CrmContactDetail' })
 
@@ -57,7 +58,8 @@ const getOperateLog = async (contactId: number) => {
   if (!contactId) {
     return
   }
-  const data = await ContactApi.getOperateLogPage({
+  const data = await getOperateLogPage({
+    bizType: BizTypeEnum.CRM_CONTACT,
     bizId: contactId
   })
   logList.value = data.list
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 23c169f6..44e62314 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -91,6 +91,7 @@ import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
 import FollowUpList from '@/views/crm/followup/index.vue'
 import { BizTypeEnum } from '@/api/crm/permission'
 import type { OperateLogV2VO } from '@/api/system/operatelog'
+import { getOperateLogPage } from '@/api/crm/operateLog'
 
 defineOptions({ name: 'CrmCustomerDetail' })
 
@@ -164,7 +165,10 @@ const getOperateLog = async () => {
   if (!customerId.value) {
     return
   }
-  const data = await CustomerApi.getOperateLogPage(customerId.value)
+  const data = await getOperateLogPage({
+    bizType: BizTypeEnum.CRM_CUSTOMER,
+    bizId: customerId.value
+  })
   logList.value = data.list
 }
 
diff --git a/src/views/crm/product/detail/index.vue b/src/views/crm/product/detail/index.vue
index 847e9445..0c3c03d5 100644
--- a/src/views/crm/product/detail/index.vue
+++ b/src/views/crm/product/detail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <ProductDetailsHeader :product="product" :loading="loading" @refresh="getProductData(id)" />
+  <ProductDetailsHeader :loading="loading" :product="product" @refresh="getProductData(id)" />
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -11,16 +11,19 @@
     </el-tabs>
   </el-col>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { OperateLogV2VO } from '@/api/system/operatelog'
 import * as ProductApi from '@/api/crm/product'
 import ProductDetailsHeader from '@/views/crm/product/detail/ProductDetailsHeader.vue'
 import ProductDetailsInfo from '@/views/crm/product/detail/ProductDetailsInfo.vue'
+import { BizTypeEnum } from '@/api/crm/permission'
+import { getOperateLogPage } from '@/api/crm/operateLog'
 
 defineOptions({ name: 'CrmProductDetail' })
 
 const route = useRoute()
+const message = useMessage()
 const id = Number(route.params.id) // 编号
 const loading = ref(true) // 加载中
 const product = ref<ProductApi.ProductVO>({} as ProductApi.ProductVO) // 详情
@@ -42,7 +45,8 @@ const getOperateLog = async (productId: number) => {
   if (!productId) {
     return
   }
-  const data = await ProductApi.getOperateLogPage({
+  const data = await getOperateLogPage({
+    bizType: BizTypeEnum.CRM_PRODUCT,
     bizId: productId
   })
   logList.value = data.list
@@ -53,7 +57,7 @@ const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由
 onMounted(async () => {
   if (!id) {
-    ElMessage.warning('参数错误，产品不能为空！')
+    message.warning('参数错误，产品不能为空！')
     delView(unref(currentRoute))
     return
   }

From a64d4240a35400463fd7cb3919839e0b32c4116a Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 27 Jan 2024 17:03:07 +0800
Subject: [PATCH 04/19] =?UTF-8?q?CRM-=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=81=94=E7=B3=BB=E4=BA=BA=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contact/index.ts                  |  6 +++
 .../contact/detail/ContactDetailsHeader.vue   | 16 ++-----
 src/views/crm/contact/detail/index.vue        | 42 ++++++++++++++++---
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index 2386b5fe..6edb90a1 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { TransferReqVO } from '@/api/crm/customer'
 
 export interface ContactVO {
   name: string
@@ -85,3 +86,8 @@ export const createContactBusinessList = async (data: ContactBusinessReqVO) => {
 export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
   return await request.delete({ url: `/crm/contact/delete-business-list`, data })
 }
+
+// 联系人转移
+export const transfer = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/contact/transfer', data })
+}
diff --git a/src/views/crm/contact/detail/ContactDetailsHeader.vue b/src/views/crm/contact/detail/ContactDetailsHeader.vue
index 31daa499..86fb42a5 100644
--- a/src/views/crm/contact/detail/ContactDetailsHeader.vue
+++ b/src/views/crm/contact/detail/ContactDetailsHeader.vue
@@ -10,9 +10,7 @@
       </div>
       <div>
         <!-- 右上：按钮 -->
-        <el-button @click="openForm('update', contact.id)" v-hasPermi="['crm:contact:update']">
-          编辑
-        </el-button>
+        <slot></slot>
       </div>
     </div>
   </div>
@@ -32,18 +30,10 @@
       </el-descriptions-item>
     </el-descriptions>
   </ContentWrap>
-  <!-- 表单弹窗：添加/修改 -->
-  <ContactForm ref="formRef" @success="emit('refresh')" />
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import * as ContactApi from '@/api/crm/contact'
-import ContactForm from '@/views/crm/contact/ContactForm.vue'
 import { formatDate } from '@/utils/formatTime'
-//操作修改
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
+
 const { contact } = defineProps<{ contact: ContactApi.ContactVO }>()
-const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
 </script>
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index 4932292c..7d287381 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -1,5 +1,12 @@
 <template>
-  <ContactDetailsHeader :contact="contact" :loading="loading" @refresh="getContactData(id)" />
+  <ContactDetailsHeader v-loading="loading" :contact="contact">
+    <el-button v-if="permissionListRef?.validateWrite" @click="openForm('update', contact.id)">
+      编辑
+    </el-button>
+    <el-button v-if="permissionListRef?.validateOwnerUser" type="primary" @click="transfer">
+      转移
+    </el-button>
+  </ContactDetailsHeader>
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -8,8 +15,14 @@
       <el-tab-pane label="操作日志">
         <OperateLogV2 :log-list="logList" />
       </el-tab-pane>
-      <el-tab-pane label="团队成员" lazy>
-        <PermissionList :biz-id="contact.id!" :biz-type="BizTypeEnum.CRM_CONTACT" />
+      <el-tab-pane label="团队成员">
+        <PermissionList
+          ref="permissionListRef"
+          :biz-id="contact.id!"
+          :biz-type="BizTypeEnum.CRM_CONTACT"
+          :show-action="!permissionListRef?.isPool || false"
+          @quit-team="close"
+        />
       </el-tab-pane>
       <el-tab-pane label="商机" lazy>
         <BusinessList
@@ -20,6 +33,9 @@
       </el-tab-pane>
     </el-tabs>
   </el-col>
+  <!-- 表单弹窗：添加/修改 -->
+  <ContactForm ref="formRef" @success="getContactData" />
+  <CrmTransferForm ref="crmTransferFormRef" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -31,6 +47,8 @@ import PermissionList from '@/views/crm/permission/components/PermissionList.vue
 import { BizTypeEnum } from '@/api/crm/permission'
 import { OperateLogV2VO } from '@/api/system/operatelog'
 import { getOperateLogPage } from '@/api/crm/operateLog'
+import ContactForm from '@/views/crm/contact/ContactForm.vue'
+import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
 
 defineOptions({ name: 'CrmContactDetail' })
 
@@ -49,6 +67,18 @@ const getContactData = async (id: number) => {
     loading.value = false
   }
 }
+/** 编辑 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+/** 联系人转移 */
+const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 联系人转移表单 ref
+const transfer = () => {
+  crmTransferFormRef.value?.open('联系人转移', contact.value.id, ContactApi.transfer)
+}
+
+const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
 
 /**
  * 获取操作日志
@@ -64,14 +94,16 @@ const getOperateLog = async (contactId: number) => {
   })
   logList.value = data.list
 }
-
+const close = () => {
+  delView(unref(currentRoute))
+}
 /** 初始化 */
 const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由
 onMounted(async () => {
   if (!id) {
     ElMessage.warning('参数错误，联系人不能为空！')
-    delView(unref(currentRoute))
+    close()
     return
   }
   await getContactData(id)

From ed94205fa7c0fa3f0fcaae88d0a59e727a625f0f Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 27 Jan 2024 23:11:43 +0800
Subject: [PATCH 05/19] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=90=88=E5=90=8C=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/business/index.ts                 |   6 +
 src/api/crm/contract/index.ts                 |   2 +
 src/api/crm/product/index.ts                  |   6 +
 src/components/Table/index.ts                 |   3 +-
 src/components/Table/src/TableSelectForm.vue  |  90 ++++++
 src/views/crm/contract/ContractForm.vue       | 271 ++++++++++--------
 .../crm/contract/components/ProductList.vue   | 112 ++++++++
 7 files changed, 375 insertions(+), 115 deletions(-)
 create mode 100644 src/components/Table/src/TableSelectForm.vue
 create mode 100644 src/views/crm/contract/components/ProductList.vue

diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
index 810ec6e9..314eb389 100644
--- a/src/api/crm/business/index.ts
+++ b/src/api/crm/business/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { TransferReqVO } from '@/api/crm/customer'
 
 export interface BusinessVO {
   id: number
@@ -70,3 +71,8 @@ export const getBusinessPageByContact = async (params) => {
 export const getBusinessListByIds = async (val: number[]) => {
   return await request.get({ url: '/crm/business/list-by-ids', params: { ids: val.join(',') } })
 }
+
+// 商机转移
+export const transfer = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/business/transfer', data })
+}
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index 3498e843..527eb5c7 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { ProductExpandVO } from '@/api/crm/product'
 
 export interface ContractVO {
   id: number
@@ -20,6 +21,7 @@ export interface ContractVO {
   signUserId: number
   contactLastTime: Date
   remark: string
+  productItems: ProductExpandVO[]
 }
 
 // 查询 CRM 合同列表
diff --git a/src/api/crm/product/index.ts b/src/api/crm/product/index.ts
index c6d5dfdb..e6508fb4 100644
--- a/src/api/crm/product/index.ts
+++ b/src/api/crm/product/index.ts
@@ -12,6 +12,12 @@ export interface ProductVO {
   ownerUserId: number
 }
 
+export interface ProductExpandVO extends ProductVO {
+  count: number
+  discountPercent: number
+  totalPrice: number
+}
+
 // 查询产品列表
 export const getProductPage = async (params) => {
   return await request.get({ url: `/crm/product/page`, params })
diff --git a/src/components/Table/index.ts b/src/components/Table/index.ts
index 689f64a8..9f893171 100644
--- a/src/components/Table/index.ts
+++ b/src/components/Table/index.ts
@@ -1,6 +1,7 @@
 import Table from './src/Table.vue'
 import { ElTable } from 'element-plus'
 import { TableSetPropsType } from '@/types/table'
+import TableSelectForm from './src/TableSelectForm.vue'
 
 export interface TableExpose {
   setProps: (props: Recordable) => void
@@ -9,4 +10,4 @@ export interface TableExpose {
   elTableRef: ComponentRef<typeof ElTable>
 }
 
-export { Table }
+export { Table, TableSelectForm }
diff --git a/src/components/Table/src/TableSelectForm.vue b/src/components/Table/src/TableSelectForm.vue
new file mode 100644
index 00000000..55b2855e
--- /dev/null
+++ b/src/components/Table/src/TableSelectForm.vue
@@ -0,0 +1,90 @@
+<template>
+  <Dialog v-model="dialogVisible" :appendToBody="true" :scroll="true" :title="title" width="60%">
+    <el-table
+      ref="multipleTableRef"
+      v-loading="loading"
+      :data="list"
+      :show-overflow-tooltip="true"
+      :stripe="true"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <slot></slot>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { ElTable } from 'element-plus'
+
+defineOptions({ name: 'TableSelectForm' })
+withDefaults(
+  defineProps<{
+    modelValue: any[]
+    title: string
+  }>(),
+  { modelValue: () => [], title: '选择' }
+)
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const loading = ref(false) // 列表的加载中
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10
+})
+// 确认选择时的触发事件
+const emits = defineEmits<{
+  (e: 'update:modelValue', v: number[]): void
+}>()
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const multipleSelection = ref<any[]>([])
+const handleSelectionChange = (val: any[]) => {
+  multipleSelection.value = val
+}
+/** 触发 */
+const submitForm = () => {
+  formLoading.value = true
+  try {
+    emits('update:modelValue', multipleSelection.value) // 返回选择的原始数据由使用方处理
+  } finally {
+    formLoading.value = false
+    // 关闭弹窗
+    dialogVisible.value = false
+  }
+}
+
+const getList = async (getListFunc: Function) => {
+  loading.value = true
+  try {
+    const data = await getListFunc(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 打开弹窗 */
+const open = async (getListFunc: Function) => {
+  dialogVisible.value = true
+  await nextTick()
+  if (multipleSelection.value.length > 0) {
+    multipleTableRef.value!.clearSelection()
+  }
+  await getList(getListFunc)
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index 5d5578f9..a9271ce5 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -1,54 +1,108 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="70%">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="100px"
-      v-loading="formLoading"
     >
       <el-row>
+        <el-col :span="24" class="mb-10px">
+          <CardTitle title="基本信息" />
+        </el-col>
         <el-col :span="12">
           <el-form-item label="合同名称" prop="name">
             <el-input v-model="formData.name" placeholder="请输入合同名称" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="客户" prop="customerId">
-            <el-input v-model="formData.customerId" placeholder="请选择对应客户" />
+          <el-form-item label="合同编号" prop="no">
+            <el-input v-model="formData.no" placeholder="请输入合同编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="客户" prop="customerId">
+            <el-select v-model="formData.customerId">
+              <el-option
+                v-for="item in customerList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="客户签约人" prop="contactId">
+            <el-select v-model="formData.contactId" :disabled="!formData.customerId">
+              <el-option
+                v-for="item in getContactOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司签约人" prop="signUserId">
+            <el-select v-model="formData.signUserId">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人" prop="ownerUserId">
+            <el-select v-model="formData.ownerUserId">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商机名称" prop="businessId">
+            <el-select v-model="formData.businessId">
+              <el-option
+                v-for="item in businessList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同金额(元)" prop="price">
+            <el-input v-model="formData.price" placeholder="请输入合同金额" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="下单日期" prop="orderDate">
+            <el-date-picker
+              v-model="formData.orderDate"
+              placeholder="选择下单日期"
+              type="date"
+              value-format="x"
+            />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-form-item label="商机名称" prop="businessId">
-        <el-input v-model="formData.businessId" placeholder="请选择对应商机" />
-      </el-form-item>
-      <el-form-item label="工作流" prop="processInstanceId">
-        <el-input v-model="formData.processInstanceId" placeholder="请选择工作流" />
-      </el-form-item>
-      <el-form-item label="下单日期" prop="orderDate">
-        <el-date-picker
-          v-model="formData.orderDate"
-          type="date"
-          value-format="x"
-          placeholder="选择下单日期"
-        />
-      </el-form-item>
-      <el-form-item label="负责人" prop="ownerUserId">
-        <el-input v-model="formData.ownerUserId" placeholder="请选择负责人" />
-      </el-form-item>
-      <el-form-item label="合同编号" prop="no">
-        <el-input v-model="formData.no" placeholder="请输入合同编号" />
-      </el-form-item>
-
-      <el-row>
         <el-col :span="12">
           <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
               v-model="formData.startTime"
+              placeholder="选择开始时间"
               type="date"
               value-format="x"
-              placeholder="选择开始时间"
             />
           </el-form-item>
         </el-col>
@@ -56,72 +110,60 @@
           <el-form-item label="结束时间" prop="endTime">
             <el-date-picker
               v-model="formData.endTime"
+              placeholder="选择结束时间"
               type="date"
               value-format="x"
-              placeholder="选择结束时间"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="合同金额" prop="price">
-            <el-input v-model="formData.price" placeholder="请输入合同金额" />
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="formData.remark"
+              :rows="3"
+              placeholder="请输入备注"
+              type="textarea"
+            />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="整单折扣" prop="discountPercent">
+        <el-col :span="24">
+          <el-form-item label="产品列表" prop="productList">
+            <ProductList v-model="formData.productItems" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="整单折扣(%)" prop="discountPercent">
             <el-input v-model="formData.discountPercent" placeholder="请输入整单折扣" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品总金额" prop="productPrice">
+        <el-col :span="12">
+          <el-form-item label="产品总金额(元)" prop="productPrice">
             <el-input v-model="formData.productPrice" placeholder="请输入产品总金额" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-form-item label="只读权限的用户" prop="roUserIds">
-        <el-input v-model="formData.roUserIds" placeholder="请输入只读权限的用户" />
-      </el-form-item>
-      <el-form-item label="读写权限的用户" prop="rwUserIds">
-        <el-input v-model="formData.rwUserIds" placeholder="请输入读写权限的用户" />
-      </el-form-item>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="联系人编号" prop="contactId">
-            <el-input v-model="formData.contactId" placeholder="请输入联系人编号" />
-          </el-form-item>
+        <el-col :span="24">
+          <CardTitle class="mb-10px" title="审批信息" />
         </el-col>
         <el-col :span="12">
-          <el-form-item label="公司签约人" prop="signUserId">
-            <el-input v-model="formData.signUserId" placeholder="请输入公司签约人" />
+          <el-form-item label="工作流" prop="processInstanceId">
+            <el-input v-model="formData.processInstanceId" placeholder="请选择工作流" />
           </el-form-item>
         </el-col>
       </el-row>
-
-      <el-form-item label="最后跟进时间" prop="contactLastTime">
-        <el-date-picker
-          v-model="formData.contactLastTime"
-          type="date"
-          value-format="x"
-          placeholder="选择最后跟进时间"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
-      </el-form-item>
     </el-form>
     <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>
   </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
+import * as CustomerApi from '@/api/crm/customer'
 import * as ContractApi from '@/api/crm/contract'
+import * as UserApi from '@/api/system/user'
+import * as ContactApi from '@/api/crm/contact'
+import * as BusinessApi from '@/api/crm/business'
+import ProductList from './components/ProductList.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -130,38 +172,34 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  name: undefined,
-  customerId: undefined,
-  businessId: undefined,
-  processInstanceId: undefined,
-  orderDate: undefined,
-  ownerUserId: undefined,
-  no: undefined,
-  startTime: undefined,
-  endTime: undefined,
-  price: undefined,
-  discountPercent: undefined,
-  productPrice: undefined,
-  roUserIds: undefined,
-  rwUserIds: undefined,
-  contactId: undefined,
-  signUserId: undefined,
-  contactLastTime: undefined,
-  remark: undefined
-})
+const formData = ref<ContractApi.ContractVO>({} as ContractApi.ContractVO)
 const formRules = reactive({
   name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-
+watch(
+  () => formData.value.productItems,
+  (val) => {
+    if (!val || val.length === 0) {
+      formData.value.productPrice = 0
+      return
+    }
+    // 使用reduce函数进行累加
+    formData.value.productPrice = val.reduce(
+      (accumulator, currentValue) =>
+        isNaN(accumulator + currentValue.totalPrice) ? 0 : accumulator + currentValue.totalPrice,
+      0
+    )
+  },
+  { deep: true }
+)
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  await getAllApi()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -172,6 +210,9 @@ const open = async (type: string, id?: number) => {
     }
   }
 }
+const getAllApi = async () => {
+  await Promise.all([getCustomerList(), getUserList(), getContactListList(), getBusinessList()])
+}
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
@@ -199,30 +240,32 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
-
+const customerList = ref<CustomerApi.CustomerVO[]>([])
+/** 获取客户 */
+const getCustomerList = async () => {
+  customerList.value = await CustomerApi.getSimpleCustomerList()
+}
+const contactList = ref<ContactApi.ContactVO[]>([])
+/** 动态获取客户联系人 */
+const getContactOptions = computed(() =>
+  contactList.value.filter((item) => item.customerId === formData.value.customerId)
+)
+const getContactListList = async () => {
+  contactList.value = await ContactApi.getSimpleContactList()
+}
+const userList = ref<UserApi.UserVO[]>([])
+/** 获取用户列表 */
+const getUserList = async () => {
+  userList.value = await UserApi.getSimpleUserList()
+}
+const businessList = ref<BusinessApi.BusinessVO[]>([])
+/** 获取商机 */
+const getBusinessList = async () => {
+  businessList.value = await BusinessApi.getSimpleBusinessList()
+}
 /** 重置表单 */
 const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    name: undefined,
-    customerId: undefined,
-    businessId: undefined,
-    processInstanceId: undefined,
-    orderDate: undefined,
-    ownerUserId: undefined,
-    no: undefined,
-    startTime: undefined,
-    endTime: undefined,
-    price: undefined,
-    discountPercent: undefined,
-    productPrice: undefined,
-    roUserIds: undefined,
-    rwUserIds: undefined,
-    contactId: undefined,
-    signUserId: undefined,
-    contactLastTime: undefined,
-    remark: undefined
-  }
+  formData.value = {} as ContractApi.ContractVO
   formRef.value?.resetFields()
 }
 </script>
diff --git a/src/views/crm/contract/components/ProductList.vue b/src/views/crm/contract/components/ProductList.vue
new file mode 100644
index 00000000..6c4ca350
--- /dev/null
+++ b/src/views/crm/contract/components/ProductList.vue
@@ -0,0 +1,112 @@
+<template>
+  <el-row justify="end">
+    <el-button plain type="primary" @click="openForm">添加产品</el-button>
+  </el-row>
+  <el-table :data="list" :show-overflow-tooltip="true" :stripe="true">
+    <el-table-column align="center" label="产品名称" prop="name" width="160" />
+    <el-table-column align="center" label="产品类型" prop="categoryName" width="160" />
+    <el-table-column align="center" label="产品单位" prop="unit">
+      <template #default="scope">
+        <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.unit" />
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="产品编码" prop="no" />
+    <el-table-column
+      :formatter="fenToYuanFormat"
+      align="center"
+      label="价格（元）"
+      prop="price"
+      width="100"
+    />
+    <el-table-column align="center" label="数量" prop="count" width="200">
+      <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
+        <el-input-number v-model="row.count" class="!w-100%" />
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="折扣(%)" prop="discountPercent" width="200">
+      <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
+        <el-input-number v-model="row.discountPercent" class="!w-100%" />
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="合计" prop="totalPrice" width="100">
+      <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
+        {{ getTotalPrice(row) }}
+      </template>
+    </el-table-column>
+    <el-table-column align="center" fixed="right" label="操作" width="130">
+      <template #default="scope">
+        <el-button link type="danger" @click="handleDelete(scope.row.id)"> 移除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+
+  <!-- table 选择表单 -->
+  <TableSelectForm ref="tableSelectFormRef" v-model="multipleSelection" title="选择商品">
+    <el-table-column align="center" label="产品名称" prop="name" width="160" />
+    <el-table-column align="center" label="产品类型" prop="categoryName" width="160" />
+    <el-table-column align="center" label="产品单位" prop="unit">
+      <template #default="scope">
+        <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.unit" />
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="产品编码" prop="no" />
+    <el-table-column
+      :formatter="fenToYuanFormat"
+      align="center"
+      label="价格（元）"
+      prop="price"
+      width="100"
+    />
+  </TableSelectForm>
+</template>
+
+<script lang="ts" setup>
+import * as ProductApi from '@/api/crm/product'
+import { DICT_TYPE } from '@/utils/dict'
+import { fenToYuanFormat } from '@/utils/formatter'
+import { TableSelectForm } from '@/components/Table/index'
+
+defineOptions({ name: 'ProductList' })
+withDefaults(defineProps<{ modelValue: any[] }>(), { modelValue: () => [] })
+const emits = defineEmits<{
+  (e: 'update:modelValue', v: any[]): void
+}>()
+const list = ref<ProductApi.ProductExpandVO[]>([])
+const handleDelete = (id: number) => {
+  const index = list.value.findIndex((item) => item.id === id)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
+}
+const tableSelectFormRef = ref<InstanceType<typeof TableSelectForm>>()
+const multipleSelection = ref<ProductApi.ProductExpandVO[]>([])
+const openForm = () => {
+  tableSelectFormRef.value?.open(ProductApi.getProductPage)
+}
+const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
+  const totalPrice = (row.price * row.count * row.discountPercent) / 100
+  row.totalPrice = isNaN(totalPrice) ? 0 : totalPrice
+  return isNaN(totalPrice) ? 0 : totalPrice
+})
+watch(
+  list,
+  (val) => {
+    if (!val || val.length === 0) {
+      return
+    }
+    emits('update:modelValue', list.value)
+  },
+  { deep: true }
+)
+watch(
+  multipleSelection,
+  (val) => {
+    if (!val || val.length === 0) {
+      return
+    }
+    const ids = list.value.map((item) => item.id)
+    list.value.push(...multipleSelection.value.filter((item) => ids.indexOf(item.id) === -1))
+  },
+  { deep: true }
+)
+</script>

From 331b6c5611001f622c70646883bd4fc8b62ff091 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 27 Jan 2024 23:18:52 +0800
Subject: [PATCH 06/19] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=90=88=E5=90=8C=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contract/index.ts           |  3 +--
 src/views/crm/contract/ContractForm.vue | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index 527eb5c7..1d944498 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -15,11 +15,10 @@ export interface ContractVO {
   price: number
   discountPercent: number
   productPrice: number
-  roUserIds: string
-  rwUserIds: string
   contactId: number
   signUserId: number
   contactLastTime: Date
+  status: number
   remark: string
   productItems: ProductExpandVO[]
 }
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index a9271ce5..28e49301 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -5,7 +5,7 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="110px"
     >
       <el-row>
         <el-col :span="24" class="mb-10px">
@@ -152,7 +152,8 @@
       </el-row>
     </el-form>
     <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm(1)">提交审核</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm(2)">保存草稿</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -164,6 +165,7 @@ import * as UserApi from '@/api/system/user'
 import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import ProductList from './components/ProductList.vue'
+import { cloneDeep } from 'lodash-es'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -217,7 +219,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
+const submitForm = async (status: number) => {
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()
@@ -225,7 +227,8 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as ContractApi.ContractVO
+    const data = cloneDeep(unref(formData.value)) as unknown as ContractApi.ContractVO
+    data.status = status
     if (formType.value === 'create') {
       await ContractApi.createContract(data)
       message.success(t('common.createSuccess'))

From 4a2349ecf57ba7ec89166de271487459994b59de Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Sat, 27 Jan 2024 23:42:13 +0800
Subject: [PATCH 07/19] =?UTF-8?q?feat:=20CRM-backlog-=E5=BE=85=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=85=AC=E6=B5=B7=E7=9A=84=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/customer/index.ts                 |   5 +
 src/views/crm/backlog/index.vue               |   2 +-
 .../crm/backlog/tables/PutInPoolRemind.vue    | 156 +++++++++++++++++-
 3 files changed, 154 insertions(+), 9 deletions(-)

diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index 4542c86a..eb3445cf 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -100,3 +100,8 @@ export const receiveCustomer = async (ids: any[]) => {
 export const putCustomerPool = async (id: number) => {
   return await request.put({ url: `/crm/customer/put-pool?id=${id}` })
 }
+
+// 进入公海客户提醒
+export const getPutInPoolRemindCustomerPage = async (params) => {
+  return await request.get({ url: `/crm/customer/put-in-pool-remind-page`, params })
+}
diff --git a/src/views/crm/backlog/index.vue b/src/views/crm/backlog/index.vue
index bbaf3f16..bc20c425 100644
--- a/src/views/crm/backlog/index.vue
+++ b/src/views/crm/backlog/index.vue
@@ -1,3 +1,4 @@
+<!-- TODO @dhb52: 存在很多重复的 table 定义，如Customer: TodayCustomer,FollowCustomer,PutInPoolRemind -->
 <template>
   <el-row :gutter="20">
     <el-col :span="4" class="min-w-[200px]">
@@ -71,7 +72,6 @@ const leftSides = ref([
   },
   {
     name: '待审核回款',
-    crmType: 'receivables',
     infoType: 'checkReceivables',
     msgCount: 0,
     tips: ''
diff --git a/src/views/crm/backlog/tables/PutInPoolRemind.vue b/src/views/crm/backlog/tables/PutInPoolRemind.vue
index bb9b17a5..bc99a885 100644
--- a/src/views/crm/backlog/tables/PutInPoolRemind.vue
+++ b/src/views/crm/backlog/tables/PutInPoolRemind.vue
@@ -1,15 +1,155 @@
 <!-- 待进入公海的客户 -->
-<!-- TODO: 后续再统一改名字 -->
 <template>
-  <div>
-    TODO: 待进入公海的客户
-  </div>
+  <ContentWrap>
+    <div class="pb-5 text-xl"> 待进入公海的客户 </div>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="归属" prop="sceneType">
+        <el-select
+          v-model="queryParams.sceneType"
+          class="!w-240px"
+          placeholder="归属"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="(option, index) in SCENE_TYPES"
+            :label="option.label"
+            :value="option.value"
+            :key="index"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <ContentWrap>
+    <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" width="160">
+        <template #default="scope">
+          <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
+            {{ scope.row.name }}
+          </el-link>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="手机" prop="mobile" width="120" />
+      <el-table-column align="center" label="电话" prop="telephone" width="120" />
+      <el-table-column align="center" label="客户来源" prop="source" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="所属行业" prop="industryId" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="客户等级" prop="level" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="网址" prop="website" width="200" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="下次联系时间"
+        prop="contactNextTime"
+        width="180px"
+      />
+      <el-table-column align="center" label="备注" prop="remark" width="200" />
+      <el-table-column align="center" label="成交状态" prop="dealStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.dealStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="距进入公海天数" prop="poolDay" width="100px" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="最后跟进时间"
+        prop="contactLastTime"
+        width="180px"
+      />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="updateTime"
+        width="180px"
+      />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180px"
+      />
+      <el-table-column align="center" label="负责人" prop="ownerUserName" width="100px" />
+      <el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
+      <el-table-column align="center" label="创建人" prop="creatorName" width="100px" />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
 </template>
 
-<script setup lang="ts" name="PutInPoolRemind">
+<script lang="ts" setup name="PutInPoolRemind">
+import * as CustomerApi from '@/api/crm/customer'
+import { DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { SCENE_TYPES } from './common'
 
+const { push } = useRouter()
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  sceneType: 1, // 我负责的
+  pool: true, // 固定 公海参数为 true
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CustomerApi.getPutInPoolRemindCustomerPage(queryParams.value)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNo = 1
+  getList()
+}
+
+/** 打开客户详情 */
+const openDetail = (id: number) => {
+  push({ name: 'CrmCustomerDetail', params: { id } })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
 </script>
 
-<style scoped>
-
-</style>
+<style lang="scss"></style>

From 90e0baf5bc7787232c9cdbc9fc4b6e8f04f779cb Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 27 Jan 2024 23:43:30 +0800
Subject: [PATCH 08/19] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=90=88=E5=90=8C=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contract/index.ts           |   5 +
 src/views/crm/contract/ContractForm.vue |  19 ++--
 src/views/crm/contract/index.vue        | 116 ++++++++++++++----------
 3 files changed, 83 insertions(+), 57 deletions(-)

diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index 1d944498..ffe4b578 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -57,3 +57,8 @@ export const deleteContract = async (id: number) => {
 export const exportContract = async (params) => {
   return await request.download({ url: `/crm/contract/export-excel`, params })
 }
+
+// 提交审核
+export const handleApprove = async (id: number) => {
+  return await request.put({ url: `/crm/contract/approve?id=${id}` })
+}
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index 28e49301..7a272c1c 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -145,15 +145,12 @@
           <CardTitle class="mb-10px" title="审批信息" />
         </el-col>
         <el-col :span="12">
-          <el-form-item label="工作流" prop="processInstanceId">
-            <el-input v-model="formData.processInstanceId" placeholder="请选择工作流" />
-          </el-form-item>
+          <el-button class="m-20px" link type="primary">查看工作流</el-button>
         </el-col>
       </el-row>
     </el-form>
     <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm(1)">提交审核</el-button>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm(2)">保存草稿</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">保存</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -165,7 +162,6 @@ import * as UserApi from '@/api/system/user'
 import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import ProductList from './components/ProductList.vue'
-import { cloneDeep } from 'lodash-es'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -176,7 +172,11 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<ContractApi.ContractVO>({} as ContractApi.ContractVO)
 const formRules = reactive({
-  name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '合同名称不能为空', trigger: 'blur' }],
+  customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
+  orderDate: [{ required: true, message: '下单日期不能为空', trigger: 'blur' }],
+  ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  no: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 watch(
@@ -219,7 +219,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async (status: number) => {
+const submitForm = async () => {
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()
@@ -227,8 +227,7 @@ const submitForm = async (status: number) => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = cloneDeep(unref(formData.value)) as unknown as ContractApi.ContractVO
-    data.status = status
+    const data = unref(formData.value) as unknown as ContractApi.ContractVO
     if (formType.value === 'create') {
       await ContractApi.createContract(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index 26ff403a..49ea53a9 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -2,44 +2,52 @@
   <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="no">
         <el-input
           v-model="queryParams.no"
-          placeholder="请输入合同编号"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入合同编号"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="合同名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入合同名称"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入合同名称"
+          @keyup.enter="handleQuery"
         />
       </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('create')" v-hasPermi="['crm:contract: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:contract:create']" type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
         </el-button>
         <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
           v-hasPermi="['crm:contract:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
         </el-button>
       </el-form-item>
     </el-form>
@@ -48,70 +56,78 @@
   <!-- 列表 -->
   <!-- TODO 芋艿：各种字段要调整 -->
   <ContentWrap>
-    <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="customerId" />
-      <el-table-column label="商机名称" align="center" prop="businessId" />
-      <el-table-column label="工作流名称" align="center" prop="processInstanceId" />
+    <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="customerId" />
+      <el-table-column align="center" label="商机名称" prop="businessId" />
+      <el-table-column align="center" label="工作流名称" prop="processInstanceId" />
       <el-table-column
+        :formatter="dateFormatter"
+        align="center"
         label="下单时间"
-        align="center"
         prop="orderDate"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="负责人" align="center" prop="ownerUserId" />
-      <el-table-column label="合同编号" align="center" prop="no" />
+      <el-table-column align="center" label="负责人" prop="ownerUserId" />
+      <el-table-column align="center" label="合同编号" prop="no" />
       <el-table-column
+        :formatter="dateFormatter"
+        align="center"
         label="开始时间"
-        align="center"
         prop="startTime"
-        :formatter="dateFormatter"
         width="180px"
       />
       <el-table-column
+        :formatter="dateFormatter"
+        align="center"
         label="结束时间"
-        align="center"
         prop="endTime"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="合同金额" align="center" prop="price" />
-      <el-table-column label="整单折扣" align="center" prop="discountPercent" />
-      <el-table-column label="产品总金额" align="center" prop="productPrice" />
-      <el-table-column label="联系人" align="center" prop="contactId" />
-      <el-table-column label="公司签约人" align="center" prop="signUserId" />
+      <el-table-column align="center" label="合同金额" prop="price" />
+      <el-table-column align="center" label="整单折扣" prop="discountPercent" />
+      <el-table-column align="center" label="产品总金额" prop="productPrice" />
+      <el-table-column align="center" label="联系人" prop="contactId" />
+      <el-table-column align="center" label="公司签约人" prop="signUserId" />
       <el-table-column
+        :formatter="dateFormatter"
+        align="center"
         label="最后跟进时间"
-        align="center"
         prop="contactLastTime"
-        :formatter="dateFormatter"
         width="180px"
       />
       <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
         :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
         width="180px"
       />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column align="center" label="备注" prop="remark" />
       <el-table-column label="操作" width="120px">
         <template #default="scope">
           <el-button
+            v-hasPermi="['crm:contract:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['crm:contract:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['crm:contract:update']"
+            link
+            type="primary"
+            @click="handleApprove(scope.row.id)"
+          >
+            提交审核
+          </el-button>
+          <el-button
+            v-hasPermi="['crm:contract:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['crm:contract:delete']"
           >
             删除
           </el-button>
@@ -120,9 +136,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>
@@ -130,7 +146,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <ContractForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ContractApi from '@/api/crm/contract'
@@ -216,6 +232,12 @@ const handleExport = async () => {
   }
 }
 
+/** 提交审核 **/
+const handleApprove = async (id: number) => {
+  await ContractApi.handleApprove(id)
+  message.success('提交审核成功！')
+  await getList()
+}
 /** 初始化 **/
 onMounted(() => {
   getList()

From 668da2fa865835e51486d02b75fd5e2bc2561cc5 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Jan 2024 01:32:49 +0800
Subject: [PATCH 09/19] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=88=E5=90=8C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contract/index.ts                 |  12 ++
 src/router/modules/remaining.ts               |  11 ++
 src/views/crm/contact/detail/index.vue        |   5 +-
 .../contract/detail/ContractDetailsHeader.vue |  40 +++++++
 .../contract/detail/ContractDetailsInfo.vue   |  51 ++++++++
 src/views/crm/contract/detail/index.vue       | 111 ++++++++++++++++++
 src/views/crm/contract/index.vue              |  21 +++-
 7 files changed, 245 insertions(+), 6 deletions(-)
 create mode 100644 src/views/crm/contract/detail/ContractDetailsHeader.vue
 create mode 100644 src/views/crm/contract/detail/ContractDetailsInfo.vue
 create mode 100644 src/views/crm/contract/detail/index.vue

diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index ffe4b578..731750c1 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import { ProductExpandVO } from '@/api/crm/product'
+import { TransferReqVO } from '@/api/crm/customer'
 
 export interface ContractVO {
   id: number
@@ -21,6 +22,12 @@ export interface ContractVO {
   status: number
   remark: string
   productItems: ProductExpandVO[]
+  creatorName: string
+  updateTime?: Date
+  createTime?: Date
+  customerName: string
+  contactName: string
+  ownerUserName: string
 }
 
 // 查询 CRM 合同列表
@@ -62,3 +69,8 @@ export const exportContract = async (params) => {
 export const handleApprove = async (id: number) => {
   return await request.put({ url: `/crm/contract/approve?id=${id}` })
 }
+
+// 合同转移
+export const transfer = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/contract/transfer', data })
+}
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 7bcd81d2..edda3820 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -507,6 +507,17 @@ const remainingRouter: AppRouteRecordRaw[] = [
         },
         component: () => import('@/views/crm/customer/detail/index.vue')
       },
+      {
+        path: 'contract/detail/:id',
+        name: 'CrmContractDetail',
+        meta: {
+          title: '合同详情',
+          noCache: true,
+          hidden: true,
+          activeMenu: '/crm/contract'
+        },
+        component: () => import('@/views/crm/contract/detail/index.vue')
+      },
       {
         path: 'contact/detail/:id',
         name: 'CrmContactDetail',
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index 7d287381..65678a3d 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -34,7 +34,7 @@
     </el-tabs>
   </el-col>
   <!-- 表单弹窗：添加/修改 -->
-  <ContactForm ref="formRef" @success="getContactData" />
+  <ContactForm ref="formRef" @success="getContactData(contact.id)" />
   <CrmTransferForm ref="crmTransferFormRef" @success="close" />
 </template>
 <script lang="ts" setup>
@@ -53,6 +53,7 @@ import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
 defineOptions({ name: 'CrmContactDetail' })
 
 const route = useRoute()
+const message = useMessage()
 const id = Number(route.params.id) // 联系人编号
 const loading = ref(true) // 加载中
 const contact = ref<ContactApi.ContactVO>({} as ContactApi.ContactVO) // 联系人详情
@@ -102,7 +103,7 @@ const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由
 onMounted(async () => {
   if (!id) {
-    ElMessage.warning('参数错误，联系人不能为空！')
+    message.warning('参数错误，联系人不能为空！')
     close()
     return
   }
diff --git a/src/views/crm/contract/detail/ContractDetailsHeader.vue b/src/views/crm/contract/detail/ContractDetailsHeader.vue
new file mode 100644
index 00000000..b3552735
--- /dev/null
+++ b/src/views/crm/contract/detail/ContractDetailsHeader.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <div class="flex items-start justify-between">
+      <div>
+        <el-col>
+          <el-row>
+            <span class="text-xl font-bold">{{ contract.name }}</span>
+          </el-row>
+        </el-col>
+      </div>
+      <div>
+        <!-- 右上：按钮 -->
+        <slot></slot>
+      </div>
+    </div>
+  </div>
+  <ContentWrap class="mt-10px">
+    <el-descriptions :column="5" direction="vertical">
+      <el-descriptions-item label="客户">
+        {{ contract.customerName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="客户签约人">
+        {{ contract.contactName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="合同金额">
+        {{ contract.productPrice }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ contract.createTime ? formatDate(contract.createTime) : '空' }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ContractApi from '@/api/crm/contract'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'ContractDetailsHeader' })
+defineProps<{ contract: ContractApi.ContractVO }>()
+</script>
diff --git a/src/views/crm/contract/detail/ContractDetailsInfo.vue b/src/views/crm/contract/detail/ContractDetailsInfo.vue
new file mode 100644
index 00000000..f18f7c08
--- /dev/null
+++ b/src/views/crm/contract/detail/ContractDetailsInfo.vue
@@ -0,0 +1,51 @@
+<template>
+  <ContentWrap>
+    <el-collapse v-model="activeNames">
+      <el-collapse-item name="contractInfo">
+        <template #title>
+          <span class="text-base font-bold">基本信息</span>
+        </template>
+        <!-- TODO puhui999: 先出详情样式后补全 -->
+        <el-descriptions :column="4">
+          <el-descriptions-item label="合同名称">
+            {{ contract.name }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注">
+            {{ contract.remark }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <el-collapse-item name="systemInfo">
+        <template #title>
+          <span class="text-base font-bold">系统信息</span>
+        </template>
+        <el-descriptions :column="2">
+          <el-descriptions-item label="负责人">
+            {{ contract.ownerUserName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建人">
+            {{ contract.creatorName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建时间">
+            {{ contract.createTime ? formatDate(contract.createTime) : '空' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="更新时间">
+            {{ contract.updateTime ? formatDate(contract.updateTime) : '空' }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+    </el-collapse>
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import * as ContractApi from '@/api/crm/contract'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'ContractDetailsInfo' })
+defineProps<{
+  contract: ContractApi.ContractVO
+}>()
+
+// 展示的折叠面板
+const activeNames = ref(['contractInfo', 'systemInfo'])
+</script>
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
new file mode 100644
index 00000000..5ba1e997
--- /dev/null
+++ b/src/views/crm/contract/detail/index.vue
@@ -0,0 +1,111 @@
+<template>
+  <ContractDetailsHeader v-loading="loading" :contract="contract">
+    <el-button v-if="permissionListRef?.validateWrite" @click="openForm('update', contract.id)">
+      编辑
+    </el-button>
+    <el-button v-if="permissionListRef?.validateOwnerUser" type="primary" @click="transfer">
+      转移
+    </el-button>
+  </ContractDetailsHeader>
+  <el-col>
+    <el-tabs>
+      <el-tab-pane label="详细资料">
+        <ContractDetailsInfo :contract="contract" />
+      </el-tab-pane>
+      <el-tab-pane label="操作日志">
+        <OperateLogV2 :log-list="logList" />
+      </el-tab-pane>
+      <el-tab-pane label="团队成员">
+        <PermissionList
+          ref="permissionListRef"
+          :biz-id="contract.id!"
+          :biz-type="BizTypeEnum.CRM_CONTRACT"
+          :show-action="!permissionListRef?.isPool || false"
+          @quit-team="close"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="商机" lazy>
+        <BusinessList
+          :biz-id="contract.id!"
+          :biz-type="BizTypeEnum.CRM_CONTRACT"
+          :customer-id="contract.customerId"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </el-col>
+  <!-- 表单弹窗：添加/修改 -->
+  <ContractForm ref="formRef" @success="getContractData" />
+  <CrmTransferForm ref="crmTransferFormRef" @success="close" />
+</template>
+<script lang="ts" setup>
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { OperateLogV2VO } from '@/api/system/operatelog'
+import * as ContractApi from '@/api/crm/contract'
+import ContractDetailsHeader from './ContractDetailsHeader.vue'
+import ContractDetailsInfo from './ContractDetailsInfo.vue'
+import { BizTypeEnum } from '@/api/crm/permission'
+import { getOperateLogPage } from '@/api/crm/operateLog'
+import ContractForm from '@/views/crm/contract/ContractForm.vue'
+import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
+import PermissionList from '@/views/crm/permission/components/PermissionList.vue'
+import BusinessList from '@/views/crm/business/components/BusinessList.vue'
+
+defineOptions({ name: 'CrmContractDetail' })
+
+const route = useRoute()
+const message = useMessage()
+const contractId = ref(0) // 编号
+const loading = ref(true) // 加载中
+const contract = ref<ContractApi.ContractVO>({} as ContractApi.ContractVO) // 详情
+/** 编辑 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+/** 获取详情 */
+const getContractData = async () => {
+  loading.value = true
+  try {
+    await getOperateLog(contractId.value)
+    contract.value = await ContractApi.getContract(contractId.value)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 获取操作日志 */
+const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
+const getOperateLog = async (contractId: number) => {
+  if (!contractId) {
+    return
+  }
+  const data = await getOperateLogPage({
+    bizType: BizTypeEnum.CRM_CONTRACT,
+    bizId: contractId
+  })
+  logList.value = data.list
+}
+
+const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 合同转移表单 ref
+const transfer = () => {
+  crmTransferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transfer)
+}
+
+const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
+/** 初始化 */
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute } = useRouter() // 路由
+const close = () => {
+  delView(unref(currentRoute))
+}
+onMounted(async () => {
+  const id = route.params.id
+  if (!id) {
+    message.warning('参数错误，合同不能为空！')
+    close()
+    return
+  }
+  contractId.value = id
+  await getContractData()
+})
+</script>
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index 49ea53a9..da3aeaad 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -105,7 +105,7 @@
         width="180px"
       />
       <el-table-column align="center" label="备注" prop="remark" />
-      <el-table-column label="操作" width="120px">
+      <el-table-column fixed="right" label="操作" width="250">
         <template #default="scope">
           <el-button
             v-hasPermi="['crm:contract:update']"
@@ -119,10 +119,18 @@
             v-hasPermi="['crm:contract:update']"
             link
             type="primary"
-            @click="handleApprove(scope.row.id)"
+            @click="handleApprove(scope.row)"
           >
             提交审核
           </el-button>
+          <el-button
+            v-hasPermi="['crm:contract:query']"
+            link
+            type="primary"
+            @click="openDetail(scope.row.id)"
+          >
+            详情
+          </el-button>
           <el-button
             v-hasPermi="['crm:contract:delete']"
             link
@@ -233,11 +241,16 @@ const handleExport = async () => {
 }
 
 /** 提交审核 **/
-const handleApprove = async (id: number) => {
-  await ContractApi.handleApprove(id)
+const handleApprove = async (row: ContractApi.ContractVO) => {
+  await message.confirm(`您确定提交【${row.name}】审核吗？`)
+  await ContractApi.handleApprove(row.id)
   message.success('提交审核成功！')
   await getList()
 }
+const { push } = useRouter()
+const openDetail = (id: number) => {
+  push({ name: 'CrmContractDetail', params: { id } })
+}
 /** 初始化 **/
 onMounted(() => {
   getList()

From 41195d5b4abf91771f419c1ea49a75f017f87e99 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Jan 2024 16:33:06 +0800
Subject: [PATCH 10/19] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=88=E5=90=8C=E9=A2=84=E8=A7=88=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/model/index.ts                    |   4 +-
 src/views/crm/contract/ContractForm.vue       |  12 +-
 .../crm/contract/components/BPMLModel.vue     |  31 +++
 src/views/crm/contract/detail/index.vue       |   2 +-
 .../crm/contract/oa/ContractDetail/index.vue  | 220 ++++++++++++++++++
 5 files changed, 266 insertions(+), 3 deletions(-)
 create mode 100644 src/views/crm/contract/components/BPMLModel.vue
 create mode 100644 src/views/crm/contract/oa/ContractDetail/index.vue

diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
index 2e1d4e64..fea5ecf0 100644
--- a/src/api/bpm/model/index.ts
+++ b/src/api/bpm/model/index.ts
@@ -32,7 +32,9 @@ export const getModelPage = async (params) => {
 export const getModel = async (id: number) => {
   return await request.get({ url: '/bpm/model/get?id=' + id })
 }
-
+export const getModelByKey = async (key: string) => {
+  return await request.get({ url: '/bpm/model/get-by-key?key=' + key })
+}
 export const updateModel = async (data: ModelVO) => {
   return await request.put({ url: '/bpm/model/update', data: data })
 }
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index 7a272c1c..26a597f5 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -145,7 +145,14 @@
           <CardTitle class="mb-10px" title="审批信息" />
         </el-col>
         <el-col :span="12">
-          <el-button class="m-20px" link type="primary">查看工作流</el-button>
+          <el-button
+            class="m-20px"
+            link
+            type="primary"
+            @click="BPMLModelRef?.handleBpmnDetail('contract-approve')"
+          >
+            查看工作流
+          </el-button>
         </el-col>
       </el-row>
     </el-form>
@@ -154,6 +161,7 @@
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
+  <BPMLModel ref="BPMLModelRef" />
 </template>
 <script lang="ts" setup>
 import * as CustomerApi from '@/api/crm/customer'
@@ -162,6 +170,7 @@ import * as UserApi from '@/api/system/user'
 import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import ProductList from './components/ProductList.vue'
+import BPMLModel from '@/views/crm/contract/components/BPMLModel.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -179,6 +188,7 @@ const formRules = reactive({
   no: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
+const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>()
 watch(
   () => formData.value.productItems,
   (val) => {
diff --git a/src/views/crm/contract/components/BPMLModel.vue b/src/views/crm/contract/components/BPMLModel.vue
new file mode 100644
index 00000000..5a8e7ecc
--- /dev/null
+++ b/src/views/crm/contract/components/BPMLModel.vue
@@ -0,0 +1,31 @@
+<template>
+  <!-- 弹窗：流程模型图的预览 -->
+  <Dialog v-model="bpmnDetailVisible" :append-to-body="true" title="流程图" width="800">
+    <MyProcessViewer
+      key="designer"
+      v-model="bpmnXML"
+      :prefix="bpmnControlForm.prefix"
+      :value="bpmnXML as any"
+      v-bind="bpmnControlForm"
+    />
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import * as ModelApi from '@/api/bpm/model'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
+
+defineOptions({ name: 'BPMLModel' })
+/** 流程图的详情按钮操作 */
+const bpmnDetailVisible = ref(false)
+const bpmnXML = ref(null)
+const bpmnControlForm = ref({
+  prefix: 'flowable'
+})
+const handleBpmnDetail = async (key: string) => {
+  const data = await ModelApi.getModelByKey(key)
+  bpmnXML.value = data.bpmnXml || ''
+  bpmnDetailVisible.value = true
+}
+defineExpose({ handleBpmnDetail })
+</script>
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index 5ba1e997..fde35ba2 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -105,7 +105,7 @@ onMounted(async () => {
     close()
     return
   }
-  contractId.value = id
+  contractId.value = id as unknown as number
   await getContractData()
 })
 </script>
diff --git a/src/views/crm/contract/oa/ContractDetail/index.vue b/src/views/crm/contract/oa/ContractDetail/index.vue
new file mode 100644
index 00000000..ac8a4f63
--- /dev/null
+++ b/src/views/crm/contract/oa/ContractDetail/index.vue
@@ -0,0 +1,220 @@
+<template>
+  <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="110px">
+    <el-row>
+      <el-col :span="24" class="mb-10px">
+        <CardTitle title="基本信息" />
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="合同名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入合同名称" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="合同编号" prop="no">
+          <el-input v-model="formData.no" placeholder="请输入合同编号" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="客户" prop="customerId">
+          <el-select v-model="formData.customerId">
+            <el-option
+              v-for="item in customerList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id!"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="客户签约人" prop="contactId">
+          <el-select v-model="formData.contactId" :disabled="!formData.customerId">
+            <el-option
+              v-for="item in getContactOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id!"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="公司签约人" prop="signUserId">
+          <el-select v-model="formData.signUserId">
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.nickname"
+              :value="item.id!"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="负责人" prop="ownerUserId">
+          <el-select v-model="formData.ownerUserId">
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.nickname"
+              :value="item.id!"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="商机名称" prop="businessId">
+          <el-select v-model="formData.businessId">
+            <el-option
+              v-for="item in businessList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id!"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="合同金额(元)" prop="price">
+          <el-input v-model="formData.price" placeholder="请输入合同金额" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="下单日期" prop="orderDate">
+          <el-date-picker
+            v-model="formData.orderDate"
+            placeholder="选择下单日期"
+            type="date"
+            value-format="x"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            v-model="formData.startTime"
+            placeholder="选择开始时间"
+            type="date"
+            value-format="x"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker
+            v-model="formData.endTime"
+            placeholder="选择结束时间"
+            type="date"
+            value-format="x"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" :rows="3" placeholder="请输入备注" type="textarea" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="产品列表" prop="productList">
+          <ProductList v-model="formData.productItems" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="整单折扣(%)" prop="discountPercent">
+          <el-input v-model="formData.discountPercent" placeholder="请输入整单折扣" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="产品总金额(元)" prop="productPrice">
+          <el-input v-model="formData.productPrice" placeholder="请输入产品总金额" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <CardTitle class="mb-10px" title="审批信息" />
+      </el-col>
+      <el-col :span="12">
+        <el-button
+          class="m-20px"
+          link
+          type="primary"
+          @click="BPMLModelRef?.handleBpmnDetail('contract-approve')"
+        >
+          查看工作流
+        </el-button>
+      </el-col>
+    </el-row>
+  </el-form>
+  <BPMLModel ref="BPMLModelRef" />
+</template>
+<script lang="ts" setup>
+import * as CustomerApi from '@/api/crm/customer'
+import * as ContractApi from '@/api/crm/contract'
+import * as UserApi from '@/api/system/user'
+import * as ContactApi from '@/api/crm/contact'
+import * as BusinessApi from '@/api/crm/business'
+import ProductList from '@/views/crm/contract/components/ProductList.vue'
+import BPMLModel from '@/views/crm/contract/components/BPMLModel.vue'
+
+defineOptions({ name: 'ContractDetailOA' })
+const props = defineProps<{ id?: number }>()
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref<ContractApi.ContractVO>({} as ContractApi.ContractVO)
+const formRef = ref() // 表单 Ref
+const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>()
+watch(
+  () => formData.value.productItems,
+  (val) => {
+    if (!val || val.length === 0) {
+      formData.value.productPrice = 0
+      return
+    }
+    // 使用reduce函数进行累加
+    formData.value.productPrice = val.reduce(
+      (accumulator, currentValue) =>
+        isNaN(accumulator + currentValue.totalPrice) ? 0 : accumulator + currentValue.totalPrice,
+      0
+    )
+  },
+  { deep: true }
+)
+/** 打开弹窗 */
+const getFormData = async () => {
+  await getAllApi()
+  formLoading.value = true
+  try {
+    formData.value = await ContractApi.getContract(props.id!)
+  } finally {
+    formLoading.value = false
+  }
+}
+const getAllApi = async () => {
+  await Promise.all([getCustomerList(), getUserList(), getContactListList(), getBusinessList()])
+}
+const customerList = ref<CustomerApi.CustomerVO[]>([])
+/** 获取客户 */
+const getCustomerList = async () => {
+  customerList.value = await CustomerApi.getSimpleCustomerList()
+}
+const contactList = ref<ContactApi.ContactVO[]>([])
+/** 动态获取客户联系人 */
+const getContactOptions = computed(() =>
+  contactList.value.filter((item) => item.customerId === formData.value.customerId)
+)
+const getContactListList = async () => {
+  contactList.value = await ContactApi.getSimpleContactList()
+}
+const userList = ref<UserApi.UserVO[]>([])
+/** 获取用户列表 */
+const getUserList = async () => {
+  userList.value = await UserApi.getSimpleUserList()
+}
+const businessList = ref<BusinessApi.BusinessVO[]>([])
+/** 获取商机 */
+const getBusinessList = async () => {
+  businessList.value = await BusinessApi.getSimpleBusinessList()
+}
+
+onMounted(() => {
+  getFormData()
+})
+</script>

From 770e551900cebf69deb5c34a08b85521861090ca Mon Sep 17 00:00:00 2001
From: anhaohao <1036606149@qq.com>
Date: Sun, 28 Jan 2024 20:04:42 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E4=B8=9A=E6=99=BA=E8=83=BD-=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E5=92=8C=E5=9B=9E=E6=AC=BE=E9=87=91=E9=A2=9D=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/bi/ranking.ts                     |  34 +++++
 src/utils/dict.ts                             |   5 +-
 .../components/RankingContractStatistics.vue  | 133 ++++++++++++++++++
 .../RankingReceivablesStatistics.vue          | 133 ++++++++++++++++++
 src/views/crm/bi/ranking/index.vue            |  91 ++++++++++++
 5 files changed, 395 insertions(+), 1 deletion(-)
 create mode 100644 src/api/crm/bi/ranking.ts
 create mode 100644 src/views/crm/bi/ranking/components/RankingContractStatistics.vue
 create mode 100644 src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
 create mode 100644 src/views/crm/bi/ranking/index.vue

diff --git a/src/api/crm/bi/ranking.ts b/src/api/crm/bi/ranking.ts
new file mode 100644
index 00000000..53c09e63
--- /dev/null
+++ b/src/api/crm/bi/ranking.ts
@@ -0,0 +1,34 @@
+import request from '@/config/axios'
+
+export interface BiContractRanKingRespVO {
+  price: number
+  nickname: string
+  deptName: string
+}
+export interface BiReceivablesRanKingRespVO {
+  price: number
+  nickname: string
+  deptName: string
+}
+export interface BiRankReqVO {
+  deptId: number
+  type: string
+}
+
+// 排行 API
+export const RankingStatisticsApi = {
+  // 获得合同排行榜
+  contractAmountRanking: (params: any) => {
+    return request.get({
+      url: '/bi/ranking/contract-ranking',
+      params
+    })
+  },
+  // 获得回款排行榜
+  receivablesAmountRanking: (params: any) => {
+    return request.get({
+      url: '/bi/ranking/receivables-ranking',
+      params
+    })
+  }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 2c8e47ff..4c490f59 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -203,5 +203,8 @@ export enum DICT_TYPE {
   CRM_PRODUCT_STATUS = 'crm_product_status',
   CRM_PERMISSION_LEVEL = 'crm_permission_level', // CRM 数据权限的级别
   CRM_PRODUCT_UNIT = 'crm_product_unit', // 产品单位
-  CRM_FOLLOW_UP_TYPE = 'crm_follow_up_type' // 跟进方式
+  CRM_FOLLOW_UP_TYPE = 'crm_follow_up_type', // 跟进方式
+
+  // ========== BI - 商业智能模块 ==========
+  BI_ANALYZE_TYPE = 'bi_analyze_type' // 分析类型
 }
diff --git a/src/views/crm/bi/ranking/components/RankingContractStatistics.vue b/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
new file mode 100644
index 00000000..b560131c
--- /dev/null
+++ b/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-card shadow="never">
+    <!-- 柱状图 -->
+    <el-skeleton :loading="trendLoading" animated>
+      <Echart :height="500" :options="barChartOptions" />
+    </el-skeleton>
+  </el-card>
+  <el-card shadow="never" class="mt-16px">
+    <!-- 排行列表 -->
+    <el-table v-loading="loading" :data="list">
+      <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="price" min-width="200" />
+    </el-table>
+  </el-card>
+</template>
+<script setup lang="ts">
+import { RankingStatisticsApi, BiContractRanKingRespVO, BiRankReqVO } from '@/api/crm/bi/ranking'
+import { EChartsOption } from 'echarts'
+
+/** 合同金额排行 */
+defineOptions({ name: 'RankingContractStatistics' })
+
+const trendLoading = ref(true) // 状态加载中
+const loading = ref(false) // 列表的加载中
+const list = ref<BiContractRanKingRespVO[]>([]) // 列表的数据
+const params = defineProps<{ queryParams: BiRankReqVO }>() // 搜索参数
+
+/** 柱状图配置 横向 */
+const barChartOptions = reactive<EChartsOption>({
+  dataset: {
+    dimensions: ['name', 'value'],
+    source: []
+  },
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    top: 80,
+    containLabel: true
+  },
+  legend: {
+    top: 50
+  },
+  series: [
+    {
+      name: '合同金额排行',
+      type: 'bar',
+      smooth: true,
+      itemStyle: { color: '#B37FEB' }
+    }
+  ],
+  toolbox: {
+    feature: {
+      // 数据区域缩放
+      dataZoom: {
+        yAxisIndex: false // Y轴不缩放
+      },
+      brush: {
+        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
+      },
+      saveAsImage: { show: true, name: '合同金额排行' } // 保存为图片
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    }
+  },
+  xAxis: {
+    type: 'value',
+    name: '合同金额（元）',
+    nameGap: 30,
+    nameTextStyle: {
+      color: '#666',
+      fontSize: 14
+    }
+  },
+  yAxis: {
+    type: 'category',
+    name: '签订人',
+    nameGap: 30,
+    nameTextStyle: {
+      color: '#666',
+      fontSize: 14
+    },
+    axisLabel: {
+      formatter: (value: string) => {
+        return value
+      }
+    }
+  }
+}) as EChartsOption
+
+/** 获取合同金额排行 */
+const getRankingContractStatistics = async () => {
+  trendLoading.value = true
+  loading.value = true
+  const rankingList = await RankingStatisticsApi.contractAmountRanking(params.queryParams)
+  let source = rankingList.map((item: BiContractRanKingRespVO) => {
+    return {
+      name: item.nickname,
+      value: item.price
+    }
+  })
+  // 反转数据源
+  source = source.reverse()
+  // 更新 Echarts 数据
+  if (barChartOptions.dataset && barChartOptions.dataset['source']) {
+    barChartOptions.dataset['source'] = source
+  }
+  // 更新列表数据
+  list.value = rankingList
+  trendLoading.value = false
+  loading.value = false
+}
+
+/** 重新加载数据 */
+const reloadData = async () => {
+  await getRankingContractStatistics()
+}
+// 暴露 reloadData 函数
+defineExpose({
+  reloadData
+})
+
+onMounted(() => {
+  getRankingContractStatistics()
+})
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue b/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
new file mode 100644
index 00000000..80186535
--- /dev/null
+++ b/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-card shadow="never">
+    <!-- 柱状图 -->
+    <el-skeleton :loading="trendLoading" animated>
+      <Echart :height="500" :options="barChartOptions" />
+    </el-skeleton>
+  </el-card>
+  <el-card shadow="never" class="mt-16px">
+    <!-- 排行列表 -->
+    <el-table v-loading="loading" :data="list">
+      <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="price" min-width="200" />
+    </el-table>
+  </el-card>
+</template>
+<script setup lang="ts">
+import { RankingStatisticsApi, BiReceivablesRanKingRespVO } from '@/api/crm/bi/ranking'
+import { EChartsOption } from 'echarts'
+
+/** 回款金额排行 */
+defineOptions({ name: 'RankingReceivablesStatistics' })
+
+const trendLoading = ref(true) // 状态加载中
+const loading = ref(false) // 列表的加载中
+const list = ref<BiReceivablesRanKingRespVO[]>([]) // 列表的数据
+const params = defineProps<{ queryParams: any }>() // 搜索参数
+
+/** 柱状图配置 横向 */
+const barChartOptions = reactive<EChartsOption>({
+  dataset: {
+    dimensions: ['name', 'value'],
+    source: []
+  },
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    top: 80,
+    containLabel: true
+  },
+  legend: {
+    top: 50
+  },
+  series: [
+    {
+      name: '回款金额排行',
+      type: 'bar',
+      smooth: true,
+      itemStyle: { color: '#B37FEB' }
+    }
+  ],
+  toolbox: {
+    feature: {
+      // 数据区域缩放
+      dataZoom: {
+        yAxisIndex: false // Y轴不缩放
+      },
+      brush: {
+        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
+      },
+      saveAsImage: { show: true, name: '回款金额排行' } // 保存为图片
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    }
+  },
+  xAxis: {
+    type: 'value',
+    name: '回款金额（元）',
+    nameGap: 30,
+    nameTextStyle: {
+      color: '#666',
+      fontSize: 14
+    }
+  },
+  yAxis: {
+    type: 'category',
+    name: '签订人',
+    nameGap: 30,
+    nameTextStyle: {
+      color: '#666',
+      fontSize: 14
+    },
+    axisLabel: {
+      formatter: (value: string) => {
+        return value
+      }
+    }
+  }
+}) as EChartsOption
+
+/** 获取回款金额排行 */
+const getRankingReceivablesStatistics = async () => {
+  trendLoading.value = true
+  loading.value = true
+  const rankingList = await RankingStatisticsApi.receivablesAmountRanking(params.queryParams)
+  let source = rankingList.map((item: BiReceivablesRanKingRespVO) => {
+    return {
+      name: item.nickname,
+      value: item.price
+    }
+  })
+  // 反转数据源
+  source = source.reverse()
+  // 更新 Echarts 数据
+  if (barChartOptions.dataset && barChartOptions.dataset['source']) {
+    barChartOptions.dataset['source'] = source
+  }
+  // 更新列表数据
+  list.value = rankingList
+  trendLoading.value = false
+  loading.value = false
+}
+
+/** 重新加载数据 */
+const reloadData = async () => {
+  await getRankingReceivablesStatistics()
+}
+// 暴露 reloadData 函数
+defineExpose({
+  reloadData
+})
+
+onMounted(() => {
+  getRankingReceivablesStatistics()
+})
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/crm/bi/ranking/index.vue b/src/views/crm/bi/ranking/index.vue
new file mode 100644
index 00000000..fac2b8ba
--- /dev/null
+++ b/src/views/crm/bi/ranking/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.BI_ANALYZE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId">
+        <el-tree-select
+          v-model="queryParams.deptId"
+          :data="deptList"
+          :props="defaultProps"
+          check-strictly
+          node-key="id"
+          placeholder="请选择归属部门"
+        />
+      </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-form-item>
+    </el-form>
+  </ContentWrap>
+  <el-col>
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="合同金额排行" name="contractAmountRanking">
+        <!-- 合同金额排行 -->
+        <RankingContractStatistics :queryParams="queryParams" ref="rankingContractStatisticsRef" />
+      </el-tab-pane>
+      <el-tab-pane label="回款金额排行" name="receivablesRanKing" lazy>
+        <!-- 回款金额排行 -->
+        <RankingReceivablesStatistics
+          :queryParams="queryParams"
+          ref="rankingReceivablesStatisticsRef"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </el-col>
+</template>
+<script lang="ts" setup>
+import RankingContractStatistics from './components/RankingContractStatistics.vue'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as DeptApi from '@/api/system/dept'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+
+/** 排行榜 */
+defineOptions({ name: 'RankingStatistics' })
+
+const queryParams = reactive({
+  type: 9, // 将 type 的初始值设置为 9 本年
+  deptId: null
+})
+const queryFormRef = ref() // 搜索的表单
+const deptList = ref<Tree[]>([]) // 树形结构
+const activeTab = ref('contractAmountRanking')
+const rankingContractStatisticsRef = ref() // RankingContractStatistics组件的引用
+const rankingReceivablesStatisticsRef = ref() // RankingReceivablesStatistics组件的引用
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  if (activeTab.value === 'contractAmountRanking') {
+    rankingContractStatisticsRef.value.reloadData()
+  } else if (activeTab.value === 'receivablesRanKing') {
+    rankingReceivablesStatisticsRef.value.reloadData()
+  }
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+// 加载部门树
+onMounted(async () => {
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+})
+</script>
+<style lang="scss" scoped></style>

From 34a796de89b9d5e1fb660eb5bd4154a33ebf76f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E6=B5=A9=E6=B5=A9?= <1036606149@qq.com>
Date: Wed, 31 Jan 2024 23:37:21 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E4=B8=9A=E6=99=BA=E8=83=BD-=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E5=92=8C=E5=9B=9E=E6=AC=BE=E9=87=91=E9=A2=9D=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6=E5=92=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/bi/ranking.ts                     |  8 +++--
 .../components/RankingContractStatistics.vue  | 14 ++++++--
 .../RankingReceivablesStatistics.vue          | 16 +++++++--
 src/views/crm/bi/ranking/index.vue            | 34 ++++++++++++-------
 4 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/api/crm/bi/ranking.ts b/src/api/crm/bi/ranking.ts
index 53c09e63..f68c2dd0 100644
--- a/src/api/crm/bi/ranking.ts
+++ b/src/api/crm/bi/ranking.ts
@@ -12,7 +12,9 @@ export interface BiReceivablesRanKingRespVO {
 }
 export interface BiRankReqVO {
   deptId: number
-  type: string
+  orderDate: Date[]
+  startTime: Date
+  endTime: Date
 }
 
 // 排行 API
@@ -20,14 +22,14 @@ export const RankingStatisticsApi = {
   // 获得合同排行榜
   contractAmountRanking: (params: any) => {
     return request.get({
-      url: '/bi/ranking/contract-ranking',
+      url: '/crm/bi-ranking/contract-ranking',
       params
     })
   },
   // 获得回款排行榜
   receivablesAmountRanking: (params: any) => {
     return request.get({
-      url: '/bi/ranking/receivables-ranking',
+      url: '/crm/bi-ranking/receivables-ranking',
       params
     })
   }
diff --git a/src/views/crm/bi/ranking/components/RankingContractStatistics.vue b/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
index b560131c..cf0c22f9 100644
--- a/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
+++ b/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
@@ -18,14 +18,21 @@
 <script setup lang="ts">
 import { RankingStatisticsApi, BiContractRanKingRespVO, BiRankReqVO } from '@/api/crm/bi/ranking'
 import { EChartsOption } from 'echarts'
+import { beginOfDay, endOfDay, formatDate } from '@/utils/formatTime'
 
 /** 合同金额排行 */
 defineOptions({ name: 'RankingContractStatistics' })
 
+const params = reactive({
+  deptId: undefined,
+  startTime: undefined,
+  endTime: undefined
+})
+
 const trendLoading = ref(true) // 状态加载中
 const loading = ref(false) // 列表的加载中
 const list = ref<BiContractRanKingRespVO[]>([]) // 列表的数据
-const params = defineProps<{ queryParams: BiRankReqVO }>() // 搜索参数
+const queryParams = defineProps<{ queryParams: BiRankReqVO }>() // 搜索参数
 
 /** 柱状图配置 横向 */
 const barChartOptions = reactive<EChartsOption>({
@@ -98,7 +105,10 @@ const barChartOptions = reactive<EChartsOption>({
 const getRankingContractStatistics = async () => {
   trendLoading.value = true
   loading.value = true
-  const rankingList = await RankingStatisticsApi.contractAmountRanking(params.queryParams)
+  params.deptId = queryParams.queryParams.deptId
+  params.startTime = formatDate(beginOfDay(new Date(queryParams.queryParams.orderDate[0])))
+  params.endTime = formatDate(endOfDay(new Date(queryParams.queryParams.orderDate[1])))
+  const rankingList = await RankingStatisticsApi.contractAmountRanking(params)
   let source = rankingList.map((item: BiContractRanKingRespVO) => {
     return {
       name: item.nickname,
diff --git a/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue b/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
index 80186535..c56d94c7 100644
--- a/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
+++ b/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
@@ -16,16 +16,23 @@
   </el-card>
 </template>
 <script setup lang="ts">
-import { RankingStatisticsApi, BiReceivablesRanKingRespVO } from '@/api/crm/bi/ranking'
+import { RankingStatisticsApi, BiReceivablesRanKingRespVO, BiRankReqVO } from '@/api/crm/bi/ranking'
 import { EChartsOption } from 'echarts'
+import { beginOfDay, endOfDay, formatDate } from '@/utils/formatTime'
 
 /** 回款金额排行 */
 defineOptions({ name: 'RankingReceivablesStatistics' })
 
+const params = reactive({
+  deptId: undefined,
+  startTime: undefined,
+  endTime: undefined
+})
+
 const trendLoading = ref(true) // 状态加载中
 const loading = ref(false) // 列表的加载中
 const list = ref<BiReceivablesRanKingRespVO[]>([]) // 列表的数据
-const params = defineProps<{ queryParams: any }>() // 搜索参数
+const queryParams = defineProps<{ queryParams: BiRankReqVO }>() // 搜索参数
 
 /** 柱状图配置 横向 */
 const barChartOptions = reactive<EChartsOption>({
@@ -98,7 +105,10 @@ const barChartOptions = reactive<EChartsOption>({
 const getRankingReceivablesStatistics = async () => {
   trendLoading.value = true
   loading.value = true
-  const rankingList = await RankingStatisticsApi.receivablesAmountRanking(params.queryParams)
+  params.deptId = queryParams.queryParams.deptId
+  params.startTime = formatDate(beginOfDay(new Date(queryParams.queryParams.orderDate[0])))
+  params.endTime = formatDate(endOfDay(new Date(queryParams.queryParams.orderDate[1])))
+  const rankingList = await RankingStatisticsApi.receivablesAmountRanking(params)
   let source = rankingList.map((item: BiReceivablesRanKingRespVO) => {
     return {
       name: item.nickname,
diff --git a/src/views/crm/bi/ranking/index.vue b/src/views/crm/bi/ranking/index.vue
index fac2b8ba..27437a13 100644
--- a/src/views/crm/bi/ranking/index.vue
+++ b/src/views/crm/bi/ranking/index.vue
@@ -8,15 +8,17 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.BI_ANALYZE_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="时间" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          :shortcuts="defaultShortcuts"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+        />
       </el-form-item>
       <el-form-item label="归属部门" prop="deptId">
         <el-tree-select
@@ -54,15 +56,23 @@
 import RankingContractStatistics from './components/RankingContractStatistics.vue'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
+import RankingReceivablesStatistics from '@/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue'
 
 /** 排行榜 */
 defineOptions({ name: 'RankingStatistics' })
 
 const queryParams = reactive({
-  type: 9, // 将 type 的初始值设置为 9 本年
-  deptId: null
+  deptId: undefined,
+  //默认显示最近一周的数据
+  orderDate: [
+    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7))),
+    formatDate(endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24)))
+  ],
+  startTime: undefined,
+  endTime: undefined
 })
+
 const queryFormRef = ref() // 搜索的表单
 const deptList = ref<Tree[]>([]) // 树形结构
 const activeTab = ref('contractAmountRanking')

From 956f19d9d08930f2617ca76a96e841e86b7a9e91 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 1 Feb 2024 13:38:14 +0800
Subject: [PATCH 13/19] =?UTF-8?q?CRM=EF=BC=9A=E5=90=88=E5=90=8C=E7=9A=84?=
 =?UTF-8?q?=20code=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/model/index.ts                    |  2 +
 src/api/crm/bi/ranking.ts                     |  2 +
 src/api/crm/business/index.ts                 |  1 +
 src/api/crm/contract/index.ts                 |  1 +
 src/components/Table/src/TableSelectForm.vue  |  1 +
 src/views/crm/backlog/index.vue               |  2 +-
 src/views/crm/bi/ranking/index.vue            |  5 ++-
 src/views/crm/contact/detail/index.vue        | 12 +++---
 src/views/crm/contract/ContractForm.vue       | 42 ++++++++++++-------
 .../crm/contract/components/ProductList.vue   | 16 ++++++-
 .../contract/detail/ContractDetailsHeader.vue |  1 +
 .../contract/detail/ContractDetailsInfo.vue   |  1 +
 src/views/crm/contract/detail/index.vue       | 11 ++++-
 .../crm/contract/oa/ContractDetail/index.vue  |  1 +
 src/views/crm/customer/CustomerImportForm.vue |  3 +-
 src/views/crm/customer/index.vue              |  4 ++
 16 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
index fea5ecf0..d0547207 100644
--- a/src/api/bpm/model/index.ts
+++ b/src/api/bpm/model/index.ts
@@ -32,9 +32,11 @@ export const getModelPage = async (params) => {
 export const getModel = async (id: number) => {
   return await request.get({ url: '/bpm/model/get?id=' + id })
 }
+
 export const getModelByKey = async (key: string) => {
   return await request.get({ url: '/bpm/model/get-by-key?key=' + key })
 }
+
 export const updateModel = async (data: ModelVO) => {
   return await request.put({ url: '/bpm/model/update', data: data })
 }
diff --git a/src/api/crm/bi/ranking.ts b/src/api/crm/bi/ranking.ts
index 53c09e63..aa0b7fdb 100644
--- a/src/api/crm/bi/ranking.ts
+++ b/src/api/crm/bi/ranking.ts
@@ -5,11 +5,13 @@ export interface BiContractRanKingRespVO {
   nickname: string
   deptName: string
 }
+
 export interface BiReceivablesRanKingRespVO {
   price: number
   nickname: string
   deptName: string
 }
+
 export interface BiRankReqVO {
   deptId: number
   type: string
diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
index 314eb389..79568dec 100644
--- a/src/api/crm/business/index.ts
+++ b/src/api/crm/business/index.ts
@@ -73,6 +73,7 @@ export const getBusinessListByIds = async (val: number[]) => {
 }
 
 // 商机转移
+// TODO @puhui999：transferBusiness
 export const transfer = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/business/transfer', data })
 }
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index 731750c1..58f63631 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -71,6 +71,7 @@ export const handleApprove = async (id: number) => {
 }
 
 // 合同转移
+// TODO @puhui999：transfer 相关方法，这块要补充下；
 export const transfer = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/contract/transfer', data })
 }
diff --git a/src/components/Table/src/TableSelectForm.vue b/src/components/Table/src/TableSelectForm.vue
index 55b2855e..fde540cd 100644
--- a/src/components/Table/src/TableSelectForm.vue
+++ b/src/components/Table/src/TableSelectForm.vue
@@ -1,3 +1,4 @@
+<!-- TODO @puhui999：这个最好加个注释哈 -->
 <template>
   <Dialog v-model="dialogVisible" :appendToBody="true" :scroll="true" :title="title" width="60%">
     <el-table
diff --git a/src/views/crm/backlog/index.vue b/src/views/crm/backlog/index.vue
index bc20c425..5fb53960 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;
diff --git a/src/views/crm/bi/ranking/index.vue b/src/views/crm/bi/ranking/index.vue
index fac2b8ba..c1d752e9 100644
--- a/src/views/crm/bi/ranking/index.vue
+++ b/src/views/crm/bi/ranking/index.vue
@@ -36,12 +36,12 @@
   </ContentWrap>
   <el-col>
     <el-tabs v-model="activeTab">
+      <!-- 合同金额排行 -->
       <el-tab-pane label="合同金额排行" name="contractAmountRanking">
-        <!-- 合同金额排行 -->
         <RankingContractStatistics :queryParams="queryParams" ref="rankingContractStatisticsRef" />
       </el-tab-pane>
+      <!-- 回款金额排行 -->
       <el-tab-pane label="回款金额排行" name="receivablesRanKing" lazy>
-        <!-- 回款金额排行 -->
         <RankingReceivablesStatistics
           :queryParams="queryParams"
           ref="rankingReceivablesStatisticsRef"
@@ -83,6 +83,7 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
+
 // 加载部门树
 onMounted(async () => {
   deptList.value = handleTree(await DeptApi.getSimpleDeptList())
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index 65678a3d..e30f02fe 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -57,6 +57,7 @@ const message = useMessage()
 const id = Number(route.params.id) // 联系人编号
 const loading = ref(true) // 加载中
 const contact = ref<ContactApi.ContactVO>({} as ContactApi.ContactVO) // 联系人详情
+const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
 
 /** 获取详情 */
 const getContactData = async (id: number) => {
@@ -68,22 +69,20 @@ const getContactData = async (id: number) => {
     loading.value = false
   }
 }
+
 /** 编辑 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
+
 /** 联系人转移 */
 const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 联系人转移表单 ref
 const transfer = () => {
   crmTransferFormRef.value?.open('联系人转移', contact.value.id, ContactApi.transfer)
 }
 
-const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
-
-/**
- * 获取操作日志
- */
+/** 获取操作日志 */
 const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
 const getOperateLog = async (contactId: number) => {
   if (!contactId) {
@@ -95,9 +94,12 @@ const getOperateLog = async (contactId: number) => {
   })
   logList.value = data.list
 }
+
+/** 关闭窗口 */
 const close = () => {
   delView(unref(currentRoute))
 }
+
 /** 初始化 */
 const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index 26a597f5..081e4098 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -144,6 +144,7 @@
         <el-col :span="24">
           <CardTitle class="mb-10px" title="审批信息" />
         </el-col>
+        <!-- TODO 芋艿：需要后面在 review 下，目前看不到信息 -->
         <el-col :span="12">
           <el-button
             class="m-20px"
@@ -188,7 +189,9 @@ const formRules = reactive({
   no: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>()
+const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>() // TODO @puhui999：这个变量不太对；另外，可以不做 bpm model 窗口，而是可以点击跳转到工作流详情里；
+
+// TODO @puhui999：加个注释哈
 watch(
   () => formData.value.productItems,
   (val) => {
@@ -196,7 +199,7 @@ watch(
       formData.value.productPrice = 0
       return
     }
-    // 使用reduce函数进行累加
+    // 使用 reduce 函数进行累加
     formData.value.productPrice = val.reduce(
       (accumulator, currentValue) =>
         isNaN(accumulator + currentValue.totalPrice) ? 0 : accumulator + currentValue.totalPrice,
@@ -205,13 +208,13 @@ watch(
   },
   { deep: true }
 )
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  await getAllApi()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -221,10 +224,9 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  await getAllApi()
 }
-const getAllApi = async () => {
-  await Promise.all([getCustomerList(), getUserList(), getContactListList(), getBusinessList()])
-}
+
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
@@ -252,32 +254,42 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
-const customerList = ref<CustomerApi.CustomerVO[]>([])
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {} as ContractApi.ContractVO
+  formRef.value?.resetFields()
+}
+
+/** 获取其它相关数据 */
+const getAllApi = async () => {
+  await Promise.all([getCustomerList(), getUserList(), getContactListList(), getBusinessList()])
+}
+
 /** 获取客户 */
+const customerList = ref<CustomerApi.CustomerVO[]>([])
 const getCustomerList = async () => {
   customerList.value = await CustomerApi.getSimpleCustomerList()
 }
-const contactList = ref<ContactApi.ContactVO[]>([])
+
 /** 动态获取客户联系人 */
+const contactList = ref<ContactApi.ContactVO[]>([])
 const getContactOptions = computed(() =>
   contactList.value.filter((item) => item.customerId === formData.value.customerId)
 )
 const getContactListList = async () => {
   contactList.value = await ContactApi.getSimpleContactList()
 }
-const userList = ref<UserApi.UserVO[]>([])
+
 /** 获取用户列表 */
+const userList = ref<UserApi.UserVO[]>([])
 const getUserList = async () => {
   userList.value = await UserApi.getSimpleUserList()
 }
-const businessList = ref<BusinessApi.BusinessVO[]>([])
+
 /** 获取商机 */
+const businessList = ref<BusinessApi.BusinessVO[]>([])
 const getBusinessList = async () => {
   businessList.value = await BusinessApi.getSimpleBusinessList()
 }
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {} as ContractApi.ContractVO
-  formRef.value?.resetFields()
-}
 </script>
diff --git a/src/views/crm/contract/components/ProductList.vue b/src/views/crm/contract/components/ProductList.vue
index 6c4ca350..a84d355e 100644
--- a/src/views/crm/contract/components/ProductList.vue
+++ b/src/views/crm/contract/components/ProductList.vue
@@ -1,3 +1,4 @@
+<!-- 合同 Form 表单下的 Product 列表 -->
 <template>
   <el-row justify="end">
     <el-button plain type="primary" @click="openForm">添加产品</el-button>
@@ -71,23 +72,32 @@ withDefaults(defineProps<{ modelValue: any[] }>(), { modelValue: () => [] })
 const emits = defineEmits<{
   (e: 'update:modelValue', v: any[]): void
 }>()
-const list = ref<ProductApi.ProductExpandVO[]>([])
+
+const list = ref<ProductApi.ProductExpandVO[]>([]) //  TODO @puhui999
+const multipleSelection = ref<ProductApi.ProductExpandVO[]>([]) // 多选
+
+/** 处理删除 */
 const handleDelete = (id: number) => {
   const index = list.value.findIndex((item) => item.id === id)
   if (index !== -1) {
     list.value.splice(index, 1)
   }
 }
+
+/** 打开 Product 弹窗  */
 const tableSelectFormRef = ref<InstanceType<typeof TableSelectForm>>()
-const multipleSelection = ref<ProductApi.ProductExpandVO[]>([])
 const openForm = () => {
   tableSelectFormRef.value?.open(ProductApi.getProductPage)
 }
+
+/** 计算 totalPrice */
 const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
   const totalPrice = (row.price * row.count * row.discountPercent) / 100
   row.totalPrice = isNaN(totalPrice) ? 0 : totalPrice
   return isNaN(totalPrice) ? 0 : totalPrice
 })
+
+// TODO @puhui999：注释下
 watch(
   list,
   (val) => {
@@ -98,6 +108,8 @@ watch(
   },
   { deep: true }
 )
+
+// TODO @puhui999：注释下
 watch(
   multipleSelection,
   (val) => {
diff --git a/src/views/crm/contract/detail/ContractDetailsHeader.vue b/src/views/crm/contract/detail/ContractDetailsHeader.vue
index b3552735..a0309aeb 100644
--- a/src/views/crm/contract/detail/ContractDetailsHeader.vue
+++ b/src/views/crm/contract/detail/ContractDetailsHeader.vue
@@ -1,3 +1,4 @@
+<!-- TODO @puhui999：这个组件的注释加下，方便大家打开就知道哈 -->
 <template>
   <div>
     <div class="flex items-start justify-between">
diff --git a/src/views/crm/contract/detail/ContractDetailsInfo.vue b/src/views/crm/contract/detail/ContractDetailsInfo.vue
index f18f7c08..731f8e2d 100644
--- a/src/views/crm/contract/detail/ContractDetailsInfo.vue
+++ b/src/views/crm/contract/detail/ContractDetailsInfo.vue
@@ -1,3 +1,4 @@
+<!-- TODO @puhui999：这个组件的注释加下，方便大家打开就知道哈 -->
 <template>
   <ContentWrap>
     <el-collapse v-model="activeNames">
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index fde35ba2..b0f9b355 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -1,3 +1,4 @@
+<!-- TODO @puhui999：这个组件的注释加下，方便大家打开就知道哈 -->
 <template>
   <ContractDetailsHeader v-loading="loading" :contract="contract">
     <el-button v-if="permissionListRef?.validateWrite" @click="openForm('update', contract.id)">
@@ -57,11 +58,14 @@ const message = useMessage()
 const contractId = ref(0) // 编号
 const loading = ref(true) // 加载中
 const contract = ref<ContractApi.ContractVO>({} as ContractApi.ContractVO) // 详情
+const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
+
 /** 编辑 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
+
 /** 获取详情 */
 const getContractData = async () => {
   loading.value = true
@@ -86,18 +90,21 @@ const getOperateLog = async (contractId: number) => {
   logList.value = data.list
 }
 
+/** 转移 */
+// TODO @puhui999：transferFormRef 简洁一点哈
 const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 合同转移表单 ref
 const transfer = () => {
   crmTransferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transfer)
 }
 
-const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
-/** 初始化 */
+/** 关闭 */
 const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由
 const close = () => {
   delView(unref(currentRoute))
 }
+
+/** 初始化 */
 onMounted(async () => {
   const id = route.params.id
   if (!id) {
diff --git a/src/views/crm/contract/oa/ContractDetail/index.vue b/src/views/crm/contract/oa/ContractDetail/index.vue
index ac8a4f63..eda87394 100644
--- a/src/views/crm/contract/oa/ContractDetail/index.vue
+++ b/src/views/crm/contract/oa/ContractDetail/index.vue
@@ -1,3 +1,4 @@
+<!-- TODO @puhui999：这个好像和 detail 重复了？？？ -->
 <template>
   <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="110px">
     <el-row>
diff --git a/src/views/crm/customer/CustomerImportForm.vue b/src/views/crm/customer/CustomerImportForm.vue
index 7a74acf9..4290b361 100644
--- a/src/views/crm/customer/CustomerImportForm.vue
+++ b/src/views/crm/customer/CustomerImportForm.vue
@@ -1,3 +1,4 @@
+<!-- 客户导入窗口 -->
 <template>
   <Dialog v-model="dialogVisible" title="客户导入" width="400">
     <el-upload
@@ -20,7 +21,7 @@
         <div class="el-upload__tip text-center">
           <div class="el-upload__tip">
             <el-checkbox v-model="updateSupport" />
-            是否更新已经存在的客户数据
+            是否更新已经存在的客户数据（“客户名称”重复）
           </div>
           <span>仅允许导入 xls、xlsx 格式文件。</span>
           <el-link
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 2c441d99..7885cd49 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -339,10 +339,14 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+
+/** 导入按钮操作 */
+// TODO @puhui999：importFormRef 简化下
 const customerImportFormRef = ref<InstanceType<typeof CustomerImportForm>>()
 const handleImport = () => {
   customerImportFormRef.value?.open()
 }
+
 /** 导出按钮操作 */
 const handleExport = async () => {
   try {

From 4549f8ed3cf29006f3dfb0e7b6870a9982a3f215 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 3 Feb 2024 01:14:24 +0800
Subject: [PATCH 14/19] =?UTF-8?q?CRM=EF=BC=9A=E4=BC=98=E5=8C=96=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E9=87=91=E9=A2=9D=E6=8E=92=E8=A1=8C=E3=80=81=E5=9B=9E?=
 =?UTF-8?q?=E6=AC=BE=E9=87=91=E9=A2=9D=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/bi/rank.ts                        |  25 +++
 src/api/crm/bi/ranking.ts                     |  38 -----
 src/store/modules/user.ts                     |   8 +-
 src/views/crm/bi/rank/ContractPriceRank.vue   | 107 +++++++++++++
 src/views/crm/bi/rank/ReceivablePriceRank.vue | 108 +++++++++++++
 src/views/crm/bi/{ranking => rank}/index.vue  |  50 +++---
 .../components/RankingContractStatistics.vue  | 143 ------------------
 .../RankingReceivablesStatistics.vue          | 143 ------------------
 8 files changed, 270 insertions(+), 352 deletions(-)
 create mode 100644 src/api/crm/bi/rank.ts
 delete mode 100644 src/api/crm/bi/ranking.ts
 create mode 100644 src/views/crm/bi/rank/ContractPriceRank.vue
 create mode 100644 src/views/crm/bi/rank/ReceivablePriceRank.vue
 rename src/views/crm/bi/{ranking => rank}/index.vue (62%)
 delete mode 100644 src/views/crm/bi/ranking/components/RankingContractStatistics.vue
 delete mode 100644 src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue

diff --git a/src/api/crm/bi/rank.ts b/src/api/crm/bi/rank.ts
new file mode 100644
index 00000000..8c7f36e0
--- /dev/null
+++ b/src/api/crm/bi/rank.ts
@@ -0,0 +1,25 @@
+import request from '@/config/axios'
+
+export interface BiRankRespVO {
+  count: number
+  nickname: string
+  deptName: string
+}
+
+// 排行 API
+export const RankApi = {
+  // 获得合同排行榜
+  getContractPriceRank: (params: any) => {
+    return request.get({
+      url: '/crm/bi-rank/get-contract-price-rank',
+      params
+    })
+  },
+  // 获得回款排行榜
+  getReceivablePriceRank: (params: any) => {
+    return request.get({
+      url: '/crm/bi-rank/get-receivable-price-rank',
+      params
+    })
+  }
+}
diff --git a/src/api/crm/bi/ranking.ts b/src/api/crm/bi/ranking.ts
deleted file mode 100644
index d45d6995..00000000
--- a/src/api/crm/bi/ranking.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import request from '@/config/axios'
-
-export interface BiContractRanKingRespVO {
-  price: number
-  nickname: string
-  deptName: string
-}
-
-export interface BiReceivablesRanKingRespVO {
-  price: number
-  nickname: string
-  deptName: string
-}
-
-export interface BiRankReqVO {
-  deptId: number
-  orderDate: Date[]
-  startTime: Date
-  endTime: Date
-}
-
-// 排行 API
-export const RankingStatisticsApi = {
-  // 获得合同排行榜
-  contractAmountRanking: (params: any) => {
-    return request.get({
-      url: '/crm/bi-ranking/contract-ranking',
-      params
-    })
-  },
-  // 获得回款排行榜
-  receivablesAmountRanking: (params: any) => {
-    return request.get({
-      url: '/crm/bi-ranking/receivables-ranking',
-      params
-    })
-  }
-}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 1f801fef..226860ed 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -10,7 +10,9 @@ interface UserVO {
   id: number
   avatar: string
   nickname: string
+  deptId: number
 }
+
 interface UserInfoVO {
   permissions: string[]
   roles: string[]
@@ -26,7 +28,8 @@ export const useUserStore = defineStore('admin-user', {
     user: {
       id: 0,
       avatar: '',
-      nickname: ''
+      nickname: '',
+      deptId: 0
     }
   }),
   getters: {
@@ -73,7 +76,8 @@ export const useUserStore = defineStore('admin-user', {
       this.user = {
         id: 0,
         avatar: '',
-        nickname: ''
+        nickname: '',
+        deptId: 0
       }
     }
   }
diff --git a/src/views/crm/bi/rank/ContractPriceRank.vue b/src/views/crm/bi/rank/ContractPriceRank.vue
new file mode 100644
index 00000000..1b12999f
--- /dev/null
+++ b/src/views/crm/bi/rank/ContractPriceRank.vue
@@ -0,0 +1,107 @@
+<!-- 合同金额排行 -->
+<template>
+  <!-- 柱状图 -->
+  <el-card shadow="never">
+    <el-skeleton :loading="loading" animated>
+      <Echart :height="500" :options="echartsOption" />
+    </el-skeleton>
+  </el-card>
+
+  <!-- 排行列表 -->
+  <el-card shadow="never" class="mt-16px">
+    <el-table v-loading="loading" :data="list">
+      <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"
+        :formatter="fenToYuanFormat"
+      />
+    </el-table>
+  </el-card>
+</template>
+<script setup lang="ts">
+import { RankApi, BiRankRespVO } from '@/api/crm/bi/rank'
+import { EChartsOption } from 'echarts'
+import { fenToYuanFormat } from '@/utils/formatter'
+import { fenToYuan } from '@/utils'
+import { clone } from 'unocss'
+
+defineOptions({ name: 'ContractPriceRank' })
+const props = defineProps<{ queryParams: any }>() // 搜索参数
+
+const loading = ref(false) // 加载中
+const list = ref<BiRankRespVO[]>([]) // 列表的数据
+
+/** 柱状图配置：横向 */
+const echartsOption = reactive<EChartsOption>({
+  dataset: {
+    dimensions: ['nickname', 'count'],
+    source: []
+  },
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    containLabel: true
+  },
+  legend: {
+    top: 50
+  },
+  series: [
+    {
+      name: '合同金额排行',
+      type: 'bar'
+    }
+  ],
+  toolbox: {
+    feature: {
+      dataZoom: {
+        yAxisIndex: false // 数据区域缩放：Y 轴不缩放
+      },
+      brush: {
+        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
+      },
+      saveAsImage: { show: true, name: '合同金额排行' } // 保存为图片
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    },
+    valueFormatter: fenToYuan
+  },
+  xAxis: {
+    type: 'value',
+    name: '合同金额（元）'
+  },
+  yAxis: {
+    type: 'category',
+    name: '签订人'
+  }
+}) as EChartsOption
+
+/** 获取合同金额排行 */
+const loadData = async () => {
+  // 1. 加载排行数据
+  loading.value = true
+  const rankingList = await RankApi.getContractPriceRank(props.queryParams)
+  // 2.1 更新 Echarts 数据
+  if (echartsOption.dataset && echartsOption.dataset['source']) {
+    echartsOption.dataset['source'] = clone(rankingList).reverse()
+  }
+  // 2.2 更新列表数据
+  list.value = rankingList
+  loading.value = false
+}
+defineExpose({ loadData })
+
+/** 初始化 */
+onMounted(() => {
+  loadData()
+})
+</script>
diff --git a/src/views/crm/bi/rank/ReceivablePriceRank.vue b/src/views/crm/bi/rank/ReceivablePriceRank.vue
new file mode 100644
index 00000000..9eb83807
--- /dev/null
+++ b/src/views/crm/bi/rank/ReceivablePriceRank.vue
@@ -0,0 +1,108 @@
+<!-- 回款金额排行 -->
+<template>
+  <!-- 柱状图 -->
+  <el-card shadow="never">
+    <el-skeleton :loading="loading" animated>
+      <Echart :height="500" :options="echartsOption" />
+    </el-skeleton>
+  </el-card>
+
+  <!-- 排行列表 -->
+  <el-card shadow="never" class="mt-16px">
+    <el-table v-loading="loading" :data="list">
+      <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"
+        :formatter="fenToYuanFormat"
+      />
+    </el-table>
+  </el-card>
+</template>
+<script setup lang="ts">
+import { RankApi, BiRankRespVO } from '@/api/crm/bi/rank'
+import { EChartsOption } from 'echarts'
+import { fenToYuanFormat } from '@/utils/formatter'
+import { fenToYuan } from '@/utils'
+import { clone } from 'unocss'
+
+defineOptions({ name: 'ReceivablePriceRank' })
+const props = defineProps<{ queryParams: any }>() // 搜索参数
+
+const loading = ref(false) // 加载中
+const list = ref<BiRankRespVO[]>([]) // 列表的数据
+
+/** 柱状图配置：横向 */
+const echartsOption = reactive<EChartsOption>({
+  dataset: {
+    dimensions: ['nickname', 'count'],
+    source: []
+  },
+  grid: {
+    left: 20,
+    right: 20,
+    bottom: 20,
+    containLabel: true
+  },
+  legend: {
+    top: 50
+  },
+  series: [
+    {
+      name: '回款金额排行',
+      type: 'bar'
+    }
+  ],
+  toolbox: {
+    feature: {
+      dataZoom: {
+        yAxisIndex: false // 数据区域缩放：Y 轴不缩放
+      },
+      brush: {
+        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
+      },
+      saveAsImage: { show: true, name: '回款金额排行' } // 保存为图片
+    }
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    },
+    valueFormatter: fenToYuan
+  },
+  xAxis: {
+    type: 'value',
+    name: '回款金额（元）'
+  },
+  yAxis: {
+    type: 'category',
+    name: '签订人',
+    nameGap: 30
+  }
+}) as EChartsOption
+
+/** 获取回款金额排行 */
+const loadData = async () => {
+  // 1. 加载排行数据
+  loading.value = true
+  const rankingList = await RankApi.getReceivablePriceRank(props.queryParams)
+  // 2.1 更新 Echarts 数据
+  if (echartsOption.dataset && echartsOption.dataset['source']) {
+    echartsOption.dataset['source'] = clone(rankingList).reverse()
+  }
+  // 2.2 更新列表数据
+  list.value = rankingList
+  loading.value = false
+}
+defineExpose({ loadData })
+
+/** 初始化 */
+onMounted(() => {
+  loadData()
+})
+</script>
diff --git a/src/views/crm/bi/ranking/index.vue b/src/views/crm/bi/rank/index.vue
similarity index 62%
rename from src/views/crm/bi/ranking/index.vue
rename to src/views/crm/bi/rank/index.vue
index f3fbfb5d..88bc33e7 100644
--- a/src/views/crm/bi/ranking/index.vue
+++ b/src/views/crm/bi/rank/index.vue
@@ -1,3 +1,4 @@
+<!-- BI 排行版 -->
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
@@ -8,9 +9,9 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="时间" prop="orderDate">
+      <el-form-item label="时间范围" prop="orderDate">
         <el-date-picker
-          v-model="queryParams.orderDate"
+          v-model="queryParams.times"
           :shortcuts="defaultShortcuts"
           class="!w-240px"
           end-placeholder="结束日期"
@@ -36,55 +37,52 @@
       </el-form-item>
     </el-form>
   </ContentWrap>
+
+  <!-- 排行数据 -->
   <el-col>
     <el-tabs v-model="activeTab">
       <!-- 合同金额排行 -->
-      <el-tab-pane label="合同金额排行" name="contractAmountRanking">
-        <RankingContractStatistics :queryParams="queryParams" ref="rankingContractStatisticsRef" />
+      <el-tab-pane label="合同金额排行" name="contractPriceRank" lazy>
+        <ContractPriceRank :query-params="queryParams" ref="contractPriceRankRef" />
       </el-tab-pane>
       <!-- 回款金额排行 -->
-      <el-tab-pane label="回款金额排行" name="receivablesRanKing" lazy>
-        <RankingReceivablesStatistics
-          :queryParams="queryParams"
-          ref="rankingReceivablesStatisticsRef"
-        />
+      <el-tab-pane label="回款金额排行" name="receivablePriceRank" lazy>
+        <ReceivablePriceRank :query-params="queryParams" ref="receivablePriceRankRef" />
       </el-tab-pane>
     </el-tabs>
   </el-col>
 </template>
 <script lang="ts" setup>
-import RankingContractStatistics from './components/RankingContractStatistics.vue'
+import ContractPriceRank from './ContractPriceRank.vue'
+import ReceivablePriceRank from './ReceivablePriceRank.vue'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
-import RankingReceivablesStatistics from '@/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue'
+import { useUserStore } from '@/store/modules/user'
 
-/** 排行榜 */
-defineOptions({ name: 'RankingStatistics' })
+defineOptions({ name: 'CrmBiRank' })
 
 const queryParams = reactive({
-  deptId: undefined,
-  //默认显示最近一周的数据
-  orderDate: [
+  deptId: useUserStore().getUser.deptId,
+  times: [
+    // 默认显示最近一周的数据
     formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7))),
     formatDate(endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24)))
-  ],
-  startTime: undefined,
-  endTime: undefined
+  ]
 })
 
 const queryFormRef = ref() // 搜索的表单
 const deptList = ref<Tree[]>([]) // 树形结构
-const activeTab = ref('contractAmountRanking')
-const rankingContractStatisticsRef = ref() // RankingContractStatistics组件的引用
-const rankingReceivablesStatisticsRef = ref() // RankingReceivablesStatistics组件的引用
+const activeTab = ref('contractPriceRank')
+const contractPriceRankRef = ref() // ContractPriceRank 组件的引用
+const receivablePriceRankRef = ref() // ReceivablePriceRank 组件的引用
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  if (activeTab.value === 'contractAmountRanking') {
-    rankingContractStatisticsRef.value.reloadData()
-  } else if (activeTab.value === 'receivablesRanKing') {
-    rankingReceivablesStatisticsRef.value.reloadData()
+  if (activeTab.value === 'contractPriceRank') {
+    contractPriceRankRef.value.loadData()
+  } else if (activeTab.value === 'receivablePriceRank') {
+    receivablePriceRankRef.value.loadData()
   }
 }
 
diff --git a/src/views/crm/bi/ranking/components/RankingContractStatistics.vue b/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
deleted file mode 100644
index cf0c22f9..00000000
--- a/src/views/crm/bi/ranking/components/RankingContractStatistics.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-card shadow="never">
-    <!-- 柱状图 -->
-    <el-skeleton :loading="trendLoading" animated>
-      <Echart :height="500" :options="barChartOptions" />
-    </el-skeleton>
-  </el-card>
-  <el-card shadow="never" class="mt-16px">
-    <!-- 排行列表 -->
-    <el-table v-loading="loading" :data="list">
-      <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="price" min-width="200" />
-    </el-table>
-  </el-card>
-</template>
-<script setup lang="ts">
-import { RankingStatisticsApi, BiContractRanKingRespVO, BiRankReqVO } from '@/api/crm/bi/ranking'
-import { EChartsOption } from 'echarts'
-import { beginOfDay, endOfDay, formatDate } from '@/utils/formatTime'
-
-/** 合同金额排行 */
-defineOptions({ name: 'RankingContractStatistics' })
-
-const params = reactive({
-  deptId: undefined,
-  startTime: undefined,
-  endTime: undefined
-})
-
-const trendLoading = ref(true) // 状态加载中
-const loading = ref(false) // 列表的加载中
-const list = ref<BiContractRanKingRespVO[]>([]) // 列表的数据
-const queryParams = defineProps<{ queryParams: BiRankReqVO }>() // 搜索参数
-
-/** 柱状图配置 横向 */
-const barChartOptions = reactive<EChartsOption>({
-  dataset: {
-    dimensions: ['name', 'value'],
-    source: []
-  },
-  grid: {
-    left: 20,
-    right: 20,
-    bottom: 20,
-    top: 80,
-    containLabel: true
-  },
-  legend: {
-    top: 50
-  },
-  series: [
-    {
-      name: '合同金额排行',
-      type: 'bar',
-      smooth: true,
-      itemStyle: { color: '#B37FEB' }
-    }
-  ],
-  toolbox: {
-    feature: {
-      // 数据区域缩放
-      dataZoom: {
-        yAxisIndex: false // Y轴不缩放
-      },
-      brush: {
-        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
-      },
-      saveAsImage: { show: true, name: '合同金额排行' } // 保存为图片
-    }
-  },
-  tooltip: {
-    trigger: 'axis',
-    axisPointer: {
-      type: 'shadow'
-    }
-  },
-  xAxis: {
-    type: 'value',
-    name: '合同金额（元）',
-    nameGap: 30,
-    nameTextStyle: {
-      color: '#666',
-      fontSize: 14
-    }
-  },
-  yAxis: {
-    type: 'category',
-    name: '签订人',
-    nameGap: 30,
-    nameTextStyle: {
-      color: '#666',
-      fontSize: 14
-    },
-    axisLabel: {
-      formatter: (value: string) => {
-        return value
-      }
-    }
-  }
-}) as EChartsOption
-
-/** 获取合同金额排行 */
-const getRankingContractStatistics = async () => {
-  trendLoading.value = true
-  loading.value = true
-  params.deptId = queryParams.queryParams.deptId
-  params.startTime = formatDate(beginOfDay(new Date(queryParams.queryParams.orderDate[0])))
-  params.endTime = formatDate(endOfDay(new Date(queryParams.queryParams.orderDate[1])))
-  const rankingList = await RankingStatisticsApi.contractAmountRanking(params)
-  let source = rankingList.map((item: BiContractRanKingRespVO) => {
-    return {
-      name: item.nickname,
-      value: item.price
-    }
-  })
-  // 反转数据源
-  source = source.reverse()
-  // 更新 Echarts 数据
-  if (barChartOptions.dataset && barChartOptions.dataset['source']) {
-    barChartOptions.dataset['source'] = source
-  }
-  // 更新列表数据
-  list.value = rankingList
-  trendLoading.value = false
-  loading.value = false
-}
-
-/** 重新加载数据 */
-const reloadData = async () => {
-  await getRankingContractStatistics()
-}
-// 暴露 reloadData 函数
-defineExpose({
-  reloadData
-})
-
-onMounted(() => {
-  getRankingContractStatistics()
-})
-</script>
-<style scoped lang="scss"></style>
diff --git a/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue b/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
deleted file mode 100644
index c56d94c7..00000000
--- a/src/views/crm/bi/ranking/components/RankingReceivablesStatistics.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-card shadow="never">
-    <!-- 柱状图 -->
-    <el-skeleton :loading="trendLoading" animated>
-      <Echart :height="500" :options="barChartOptions" />
-    </el-skeleton>
-  </el-card>
-  <el-card shadow="never" class="mt-16px">
-    <!-- 排行列表 -->
-    <el-table v-loading="loading" :data="list">
-      <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="price" min-width="200" />
-    </el-table>
-  </el-card>
-</template>
-<script setup lang="ts">
-import { RankingStatisticsApi, BiReceivablesRanKingRespVO, BiRankReqVO } from '@/api/crm/bi/ranking'
-import { EChartsOption } from 'echarts'
-import { beginOfDay, endOfDay, formatDate } from '@/utils/formatTime'
-
-/** 回款金额排行 */
-defineOptions({ name: 'RankingReceivablesStatistics' })
-
-const params = reactive({
-  deptId: undefined,
-  startTime: undefined,
-  endTime: undefined
-})
-
-const trendLoading = ref(true) // 状态加载中
-const loading = ref(false) // 列表的加载中
-const list = ref<BiReceivablesRanKingRespVO[]>([]) // 列表的数据
-const queryParams = defineProps<{ queryParams: BiRankReqVO }>() // 搜索参数
-
-/** 柱状图配置 横向 */
-const barChartOptions = reactive<EChartsOption>({
-  dataset: {
-    dimensions: ['name', 'value'],
-    source: []
-  },
-  grid: {
-    left: 20,
-    right: 20,
-    bottom: 20,
-    top: 80,
-    containLabel: true
-  },
-  legend: {
-    top: 50
-  },
-  series: [
-    {
-      name: '回款金额排行',
-      type: 'bar',
-      smooth: true,
-      itemStyle: { color: '#B37FEB' }
-    }
-  ],
-  toolbox: {
-    feature: {
-      // 数据区域缩放
-      dataZoom: {
-        yAxisIndex: false // Y轴不缩放
-      },
-      brush: {
-        type: ['lineX', 'clear'] // 区域缩放按钮、还原按钮
-      },
-      saveAsImage: { show: true, name: '回款金额排行' } // 保存为图片
-    }
-  },
-  tooltip: {
-    trigger: 'axis',
-    axisPointer: {
-      type: 'shadow'
-    }
-  },
-  xAxis: {
-    type: 'value',
-    name: '回款金额（元）',
-    nameGap: 30,
-    nameTextStyle: {
-      color: '#666',
-      fontSize: 14
-    }
-  },
-  yAxis: {
-    type: 'category',
-    name: '签订人',
-    nameGap: 30,
-    nameTextStyle: {
-      color: '#666',
-      fontSize: 14
-    },
-    axisLabel: {
-      formatter: (value: string) => {
-        return value
-      }
-    }
-  }
-}) as EChartsOption
-
-/** 获取回款金额排行 */
-const getRankingReceivablesStatistics = async () => {
-  trendLoading.value = true
-  loading.value = true
-  params.deptId = queryParams.queryParams.deptId
-  params.startTime = formatDate(beginOfDay(new Date(queryParams.queryParams.orderDate[0])))
-  params.endTime = formatDate(endOfDay(new Date(queryParams.queryParams.orderDate[1])))
-  const rankingList = await RankingStatisticsApi.receivablesAmountRanking(params)
-  let source = rankingList.map((item: BiReceivablesRanKingRespVO) => {
-    return {
-      name: item.nickname,
-      value: item.price
-    }
-  })
-  // 反转数据源
-  source = source.reverse()
-  // 更新 Echarts 数据
-  if (barChartOptions.dataset && barChartOptions.dataset['source']) {
-    barChartOptions.dataset['source'] = source
-  }
-  // 更新列表数据
-  list.value = rankingList
-  trendLoading.value = false
-  loading.value = false
-}
-
-/** 重新加载数据 */
-const reloadData = async () => {
-  await getRankingReceivablesStatistics()
-}
-// 暴露 reloadData 函数
-defineExpose({
-  reloadData
-})
-
-onMounted(() => {
-  getRankingReceivablesStatistics()
-})
-</script>
-<style scoped lang="scss"></style>

From 6d0e242387476f7cff3902b1a07e4e224843a397 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 3 Feb 2024 20:47:50 +0800
Subject: [PATCH 15/19] =?UTF-8?q?CRM-=E5=90=88=E5=90=8C=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=20TODO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/business/index.ts                 |  5 +-
 src/api/crm/clue/index.ts                     |  6 ++
 src/api/crm/contact/index.ts                  |  4 +-
 src/api/crm/contract/index.ts                 |  9 +--
 src/api/crm/customer/index.ts                 |  4 +-
 src/components/Table/src/TableSelectForm.vue  |  2 +-
 src/views/crm/contact/detail/index.vue        |  2 +-
 src/views/crm/contract/ContractForm.vue       |  7 +-
 .../crm/contract/components/ProductList.vue   | 44 ++++++++++---
 .../contract/detail/ContractDetailsHeader.vue | 20 +++---
 .../contract/detail/ContractDetailsInfo.vue   | 35 +++++++++-
 .../contract/detail/ContractProductList.vue   | 64 +++++++++++++++++++
 src/views/crm/contract/detail/index.vue       | 25 +++-----
 src/views/crm/contract/index.vue              | 38 ++++-------
 src/views/crm/customer/detail/index.vue       |  2 +-
 src/views/crm/customer/index.vue              |  7 +-
 16 files changed, 194 insertions(+), 80 deletions(-)
 create mode 100644 src/views/crm/contract/detail/ContractProductList.vue

diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
index 79568dec..bc3abe62 100644
--- a/src/api/crm/business/index.ts
+++ b/src/api/crm/business/index.ts
@@ -73,7 +73,6 @@ export const getBusinessListByIds = async (val: number[]) => {
 }
 
 // 商机转移
-// TODO @puhui999：transferBusiness
-export const transfer = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/business/transfer', data })
+export const transferBusiness = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/business/transfer-business', data })
 }
diff --git a/src/api/crm/clue/index.ts b/src/api/crm/clue/index.ts
index 39da03d3..711a5041 100644
--- a/src/api/crm/clue/index.ts
+++ b/src/api/crm/clue/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { TransferReqVO } from '@/api/crm/customer'
 
 export interface ClueVO {
   id: number
@@ -44,3 +45,8 @@ export const deleteClue = async (id: number) => {
 export const exportClue = async (params) => {
   return await request.download({ url: `/crm/clue/export-excel`, params })
 }
+
+// 线索转移
+export const transferClue = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/clue/transfer-clue', data })
+}
diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index 6edb90a1..b728c80a 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -88,6 +88,6 @@ export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
 }
 
 // 联系人转移
-export const transfer = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/contact/transfer', data })
+export const transferContact = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/contact/transfer-contact', data })
 }
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index 58f63631..bb4c7a7e 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -7,6 +7,7 @@ export interface ContractVO {
   name: string
   customerId: number
   businessId: number
+  businessName: string
   processInstanceId: number
   orderDate: Date
   ownerUserId: number
@@ -18,8 +19,9 @@ export interface ContractVO {
   productPrice: number
   contactId: number
   signUserId: number
+  signUserName: string
   contactLastTime: Date
-  status: number
+  auditStatus: number
   remark: string
   productItems: ProductExpandVO[]
   creatorName: string
@@ -71,7 +73,6 @@ export const handleApprove = async (id: number) => {
 }
 
 // 合同转移
-// TODO @puhui999：transfer 相关方法，这块要补充下；
-export const transfer = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/contract/transfer', data })
+export const transferContract = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/contract/transfer-contract', data })
 }
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index a6fb489b..d867e415 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -82,8 +82,8 @@ export interface TransferReqVO {
 }
 
 // 客户转移
-export const transfer = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/customer/transfer', data })
+export const transferCustomer = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/customer/transfer-customer', data })
 }
 
 // 锁定/解锁客户
diff --git a/src/components/Table/src/TableSelectForm.vue b/src/components/Table/src/TableSelectForm.vue
index fde540cd..7fece2d2 100644
--- a/src/components/Table/src/TableSelectForm.vue
+++ b/src/components/Table/src/TableSelectForm.vue
@@ -1,4 +1,4 @@
-<!-- TODO @puhui999：这个最好加个注释哈 -->
+<!-- 列表选择通用组件，参考 ProductList 组件使用 -->
 <template>
   <Dialog v-model="dialogVisible" :appendToBody="true" :scroll="true" :title="title" width="60%">
     <el-table
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index e30f02fe..aee34166 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -79,7 +79,7 @@ const openForm = (type: string, id?: number) => {
 /** 联系人转移 */
 const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 联系人转移表单 ref
 const transfer = () => {
-  crmTransferFormRef.value?.open('联系人转移', contact.value.id, ContactApi.transfer)
+  crmTransferFormRef.value?.open('联系人转移', contact.value.id, ContactApi.transferContact)
 }
 
 /** 获取操作日志 */
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index 081e4098..79de3513 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -7,7 +7,7 @@
       :rules="formRules"
       label-width="110px"
     >
-      <el-row>
+      <el-row :gutter="20">
         <el-col :span="24" class="mb-10px">
           <CardTitle title="基本信息" />
         </el-col>
@@ -138,7 +138,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品总金额(元)" prop="productPrice">
-            <el-input v-model="formData.productPrice" placeholder="请输入产品总金额" />
+            {{ floatToFixed2(formData.productPrice) }}
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -172,6 +172,7 @@ import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import ProductList from './components/ProductList.vue'
 import BPMLModel from '@/views/crm/contract/components/BPMLModel.vue'
+import { floatToFixed2 } from '@/utils'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -191,7 +192,7 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>() // TODO @puhui999：这个变量不太对；另外，可以不做 bpm model 窗口，而是可以点击跳转到工作流详情里；
 
-// TODO @puhui999：加个注释哈
+// 监听合同商品变化，计算合同商品总价
 watch(
   () => formData.value.productItems,
   (val) => {
diff --git a/src/views/crm/contract/components/ProductList.vue b/src/views/crm/contract/components/ProductList.vue
index a84d355e..a5672c75 100644
--- a/src/views/crm/contract/components/ProductList.vue
+++ b/src/views/crm/contract/components/ProductList.vue
@@ -66,14 +66,17 @@ import * as ProductApi from '@/api/crm/product'
 import { DICT_TYPE } from '@/utils/dict'
 import { fenToYuanFormat } from '@/utils/formatter'
 import { TableSelectForm } from '@/components/Table/index'
+import { floatToFixed2, yuanToFen } from '@/utils'
 
 defineOptions({ name: 'ProductList' })
-withDefaults(defineProps<{ modelValue: any[] }>(), { modelValue: () => [] })
+const props = withDefaults(defineProps<{ modelValue: ProductApi.ProductExpandVO[] }>(), {
+  modelValue: () => []
+})
 const emits = defineEmits<{
   (e: 'update:modelValue', v: any[]): void
 }>()
 
-const list = ref<ProductApi.ProductExpandVO[]>([]) //  TODO @puhui999
+const list = ref<ProductApi.ProductExpandVO[]>([]) // 列表数量
 const multipleSelection = ref<ProductApi.ProductExpandVO[]>([]) // 多选
 
 /** 处理删除 */
@@ -92,12 +95,30 @@ const openForm = () => {
 
 /** 计算 totalPrice */
 const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
-  const totalPrice = (row.price * row.count * row.discountPercent) / 100
-  row.totalPrice = isNaN(totalPrice) ? 0 : totalPrice
-  return isNaN(totalPrice) ? 0 : totalPrice
+  const totalPrice =
+    (Number(row.price) / 100) * Number(row.count) * (1 - Number(row.discountPercent) / 100)
+  row.totalPrice = isNaN(totalPrice) ? 0 : yuanToFen(totalPrice)
+  return isNaN(totalPrice) ? 0 : totalPrice.toFixed(2)
 })
-
-// TODO @puhui999：注释下
+const isSetListValue = ref(false) // 判断是否已经给 list 赋值过，用于编辑表单商品回显
+// 编辑时合同商品回显
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (!val || val.length === 0 || isSetListValue.value) {
+      return
+    }
+    list.value = [
+      ...props.modelValue.map((item) => {
+        item.totalPrice = floatToFixed2(item.totalPrice) as unknown as number
+        return item
+      })
+    ]
+    isSetListValue.value = true
+  },
+  { immediate: true, deep: true }
+)
+// 监听列表变化，动态更新合同商品列表
 watch(
   list,
   (val) => {
@@ -109,15 +130,20 @@ watch(
   { deep: true }
 )
 
-// TODO @puhui999：注释下
+// 监听商品选择结果动态添加商品到列表中,如果商品存在则不放入列表中
 watch(
   multipleSelection,
   (val) => {
     if (!val || val.length === 0) {
       return
     }
+    // 过滤出不在列表中的商品
     const ids = list.value.map((item) => item.id)
-    list.value.push(...multipleSelection.value.filter((item) => ids.indexOf(item.id) === -1))
+    const productList = multipleSelection.value.filter((item) => ids.indexOf(item.id) === -1)
+    if (!productList || productList.length === 0) {
+      return
+    }
+    list.value.push(...productList)
   },
   { deep: true }
 )
diff --git a/src/views/crm/contract/detail/ContractDetailsHeader.vue b/src/views/crm/contract/detail/ContractDetailsHeader.vue
index a0309aeb..e300fedc 100644
--- a/src/views/crm/contract/detail/ContractDetailsHeader.vue
+++ b/src/views/crm/contract/detail/ContractDetailsHeader.vue
@@ -1,4 +1,4 @@
-<!-- TODO @puhui999：这个组件的注释加下，方便大家打开就知道哈 -->
+<!-- 合同详情头部组件-->
 <template>
   <div>
     <div class="flex items-start justify-between">
@@ -17,17 +17,20 @@
   </div>
   <ContentWrap class="mt-10px">
     <el-descriptions :column="5" direction="vertical">
-      <el-descriptions-item label="客户">
+      <el-descriptions-item label="客户名称">
         {{ contract.customerName }}
       </el-descriptions-item>
-      <el-descriptions-item label="客户签约人">
-        {{ contract.contactName }}
+      <el-descriptions-item label="合同金额（元）">
+        {{ floatToFixed2(contract.price) }}
       </el-descriptions-item>
-      <el-descriptions-item label="合同金额">
-        {{ contract.productPrice }}
+      <el-descriptions-item label="下单时间">
+        {{ contract.orderDate ? formatDate(contract.orderDate) : '空' }}
       </el-descriptions-item>
-      <el-descriptions-item label="创建时间">
-        {{ contract.createTime ? formatDate(contract.createTime) : '空' }}
+      <el-descriptions-item label="回款金额（元）">
+        {{ floatToFixed2(contract.price) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        {{ contract.ownerUserName }}
       </el-descriptions-item>
     </el-descriptions>
   </ContentWrap>
@@ -35,6 +38,7 @@
 <script lang="ts" setup>
 import * as ContractApi from '@/api/crm/contract'
 import { formatDate } from '@/utils/formatTime'
+import { floatToFixed2 } from '@/utils'
 
 defineOptions({ name: 'ContractDetailsHeader' })
 defineProps<{ contract: ContractApi.ContractVO }>()
diff --git a/src/views/crm/contract/detail/ContractDetailsInfo.vue b/src/views/crm/contract/detail/ContractDetailsInfo.vue
index 731f8e2d..b0015416 100644
--- a/src/views/crm/contract/detail/ContractDetailsInfo.vue
+++ b/src/views/crm/contract/detail/ContractDetailsInfo.vue
@@ -1,4 +1,4 @@
-<!-- TODO @puhui999：这个组件的注释加下，方便大家打开就知道哈 -->
+<!-- 合同详情组件 -->
 <template>
   <ContentWrap>
     <el-collapse v-model="activeNames">
@@ -6,14 +6,43 @@
         <template #title>
           <span class="text-base font-bold">基本信息</span>
         </template>
-        <!-- TODO puhui999: 先出详情样式后补全 -->
-        <el-descriptions :column="4">
+        <el-descriptions :column="3">
+          <el-descriptions-item label="合同编号">
+            {{ contract.no }}
+          </el-descriptions-item>
           <el-descriptions-item label="合同名称">
             {{ contract.name }}
           </el-descriptions-item>
+          <el-descriptions-item label="客户名称">
+            {{ contract.customerName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="商机名称">
+            {{ contract.businessName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="合同金额（元）">
+            {{ contract.price }}
+          </el-descriptions-item>
+          <el-descriptions-item label="下单时间">
+            {{ formatDate(contract.orderDate) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="开始时间">
+            {{ formatDate(contract.startTime) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结束时间">
+            {{ formatDate(contract.endTime) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="客户签约人">
+            {{ contract.contactName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="公司签约人">
+            {{ contract.signUserName }}
+          </el-descriptions-item>
           <el-descriptions-item label="备注">
             {{ contract.remark }}
           </el-descriptions-item>
+          <el-descriptions-item label="合同状态">
+            {{ contract.auditStatus }}
+          </el-descriptions-item>
         </el-descriptions>
       </el-collapse-item>
       <el-collapse-item name="systemInfo">
diff --git a/src/views/crm/contract/detail/ContractProductList.vue b/src/views/crm/contract/detail/ContractProductList.vue
new file mode 100644
index 00000000..9a15c1fe
--- /dev/null
+++ b/src/views/crm/contract/detail/ContractProductList.vue
@@ -0,0 +1,64 @@
+<template>
+  <el-table :data="list" :show-overflow-tooltip="true" :stripe="true">
+    <el-table-column align="center" label="产品名称" prop="name" width="160" />
+    <el-table-column align="center" label="产品类型" prop="categoryName" width="160" />
+    <el-table-column align="center" label="产品单位" prop="unit">
+      <template #default="scope">
+        <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.unit" />
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="产品编码" prop="no" />
+    <el-table-column
+      :formatter="fenToYuanFormat"
+      align="center"
+      label="价格（元）"
+      prop="price"
+      width="100"
+    />
+    <el-table-column align="center" label="数量" prop="count" width="200" />
+    <el-table-column align="center" label="折扣(%)" prop="discountPercent" width="200" />
+    <el-table-column align="center" label="合计" prop="totalPrice" width="100">
+      <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
+        {{ getTotalPrice(row) }}
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import { fenToYuanFormat } from '@/utils/formatter'
+import * as ProductApi from '@/api/crm/product'
+import { floatToFixed2, yuanToFen } from '@/utils'
+
+defineOptions({ name: 'ContractProductList' })
+const props = withDefaults(defineProps<{ modelValue: ProductApi.ProductExpandVO[] }>(), {
+  modelValue: () => []
+})
+const list = ref<ProductApi.ProductExpandVO[]>([]) // 列表数量
+/** 计算 totalPrice */
+const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
+  const totalPrice =
+    (Number(row.price) / 100) * Number(row.count) * (1 - Number(row.discountPercent) / 100)
+  row.totalPrice = isNaN(totalPrice) ? 0 : yuanToFen(totalPrice)
+  return isNaN(totalPrice) ? 0 : totalPrice.toFixed(2)
+})
+const isSetListValue = ref(false) // 判断是否已经给 list 赋值过，用于编辑表单商品回显
+// 编辑时合同商品回显
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (!val || val.length === 0 || isSetListValue.value) {
+      return
+    }
+    list.value = [
+      ...props.modelValue.map((item) => {
+        item.totalPrice = floatToFixed2(item.totalPrice) as unknown as number
+        return item
+      })
+    ]
+    isSetListValue.value = true
+  },
+  { immediate: true, deep: true }
+)
+</script>
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index b0f9b355..fab71ade 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -1,10 +1,10 @@
-<!-- TODO @puhui999：这个组件的注释加下，方便大家打开就知道哈 -->
+<!-- 合同详情页面组件-->
 <template>
   <ContractDetailsHeader v-loading="loading" :contract="contract">
     <el-button v-if="permissionListRef?.validateWrite" @click="openForm('update', contract.id)">
       编辑
     </el-button>
-    <el-button v-if="permissionListRef?.validateOwnerUser" type="primary" @click="transfer">
+    <el-button v-if="permissionListRef?.validateOwnerUser" type="primary" @click="transferContract">
       转移
     </el-button>
   </ContractDetailsHeader>
@@ -13,6 +13,9 @@
       <el-tab-pane label="详细资料">
         <ContractDetailsInfo :contract="contract" />
       </el-tab-pane>
+      <el-tab-pane label="产品">
+        <ContractProductList v-model="contract.productItems" />
+      </el-tab-pane>
       <el-tab-pane label="操作日志">
         <OperateLogV2 :log-list="logList" />
       </el-tab-pane>
@@ -25,18 +28,11 @@
           @quit-team="close"
         />
       </el-tab-pane>
-      <el-tab-pane label="商机" lazy>
-        <BusinessList
-          :biz-id="contract.id!"
-          :biz-type="BizTypeEnum.CRM_CONTRACT"
-          :customer-id="contract.customerId"
-        />
-      </el-tab-pane>
     </el-tabs>
   </el-col>
   <!-- 表单弹窗：添加/修改 -->
   <ContractForm ref="formRef" @success="getContractData" />
-  <CrmTransferForm ref="crmTransferFormRef" @success="close" />
+  <CrmTransferForm ref="transferFormRef" @success="close" />
 </template>
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -44,12 +40,12 @@ import { OperateLogV2VO } from '@/api/system/operatelog'
 import * as ContractApi from '@/api/crm/contract'
 import ContractDetailsHeader from './ContractDetailsHeader.vue'
 import ContractDetailsInfo from './ContractDetailsInfo.vue'
+import ContractProductList from './ContractProductList.vue'
 import { BizTypeEnum } from '@/api/crm/permission'
 import { getOperateLogPage } from '@/api/crm/operateLog'
 import ContractForm from '@/views/crm/contract/ContractForm.vue'
 import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
 import PermissionList from '@/views/crm/permission/components/PermissionList.vue'
-import BusinessList from '@/views/crm/business/components/BusinessList.vue'
 
 defineOptions({ name: 'CrmContractDetail' })
 
@@ -91,10 +87,9 @@ const getOperateLog = async (contractId: number) => {
 }
 
 /** 转移 */
-// TODO @puhui999：transferFormRef 简洁一点哈
-const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 合同转移表单 ref
-const transfer = () => {
-  crmTransferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transfer)
+const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 合同转移表单 ref
+const transferContract = () => {
+  transferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transferContract)
 }
 
 /** 关闭 */
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index da3aeaad..91ade8a6 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -57,54 +57,44 @@
   <!-- TODO 芋艿：各种字段要调整 -->
   <ContentWrap>
     <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="customerId" />
-      <el-table-column align="center" label="商机名称" prop="businessId" />
-      <el-table-column align="center" label="工作流名称" prop="processInstanceId" />
+      <el-table-column align="center" label="合同编号" prop="no" width="130" />
+      <el-table-column align="center" label="合同名称" prop="name" width="130" />
+      <el-table-column align="center" label="合同状态" prop="auditStatus" width="130" />
+      <el-table-column align="center" label="客户名称" prop="customerName" width="130" />
+      <el-table-column align="center" label="商机名称" prop="businessName" width="130" />
+      <el-table-column align="center" label="合同金额（元）" prop="price" width="130" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
         label="下单时间"
         prop="orderDate"
-        width="180px"
+        width="180"
       />
-      <el-table-column align="center" label="负责人" prop="ownerUserId" />
-      <el-table-column align="center" label="合同编号" prop="no" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
         label="开始时间"
         prop="startTime"
-        width="180px"
+        width="180"
       />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
         label="结束时间"
         prop="endTime"
-        width="180px"
+        width="180"
       />
-      <el-table-column align="center" label="合同金额" prop="price" />
-      <el-table-column align="center" label="整单折扣" prop="discountPercent" />
-      <el-table-column align="center" label="产品总金额" prop="productPrice" />
-      <el-table-column align="center" label="联系人" prop="contactId" />
-      <el-table-column align="center" label="公司签约人" prop="signUserId" />
+      <el-table-column align="center" label="客户签约人" prop="contactName" width="130" />
+      <el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />
+      <el-table-column align="center" label="备注" prop="remark" width="130" />
+      <el-table-column align="center" label="审核状态" prop="auditStatus" width="130" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
         label="最后跟进时间"
         prop="contactLastTime"
-        width="180px"
+        width="180"
       />
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="创建时间"
-        prop="createTime"
-        width="180px"
-      />
-      <el-table-column align="center" label="备注" prop="remark" />
       <el-table-column fixed="right" label="操作" width="250">
         <template #default="scope">
           <el-button
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 44e62314..7cc264a2 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -124,7 +124,7 @@ const openForm = () => {
 /** 客户转移 */
 const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 客户转移表单 ref
 const transfer = () => {
-  crmTransferFormRef.value?.open('客户转移', customerId.value, CustomerApi.transfer)
+  crmTransferFormRef.value?.open('客户转移', customerId.value, CustomerApi.transferCustomer)
 }
 
 /** 锁定客户 */
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 7885cd49..10911c37 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -208,7 +208,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <CustomerForm ref="formRef" @success="getList" />
-  <CustomerImportForm ref="customerImportFormRef" @success="getList" />
+  <CustomerImportForm ref="importFormRef" @success="getList" />
 </template>
 
 <script lang="ts" setup>
@@ -341,10 +341,9 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导入按钮操作 */
-// TODO @puhui999：importFormRef 简化下
-const customerImportFormRef = ref<InstanceType<typeof CustomerImportForm>>()
+const importFormRef = ref<InstanceType<typeof CustomerImportForm>>()
 const handleImport = () => {
-  customerImportFormRef.value?.open()
+  importFormRef.value?.open()
 }
 
 /** 导出按钮操作 */

From fe91c5ec5ca52ef45abef6f961a24ddbea6a7daa Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 3 Feb 2024 22:17:45 +0800
Subject: [PATCH 16/19] =?UTF-8?q?CRM=EF=BC=9Atransfer?=
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 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
index bc3abe62..37304f5a 100644
--- a/src/api/crm/business/index.ts
+++ b/src/api/crm/business/index.ts
@@ -74,5 +74,5 @@ export const getBusinessListByIds = async (val: number[]) => {
 
 // 商机转移
 export const transferBusiness = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/business/transfer-business', data })
+  return await request.put({ url: '/crm/business/transfer', data })
 }
diff --git a/src/api/crm/clue/index.ts b/src/api/crm/clue/index.ts
index 711a5041..4268c420 100644
--- a/src/api/crm/clue/index.ts
+++ b/src/api/crm/clue/index.ts
@@ -48,5 +48,5 @@ export const exportClue = async (params) => {
 
 // 线索转移
 export const transferClue = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/clue/transfer-clue', data })
+  return await request.put({ url: '/crm/clue/transfer', data })
 }
diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index b728c80a..2dab70bc 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -89,5 +89,5 @@ export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
 
 // 联系人转移
 export const transferContact = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/contact/transfer-contact', data })
+  return await request.put({ url: '/crm/contact/transfer', data })
 }
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index bb4c7a7e..5b770d45 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -74,5 +74,5 @@ export const handleApprove = async (id: number) => {
 
 // 合同转移
 export const transferContract = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/contract/transfer-contract', data })
+  return await request.put({ url: '/crm/contract/transfer', data })
 }
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index d867e415..2940934e 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -83,7 +83,7 @@ export interface TransferReqVO {
 
 // 客户转移
 export const transferCustomer = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/customer/transfer-customer', data })
+  return await request.put({ url: '/crm/customer/transfer', data })
 }
 
 // 锁定/解锁客户

From 3ad68c3227062aa3a37f07b7b760c73eeee4bd5c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 4 Feb 2024 09:48:44 +0800
Subject: [PATCH 17/19] =?UTF-8?q?CRM=EF=BC=9A=E5=90=88=E5=90=8C=E7=9A=84?=
 =?UTF-8?q?=20code=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/contract/ContractForm.vue          |  2 +-
 .../crm/contract/components/ProductList.vue      | 16 +++++++++-------
 .../crm/contract/detail/ContractProductList.vue  |  9 ++++++---
 src/views/crm/contract/detail/index.vue          |  1 +
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index 79de3513..b955f3d4 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -192,7 +192,7 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>() // TODO @puhui999：这个变量不太对；另外，可以不做 bpm model 窗口，而是可以点击跳转到工作流详情里；
 
-// 监听合同商品变化，计算合同商品总价
+// 监听合同产品变化，计算合同产品总价
 watch(
   () => formData.value.productItems,
   (val) => {
diff --git a/src/views/crm/contract/components/ProductList.vue b/src/views/crm/contract/components/ProductList.vue
index a5672c75..d0c32bf4 100644
--- a/src/views/crm/contract/components/ProductList.vue
+++ b/src/views/crm/contract/components/ProductList.vue
@@ -42,7 +42,7 @@
   </el-table>
 
   <!-- table 选择表单 -->
-  <TableSelectForm ref="tableSelectFormRef" v-model="multipleSelection" title="选择商品">
+  <TableSelectForm ref="tableSelectFormRef" v-model="multipleSelection" title="选择产品">
     <el-table-column align="center" label="产品名称" prop="name" width="160" />
     <el-table-column align="center" label="产品类型" prop="categoryName" width="160" />
     <el-table-column align="center" label="产品单位" prop="unit">
@@ -76,7 +76,7 @@ const emits = defineEmits<{
   (e: 'update:modelValue', v: any[]): void
 }>()
 
-const list = ref<ProductApi.ProductExpandVO[]>([]) // 列表数量
+const list = ref<ProductApi.ProductExpandVO[]>([]) // 已添加的产品列表
 const multipleSelection = ref<ProductApi.ProductExpandVO[]>([]) // 多选
 
 /** 处理删除 */
@@ -100,8 +100,9 @@ const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
   row.totalPrice = isNaN(totalPrice) ? 0 : yuanToFen(totalPrice)
   return isNaN(totalPrice) ? 0 : totalPrice.toFixed(2)
 })
-const isSetListValue = ref(false) // 判断是否已经给 list 赋值过，用于编辑表单商品回显
-// 编辑时合同商品回显
+
+/** 编辑时合同产品回显 */
+const isSetListValue = ref(false) // 判断是否已经给 list 赋值过，用于编辑表单产品回显
 watch(
   () => props.modelValue,
   (val) => {
@@ -118,7 +119,8 @@ watch(
   },
   { immediate: true, deep: true }
 )
-// 监听列表变化，动态更新合同商品列表
+
+/** 监听列表变化，动态更新合同产品列表 */
 watch(
   list,
   (val) => {
@@ -130,14 +132,14 @@ watch(
   { deep: true }
 )
 
-// 监听商品选择结果动态添加商品到列表中,如果商品存在则不放入列表中
+// 监听产品选择结果动态添加产品到列表中,如果产品存在则不放入列表中
 watch(
   multipleSelection,
   (val) => {
     if (!val || val.length === 0) {
       return
     }
-    // 过滤出不在列表中的商品
+    // 过滤出不在列表中的产品
     const ids = list.value.map((item) => item.id)
     const productList = multipleSelection.value.filter((item) => ids.indexOf(item.id) === -1)
     if (!productList || productList.length === 0) {
diff --git a/src/views/crm/contract/detail/ContractProductList.vue b/src/views/crm/contract/detail/ContractProductList.vue
index 9a15c1fe..43c72be7 100644
--- a/src/views/crm/contract/detail/ContractProductList.vue
+++ b/src/views/crm/contract/detail/ContractProductList.vue
@@ -1,3 +1,4 @@
+<!-- 合同详情：产品列表 -->
 <template>
   <el-table :data="list" :show-overflow-tooltip="true" :stripe="true">
     <el-table-column align="center" label="产品名称" prop="name" width="160" />
@@ -35,7 +36,8 @@ defineOptions({ name: 'ContractProductList' })
 const props = withDefaults(defineProps<{ modelValue: ProductApi.ProductExpandVO[] }>(), {
   modelValue: () => []
 })
-const list = ref<ProductApi.ProductExpandVO[]>([]) // 列表数量
+const list = ref<ProductApi.ProductExpandVO[]>([]) // 产品列表
+
 /** 计算 totalPrice */
 const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
   const totalPrice =
@@ -43,8 +45,9 @@ const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
   row.totalPrice = isNaN(totalPrice) ? 0 : yuanToFen(totalPrice)
   return isNaN(totalPrice) ? 0 : totalPrice.toFixed(2)
 })
-const isSetListValue = ref(false) // 判断是否已经给 list 赋值过，用于编辑表单商品回显
-// 编辑时合同商品回显
+
+/** 编辑时合同产品回显 */
+const isSetListValue = ref(false) // 判断是否已经给 list 赋值过，用于编辑表单产品回显
 watch(
   () => props.modelValue,
   (val) => {
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index fab71ade..5973a68a 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -87,6 +87,7 @@ const getOperateLog = async (contractId: number) => {
 }
 
 /** 转移 */
+// TODO @puhui999：这个组件，要不传递业务类型，然后组件里判断 title 和 api 能调用哪个；整体治理掉；
 const transferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // 合同转移表单 ref
 const transferContract = () => {
   transferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transferContract)

From 6d0231d409cb5dac3ab4bf42ce2ec45aec20e43b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 4 Feb 2024 12:10:49 +0800
Subject: [PATCH 18/19] =?UTF-8?q?CRM=EF=BC=9A=E4=BC=98=E5=8C=96=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/contact/index.vue  |  2 +-
 src/views/crm/contract/index.vue | 92 +++++++++++++++++++++++++-------
 2 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/src/views/crm/contact/index.vue b/src/views/crm/contact/index.vue
index c1c7f347..ee07f890 100644
--- a/src/views/crm/contact/index.vue
+++ b/src/views/crm/contact/index.vue
@@ -22,7 +22,7 @@
             v-for="item in customerList"
             :key="item.id"
             :label="item.name"
-            :value="item.id"
+            :value="item.id!"
           />
         </el-select>
       </el-form-item>
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index 91ade8a6..7fc6b9c9 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -57,44 +57,84 @@
   <!-- TODO 芋艿：各种字段要调整 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="合同编号" prop="no" width="130" />
+      <el-table-column align="center" fixed="left" label="合同编号" prop="no" width="130" />
       <el-table-column align="center" label="合同名称" prop="name" width="130" />
-      <el-table-column align="center" label="合同状态" prop="auditStatus" width="130" />
-      <el-table-column align="center" label="客户名称" prop="customerName" width="130" />
+      <el-table-column align="center" label="客户名称" prop="customerName" width="120">
+        <template #default="scope">
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="openCustomerDetail(scope.row.customerId)"
+          >
+            {{ scope.row.customerName }}
+          </el-link>
+        </template>
+      </el-table-column>
+      <!-- TODO @puhui999：做了商机详情后，可以把这个超链接加上 -->
       <el-table-column align="center" label="商机名称" prop="businessName" width="130" />
-      <el-table-column align="center" label="合同金额（元）" prop="price" width="130" />
       <el-table-column
-        :formatter="dateFormatter"
         align="center"
         label="下单时间"
         prop="orderDate"
-        width="180"
+        width="120"
+        :formatter="dateFormatter2"
       />
       <el-table-column
-        :formatter="dateFormatter"
         align="center"
-        label="开始时间"
+        label="合同金额"
+        prop="price"
+        width="130"
+        :formatter="fenToYuanFormat"
+      />
+      <el-table-column
+        align="center"
+        label="合同开始时间"
         prop="startTime"
-        width="180"
+        width="120"
+        :formatter="dateFormatter2"
       />
       <el-table-column
-        :formatter="dateFormatter"
         align="center"
-        label="结束时间"
+        label="合同结束时间"
         prop="endTime"
-        width="180"
+        width="120"
+        :formatter="dateFormatter2"
       />
-      <el-table-column align="center" label="客户签约人" prop="contactName" width="130" />
+      <el-table-column align="center" label="客户签约人" prop="contactName" width="130">
+        <template #default="scope">
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="openContactDetail(scope.row.contactId)"
+          >
+            {{ scope.row.contactName }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />
       <el-table-column align="center" label="备注" prop="remark" width="130" />
-      <el-table-column align="center" label="审核状态" prop="auditStatus" width="130" />
+      <!-- TODO @puhui999：后续可加 【已收款金额】、【未收款金额】 -->
+      <el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
+      <el-table-column align="center" label="创建人" prop="creatorName" width="120" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
-        label="最后跟进时间"
-        prop="contactLastTime"
-        width="180"
+        label="更新时间"
+        prop="updateTime"
+        width="180px"
       />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180px"
+      />
+      <el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
+        </template>
+      </el-table-column>
       <el-table-column fixed="right" label="操作" width="250">
         <template #default="scope">
           <el-button
@@ -105,6 +145,7 @@
           >
             编辑
           </el-button>
+          <!-- TODO @puhui999：可以加下判断，什么情况下，可以审批； -->
           <el-button
             v-hasPermi="['crm:contract:update']"
             link
@@ -145,10 +186,12 @@
   <ContractForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" setup>
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ContractApi from '@/api/crm/contract'
 import ContractForm from './ContractForm.vue'
+import { fenToYuanFormat } from '@/utils/formatter'
+import { DICT_TYPE } from '@/utils/dict'
 
 defineOptions({ name: 'CrmContract' })
 
@@ -237,10 +280,23 @@ const handleApprove = async (row: ContractApi.ContractVO) => {
   message.success('提交审核成功！')
   await getList()
 }
+
+/** 打开合同详情 */
 const { push } = useRouter()
 const openDetail = (id: number) => {
   push({ name: 'CrmContractDetail', params: { id } })
 }
+
+/** 打开客户详情 */
+const openCustomerDetail = (id: number) => {
+  push({ name: 'CrmCustomerDetail', params: { id } })
+}
+
+/** 打开联系人详情 */
+const openContactDetail = (id: number) => {
+  push({ name: 'CrmContactDetail', params: { id } })
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()

From cac39ae126d5b3e7c8d17ab7c502a89267e22de6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 4 Feb 2024 12:57:39 +0800
Subject: [PATCH 19/19] =?UTF-8?q?CRM=EF=BC=9A=E4=BC=98=E5=8C=96=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=88=97=E7=9A=84=E6=96=B0=E5=A2=9E/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/model/index.ts                    |   4 -
 src/api/crm/contract/index.ts                 |   4 +-
 src/views/crm/contract/ContractForm.vue       | 131 ++++++++----------
 .../crm/contract/components/BPMLModel.vue     |  31 -----
 .../crm/contract/components/ProductList.vue   |  55 +++++---
 src/views/crm/contract/detail/index.vue       |  13 +-
 src/views/crm/contract/index.vue              |   9 +-
 .../crm/contract/oa/ContractDetail/index.vue  |   2 +-
 8 files changed, 112 insertions(+), 137 deletions(-)
 delete mode 100644 src/views/crm/contract/components/BPMLModel.vue

diff --git a/src/api/bpm/model/index.ts b/src/api/bpm/model/index.ts
index d0547207..2e1d4e64 100644
--- a/src/api/bpm/model/index.ts
+++ b/src/api/bpm/model/index.ts
@@ -33,10 +33,6 @@ export const getModel = async (id: number) => {
   return await request.get({ url: '/bpm/model/get?id=' + id })
 }
 
-export const getModelByKey = async (key: string) => {
-  return await request.get({ url: '/bpm/model/get-by-key?key=' + key })
-}
-
 export const updateModel = async (data: ModelVO) => {
   return await request.put({ url: '/bpm/model/update', data: data })
 }
diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts
index 5b770d45..9d718c23 100644
--- a/src/api/crm/contract/index.ts
+++ b/src/api/crm/contract/index.ts
@@ -68,8 +68,8 @@ export const exportContract = async (params) => {
 }
 
 // 提交审核
-export const handleApprove = async (id: number) => {
-  return await request.put({ url: `/crm/contract/approve?id=${id}` })
+export const submitContract = async (id: number) => {
+  return await request.put({ url: `/crm/contract/submit?id=${id}` })
 }
 
 // 合同转移
diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue
index b955f3d4..b0425f17 100644
--- a/src/views/crm/contract/ContractForm.vue
+++ b/src/views/crm/contract/ContractForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="70%">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="820">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -8,8 +8,10 @@
       label-width="110px"
     >
       <el-row :gutter="20">
-        <el-col :span="24" class="mb-10px">
-          <CardTitle title="基本信息" />
+        <el-col :span="12">
+          <el-form-item label="合同编号" prop="no">
+            <el-input v-model="formData.no" placeholder="请输入合同编号" />
+          </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="合同名称" prop="name">
@@ -17,12 +19,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="合同编号" prop="no">
-            <el-input v-model="formData.no" placeholder="请输入合同编号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="客户" prop="customerId">
+          <el-form-item label="客户名称" prop="customerId">
             <el-select v-model="formData.customerId">
               <el-option
                 v-for="item in customerList"
@@ -33,42 +30,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="客户签约人" prop="contactId">
-            <el-select v-model="formData.contactId" :disabled="!formData.customerId">
-              <el-option
-                v-for="item in getContactOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id!"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="公司签约人" prop="signUserId">
-            <el-select v-model="formData.signUserId">
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.nickname"
-                :value="item.id!"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="负责人" prop="ownerUserId">
-            <el-select v-model="formData.ownerUserId">
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.nickname"
-                :value="item.id!"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="商机名称" prop="businessId">
             <el-select v-model="formData.businessId">
@@ -81,11 +42,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同金额(元)" prop="price">
-            <el-input v-model="formData.price" placeholder="请输入合同金额" />
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="下单日期" prop="orderDate">
             <el-date-picker
@@ -96,6 +52,11 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="合同金额" prop="price">
+            <el-input v-model="formData.price" placeholder="请输入合同金额" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
@@ -116,6 +77,42 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="公司签约人" prop="signUserId">
+            <el-select v-model="formData.signUserId">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="客户签约人" prop="contactId">
+            <el-select v-model="formData.contactId" :disabled="!formData.customerId">
+              <el-option
+                v-for="item in getContactOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人" prop="ownerUserId">
+            <el-select v-model="formData.ownerUserId">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id!"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
             <el-input
@@ -126,6 +123,7 @@
             />
           </el-form-item>
         </el-col>
+        <!-- TODO @puhui999：productItems 改成 products 会更好点；因为它不是 item 哈 -->
         <el-col :span="24">
           <el-form-item label="产品列表" prop="productList">
             <ProductList v-model="formData.productItems" />
@@ -133,28 +131,21 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="整单折扣(%)" prop="discountPercent">
-            <el-input v-model="formData.discountPercent" placeholder="请输入整单折扣" />
+            <el-input-number
+              v-model="formData.discountPercent"
+              :min="0"
+              :max="100"
+              :precision="0"
+              placeholder="请输入整单折扣"
+              class="!w-100%"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品总金额(元)" prop="productPrice">
-            {{ floatToFixed2(formData.productPrice) }}
+            {{ fenToYuan(formData.productPrice) }}
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <CardTitle class="mb-10px" title="审批信息" />
-        </el-col>
-        <!-- TODO 芋艿：需要后面在 review 下，目前看不到信息 -->
-        <el-col :span="12">
-          <el-button
-            class="m-20px"
-            link
-            type="primary"
-            @click="BPMLModelRef?.handleBpmnDetail('contract-approve')"
-          >
-            查看工作流
-          </el-button>
-        </el-col>
       </el-row>
     </el-form>
     <template #footer>
@@ -162,7 +153,6 @@
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
-  <BPMLModel ref="BPMLModelRef" />
 </template>
 <script lang="ts" setup>
 import * as CustomerApi from '@/api/crm/customer'
@@ -171,8 +161,7 @@ import * as UserApi from '@/api/system/user'
 import * as ContactApi from '@/api/crm/contact'
 import * as BusinessApi from '@/api/crm/business'
 import ProductList from './components/ProductList.vue'
-import BPMLModel from '@/views/crm/contract/components/BPMLModel.vue'
-import { floatToFixed2 } from '@/utils'
+import { fenToYuan } from '@/utils'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -190,9 +179,8 @@ const formRules = reactive({
   no: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>() // TODO @puhui999：这个变量不太对；另外，可以不做 bpm model 窗口，而是可以点击跳转到工作流详情里；
 
-// 监听合同产品变化，计算合同产品总价
+/** 监听合同产品变化，计算合同产品总价 */
 watch(
   () => formData.value.productItems,
   (val) => {
@@ -227,7 +215,6 @@ const open = async (type: string, id?: number) => {
   }
   await getAllApi()
 }
-
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
diff --git a/src/views/crm/contract/components/BPMLModel.vue b/src/views/crm/contract/components/BPMLModel.vue
deleted file mode 100644
index 5a8e7ecc..00000000
--- a/src/views/crm/contract/components/BPMLModel.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <!-- 弹窗：流程模型图的预览 -->
-  <Dialog v-model="bpmnDetailVisible" :append-to-body="true" title="流程图" width="800">
-    <MyProcessViewer
-      key="designer"
-      v-model="bpmnXML"
-      :prefix="bpmnControlForm.prefix"
-      :value="bpmnXML as any"
-      v-bind="bpmnControlForm"
-    />
-  </Dialog>
-</template>
-
-<script lang="ts" setup>
-import * as ModelApi from '@/api/bpm/model'
-import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
-
-defineOptions({ name: 'BPMLModel' })
-/** 流程图的详情按钮操作 */
-const bpmnDetailVisible = ref(false)
-const bpmnXML = ref(null)
-const bpmnControlForm = ref({
-  prefix: 'flowable'
-})
-const handleBpmnDetail = async (key: string) => {
-  const data = await ModelApi.getModelByKey(key)
-  bpmnXML.value = data.bpmnXml || ''
-  bpmnDetailVisible.value = true
-}
-defineExpose({ handleBpmnDetail })
-</script>
diff --git a/src/views/crm/contract/components/ProductList.vue b/src/views/crm/contract/components/ProductList.vue
index d0c32bf4..ed4ce6f1 100644
--- a/src/views/crm/contract/components/ProductList.vue
+++ b/src/views/crm/contract/components/ProductList.vue
@@ -4,37 +4,56 @@
     <el-button plain type="primary" @click="openForm">添加产品</el-button>
   </el-row>
   <el-table :data="list" :show-overflow-tooltip="true" :stripe="true">
-    <el-table-column align="center" label="产品名称" prop="name" width="160" />
-    <el-table-column align="center" label="产品类型" prop="categoryName" width="160" />
+    <el-table-column align="center" label="产品名称" prop="name" width="120" />
+    <el-table-column
+      :formatter="fenToYuanFormat"
+      align="center"
+      label="价格"
+      prop="price"
+      width="100"
+    />
+    <el-table-column align="center" label="产品类型" prop="categoryName" width="100" />
     <el-table-column align="center" label="产品单位" prop="unit">
       <template #default="scope">
         <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.unit" />
       </template>
     </el-table-column>
     <el-table-column align="center" label="产品编码" prop="no" />
+    <el-table-column align="center" fixed="right" label="数量" prop="count" width="100">
+      <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
+        <el-input-number
+          v-model="row.count"
+          controls-position="right"
+          :min="0"
+          :precision="0"
+          class="!w-100%"
+        />
+      </template>
+    </el-table-column>
     <el-table-column
-      :formatter="fenToYuanFormat"
       align="center"
-      label="价格（元）"
-      prop="price"
-      width="100"
-    />
-    <el-table-column align="center" label="数量" prop="count" width="200">
+      fixed="right"
+      label="折扣(%)"
+      prop="discountPercent"
+      width="120"
+    >
       <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
-        <el-input-number v-model="row.count" class="!w-100%" />
+        <el-input-number
+          v-model="row.discountPercent"
+          controls-position="right"
+          :min="0"
+          :max="100"
+          :precision="0"
+          class="!w-100%"
+        />
       </template>
     </el-table-column>
-    <el-table-column align="center" label="折扣(%)" prop="discountPercent" width="200">
+    <el-table-column align="center" fixed="right" label="合计" prop="totalPrice" width="100">
       <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
-        <el-input-number v-model="row.discountPercent" class="!w-100%" />
+        {{ fenToYuan(getTotalPrice(row)) }}
       </template>
     </el-table-column>
-    <el-table-column align="center" label="合计" prop="totalPrice" width="100">
-      <template #default="{ row }: { row: ProductApi.ProductExpandVO }">
-        {{ getTotalPrice(row) }}
-      </template>
-    </el-table-column>
-    <el-table-column align="center" fixed="right" label="操作" width="130">
+    <el-table-column align="center" fixed="right" label="操作" width="60">
       <template #default="scope">
         <el-button link type="danger" @click="handleDelete(scope.row.id)"> 移除</el-button>
       </template>
@@ -66,7 +85,7 @@ import * as ProductApi from '@/api/crm/product'
 import { DICT_TYPE } from '@/utils/dict'
 import { fenToYuanFormat } from '@/utils/formatter'
 import { TableSelectForm } from '@/components/Table/index'
-import { floatToFixed2, yuanToFen } from '@/utils'
+import { fenToYuan, floatToFixed2, yuanToFen } from '@/utils'
 
 defineOptions({ name: 'ProductList' })
 const props = withDefaults(defineProps<{ modelValue: ProductApi.ProductExpandVO[] }>(), {
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index 5973a68a..8ea43fb1 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -10,15 +10,16 @@
   </ContractDetailsHeader>
   <el-col>
     <el-tabs>
-      <el-tab-pane label="详细资料">
+      <!-- TODO @puhui999：跟进记录 -->
+      <el-tab-pane label="基本信息">
         <ContractDetailsInfo :contract="contract" />
       </el-tab-pane>
+      <!-- TODO @puhui999：products 更合适哈 -->
       <el-tab-pane label="产品">
         <ContractProductList v-model="contract.productItems" />
       </el-tab-pane>
-      <el-tab-pane label="操作日志">
-        <OperateLogV2 :log-list="logList" />
-      </el-tab-pane>
+      <!-- TODO @puhui999：回款信息 -->
+      <!-- TODO @puhui999：这里是不是不用 isPool 哈 -->
       <el-tab-pane label="团队成员">
         <PermissionList
           ref="permissionListRef"
@@ -28,8 +29,12 @@
           @quit-team="close"
         />
       </el-tab-pane>
+      <el-tab-pane label="操作日志">
+        <OperateLogV2 :log-list="logList" />
+      </el-tab-pane>
     </el-tabs>
   </el-col>
+
   <!-- 表单弹窗：添加/修改 -->
   <ContractForm ref="formRef" @success="getContractData" />
   <CrmTransferForm ref="transferFormRef" @success="close" />
diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index 7fc6b9c9..417392d3 100644
--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -54,7 +54,6 @@
   </ContentWrap>
 
   <!-- 列表 -->
-  <!-- TODO 芋艿：各种字段要调整 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
       <el-table-column align="center" fixed="left" label="合同编号" prop="no" width="130" />
@@ -145,12 +144,12 @@
           >
             编辑
           </el-button>
-          <!-- TODO @puhui999：可以加下判断，什么情况下，可以审批； -->
+          <!-- TODO @puhui999：可以加下判断，什么情况下，可以审批；然后加个【查看审批】按钮 -->
           <el-button
             v-hasPermi="['crm:contract:update']"
             link
             type="primary"
-            @click="handleApprove(scope.row)"
+            @click="handleSubmit(scope.row)"
           >
             提交审核
           </el-button>
@@ -274,9 +273,9 @@ const handleExport = async () => {
 }
 
 /** 提交审核 **/
-const handleApprove = async (row: ContractApi.ContractVO) => {
+const handleSubmit = async (row: ContractApi.ContractVO) => {
   await message.confirm(`您确定提交【${row.name}】审核吗？`)
-  await ContractApi.handleApprove(row.id)
+  await ContractApi.submitContract(row.id)
   message.success('提交审核成功！')
   await getList()
 }
diff --git a/src/views/crm/contract/oa/ContractDetail/index.vue b/src/views/crm/contract/oa/ContractDetail/index.vue
index eda87394..118ff182 100644
--- a/src/views/crm/contract/oa/ContractDetail/index.vue
+++ b/src/views/crm/contract/oa/ContractDetail/index.vue
@@ -1,4 +1,4 @@
-<!-- TODO @puhui999：这个好像和 detail 重复了？？？ -->
+<!-- TODO @puhui999：这个好像和 detail 重复了？？？能不能复用 detail 哈？ -->
 <template>
   <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="110px">
     <el-row>