From 2700b08c6978dc2f921b4b4f8088e315dc7e8084 Mon Sep 17 00:00:00 2001
From: ljlleo <e0101561@ceic.com>
Date: Fri, 24 Nov 2023 14:21:21 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=95=86=E6=9C=BA=E3=80=81=E5=95=86?=
 =?UTF-8?q?=E6=9C=BA=E7=8A=B6=E6=80=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/business/index.ts                 |  52 ++++
 src/api/crm/businessStatusType/index.ts       |  48 +++
 src/views/crm/business/BusinessForm.vue       | 281 ++++++++++++++++++
 src/views/crm/business/index.vue              | 207 +++++++++++++
 .../BusinessStatusTypeForm.vue                | 173 +++++++++++
 src/views/crm/businessStatusType/index.vue    | 171 +++++++++++
 6 files changed, 932 insertions(+)
 create mode 100644 src/api/crm/business/index.ts
 create mode 100644 src/api/crm/businessStatusType/index.ts
 create mode 100644 src/views/crm/business/BusinessForm.vue
 create mode 100644 src/views/crm/business/index.vue
 create mode 100644 src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
 create mode 100644 src/views/crm/businessStatusType/index.vue

diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
new file mode 100644
index 00000000..89cd871f
--- /dev/null
+++ b/src/api/crm/business/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface BusinessVO {
+  id: number
+  name: string
+  statusTypeId: number
+  statusId: number
+  contactNextTime: Date
+  customerId: number
+  dealTime: Date
+  price: number
+  discountPercent: number
+  productPrice: number
+  remark: string
+  ownerUserId: number
+  roUserIds: string
+  rwUserIds: string
+  endStatus: number
+  endRemark: string
+  contactLastTime: Date
+  followUpStatus: number
+}
+
+// 查询商机列表
+export const getBusinessPage = async (params) => {
+  return await request.get({ url: `/crm/business/page`, params })
+}
+
+// 查询商机详情
+export const getBusiness = async (id: number) => {
+  return await request.get({ url: `/crm/business/get?id=` + id })
+}
+
+// 新增商机
+export const createBusiness = async (data: BusinessVO) => {
+  return await request.post({ url: `/crm/business/create`, data })
+}
+
+// 修改商机
+export const updateBusiness = async (data: BusinessVO) => {
+  return await request.put({ url: `/crm/business/update`, data })
+}
+
+// 删除商机
+export const deleteBusiness = async (id: number) => {
+  return await request.delete({ url: `/crm/business/delete?id=` + id })
+}
+
+// 导出商机 Excel
+export const exportBusiness = async (params) => {
+  return await request.download({ url: `/crm/business/export-excel`, params })
+}
diff --git a/src/api/crm/businessStatusType/index.ts b/src/api/crm/businessStatusType/index.ts
new file mode 100644
index 00000000..cc4b46aa
--- /dev/null
+++ b/src/api/crm/businessStatusType/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export interface BusinessStatusTypeVO {
+  id: number
+  name: string
+  deptIds: number[]
+  status: boolean
+}
+
+// 查询商机状态类型列表
+export const getBusinessStatusTypePage = async (params) => {
+  return await request.get({ url: `/crm/business-status-type/page`, params })
+}
+
+// 查询商机状态类型详情
+export const getBusinessStatusType = async (id: number) => {
+  return await request.get({ url: `/crm/business-status-type/get?id=` + id })
+}
+
+// 新增商机状态类型
+export const createBusinessStatusType = async (data: BusinessStatusTypeVO) => {
+  return await request.post({ url: `/crm/business-status-type/create`, data })
+}
+
+// 修改商机状态类型
+export const updateBusinessStatusType = async (data: BusinessStatusTypeVO) => {
+  return await request.put({ url: `/crm/business-status-type/update`, data })
+}
+
+// 删除商机状态类型
+export const deleteBusinessStatusType = async (id: number) => {
+  return await request.delete({ url: `/crm/business-status-type/delete?id=` + id })
+}
+
+// 导出商机状态类型 Excel
+export const exportBusinessStatusType = async (params) => {
+  return await request.download({ url: `/crm/business-status-type/export-excel`, params })
+}
+
+// 获取商机状态类型信息列表
+export const getBusinessStatusTypeList = async () => {
+  return await request.get({ url: `/crm/business-status-type/get-simple-list` })
+}
+
+// 根据类型ID获取商机状态信息列表
+export const getBusinessStatusListByTypeId = async (typeId: number) => {
+  return await request.get({ url: `/crm/business-status-type/get-status-list?typeId=` + typeId })
+}
diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
new file mode 100644
index 00000000..04f1cf5d
--- /dev/null
+++ b/src/views/crm/business/BusinessForm.vue
@@ -0,0 +1,281 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="商机名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入商机名称" />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-popover
+          placement="bottom"
+          :width="600"
+          trigger="click"
+          :teleported="false"
+          :visible="showCustomer"
+          :offset="10"
+        >
+          <template #reference>
+            <el-input
+              placeholder="请选择客户"
+              @click="openCustomerSelect"
+              v-model="formData.customerName"
+            />
+          </template>
+          <el-table :data="customerList" ref="multipleTableRef" @select="handleSelectionChange">
+            <el-table-column width="55" label="选择" type="selection" />
+            <el-table-column width="100" label="编号" property="id" />
+            <el-table-column width="150" label="客户名称" property="name" />
+            <el-table-column width="100" label="客户来源" prop="source" align="center">
+              <template #default="scope">
+                <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
+              </template>
+            </el-table-column>
+            <el-table-column label="客户等级" align="center" 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>
+          <!-- 分页 -->
+          <el-row :gutter="20">
+            <el-col>
+              <Pagination
+                :total="total"
+                v-model:page="queryParams.pageNo"
+                v-model:limit="queryParams.pageSize"
+                @pagination="getCustomerList"
+                layout="sizes, prev, pager, next"
+              />
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="10" :offset="13">
+              <el-button @click="selectCustomer">确认</el-button>
+              <el-button @click="showCustomer = false">取消</el-button>
+            </el-col>
+          </el-row>
+        </el-popover>
+      </el-form-item>
+      <el-form-item label="商机状态类型" prop="statusTypeId">
+        <el-select
+          v-model="formData.statusTypeId"
+          placeholder="请选择商机状态类型"
+          clearable
+          size="small"
+          @change="changeBusinessStatusType"
+        >
+          <el-option
+            v-for="item in businessStatusTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商机状态" prop="statusId">
+        <el-select
+          v-model="formData.statusId"
+          placeholder="请选择商机状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="item in businessStatusList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="预计成交日期" prop="dealTime">
+        <el-date-picker
+          v-model="formData.dealTime"
+          type="date"
+          value-format="x"
+          placeholder="选择预计成交日期"
+        />
+      </el-form-item>
+      <el-form-item label="商机金额" prop="price">
+        <el-input v-model="formData.price" placeholder="请输入商机金额" />
+      </el-form-item>
+      <el-form-item label="整单折扣" prop="discountPercent">
+        <el-input v-model="formData.discountPercent" placeholder="请输入整单折扣" />
+      </el-form-item>
+      <el-form-item label="产品总金额" prop="productPrice">
+        <el-input v-model="formData.productPrice" 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 @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as BusinessApi from '@/api/crm/business'
+import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
+import * as CustomerApi from "@/api/crm/customer";
+import { DICT_TYPE } from '@/utils/dict'
+import {ElTable} from "element-plus";
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+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,
+  statusTypeId: undefined,
+  statusId: undefined,
+  contactNextTime: undefined,
+  customerId: undefined,
+  dealTime: undefined,
+  price: undefined,
+  discountPercent: undefined,
+  productPrice: undefined,
+  remark: undefined,
+  ownerUserId: undefined,
+  roUserIds: undefined,
+  rwUserIds: undefined,
+  endStatus: undefined,
+  endRemark: undefined,
+  contactLastTime: undefined,
+  followUpStatus: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '商机名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const businessStatusList = ref([]) // 商机状态列表
+const businessStatusTypeList = ref([]) //商机状态类型列表
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const customerList = ref([]) // 客户列表的数据
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await BusinessApi.getBusiness(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载商机状态类型列表
+  businessStatusTypeList.value = await BusinessStatusTypeApi.getBusinessStatusTypeList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BusinessApi.BusinessVO
+    if (formType.value === 'create') {
+      await BusinessApi.createBusiness(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BusinessApi.updateBusiness(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    statusTypeId: undefined,
+    statusId: undefined,
+    contactNextTime: undefined,
+    customerId: undefined,
+    dealTime: undefined,
+    price: undefined,
+    discountPercent: undefined,
+    productPrice: undefined,
+    remark: undefined,
+    ownerUserId: undefined,
+    roUserIds: undefined,
+    rwUserIds: undefined,
+    endStatus: undefined,
+    endRemark: undefined,
+    contactLastTime: undefined,
+    followUpStatus: undefined
+  }
+  formRef.value?.resetFields()
+}
+const changeBusinessStatusType = async (id) => {
+  // 加载商机状态列表
+  businessStatusList.value = await BusinessStatusTypeApi.getBusinessStatusListByTypeId(id)
+}
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  mobile: null,
+  industryId: null,
+  level: null,
+  source: null
+})
+// 选择客户
+const showCustomer = ref(false)
+const openCustomerSelect = () => {
+  showCustomer.value = !showCustomer.value
+  queryParams.pageNo = 1
+  getCustomerList()
+}
+/** 查询客户列表 */
+const getCustomerList = async () => {
+  loading.value = true
+  try {
+    const data = await CustomerApi.getCustomerPage(queryParams)
+    console.log(JSON.stringify(data))
+    customerList.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const multipleSelection = ref()
+const handleSelectionChange = ({}, row) => {
+  multipleSelection.value = row
+  multipleTableRef.value!.clearSelection()
+  multipleTableRef.value!.toggleRowSelection(row, undefined)
+}
+
+const selectCustomer = () => {
+  formData.value.customerId = multipleSelection.value.id
+  formData.value.customerName = multipleSelection.value.name
+  showCustomer.value = !showCustomer.value
+}
+</script>
diff --git a/src/views/crm/business/index.vue b/src/views/crm/business/index.vue
new file mode 100644
index 00000000..c1c63fa1
--- /dev/null
+++ b/src/views/crm/business/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="商机名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入商机名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['crm:business:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:business:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="商机名称" align="center" prop="name" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="商机金额" align="center" prop="price" />
+      <el-table-column
+        label="预计成交日期"
+        align="center"
+        prop="dealTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="商机状态类型" align="center" prop="statusTypeName" />
+      <el-table-column label="商机状态" align="center" prop="statusName" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="负责人" align="center" prop="ownerUserId" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="跟进状态" align="center" prop="followUpStatus" />
+      <el-table-column label="操作" align="center" fixed="right" width="130px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:business:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:business:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BusinessForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as BusinessApi from '@/api/crm/business'
+import BusinessForm from './BusinessForm.vue'
+
+defineOptions({ name: 'CrmBusiness' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  statusTypeId: null,
+  statusId: null,
+  contactNextTime: [],
+  customerId: null,
+  dealTime: [],
+  price: null,
+  discountPercent: null,
+  productPrice: null,
+  remark: null,
+  ownerUserId: null,
+  createTime: [],
+  roUserIds: null,
+  rwUserIds: null,
+  endStatus: null,
+  endRemark: null,
+  contactLastTime: [],
+  followUpStatus: null
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BusinessApi.getBusinessPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BusinessApi.deleteBusiness(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BusinessApi.exportBusiness(queryParams)
+    download.excel(data, '商机.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
new file mode 100644
index 00000000..2ba71128
--- /dev/null
+++ b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
@@ -0,0 +1,173 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="状态类型名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入状态类型名" />
+      </el-form-item>
+      <el-form-item label="应用部门" prop="deptIds">
+        <el-tree
+          ref="treeRef"
+          :data="deptList"
+          :props="defaultProps"
+          :check-strictly="!checkStrictly"
+          node-key="id"
+          placeholder="请选择归属部门"
+          show-checkbox
+        />
+      </el-form-item>
+      <el-form-item label="状态设置" prop="statusList">
+        <el-table border style="width: 100%" :data="formData.statusList">
+          <el-table-column
+             align="center"
+             label="状态"
+             width="120"
+             prop="star"
+          >
+            <template #default="scope">
+              <el-text>状态{{scope.$index+1}}</el-text>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="状态名称"
+            width="120"
+            prop="name"
+          >
+            <template #default="{ row }">
+              <el-input v-model="row.name" placeholder="请输入状态名称" />
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="赢单率" prop="percent">
+            <template #default="{ row }">
+              <el-input v-model="row.percent" placeholder="请输入赢单率" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template #default="scope">
+              <el-button link type="primary" @click="addStatusArea(scope.$index)">
+                添加
+              </el-button>
+              <el-button link type="danger" @click="deleteStatusArea(scope.$index)" v-show="scope.$index>0">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
+import {defaultProps, handleTree} from "@/utils/tree";
+import * as DeptApi from "@/api/system/dept";
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: 0,
+  name: '',
+  deptIds: [],
+  statusList: []
+})
+const formRules = reactive({
+  name: [{ required: true, message: '状态类型名不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+const deptList = ref<Tree[]>([]) // 树形结构
+const treeRef = ref() // 菜单树组件 Ref
+const checkStrictly = ref(true) // 是否严格模式，即父子不关联
+
+/** 打开弹窗 */
+const open = async (type: string,  id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await BusinessStatusTypeApi.getBusinessStatusType(id)
+      treeRef.value.setCheckedKeys(formData.value.deptIds)
+      if(formData.value.statusList.length == 0) {
+        addStatusArea(0)
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    addStatusArea(0)
+  }
+  // 加载部门树
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BusinessStatusTypeApi.BusinessStatusTypeVO
+    data.deptIds = treeRef.value.getCheckedKeys(false)
+    if (formType.value === 'create') {
+      await BusinessStatusTypeApi.createBusinessStatusType(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BusinessStatusTypeApi.updateBusinessStatusType(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  checkStrictly.value = true
+  formData.value = {
+    id: 0,
+    name: '',
+    deptIds: [],
+    statusList: []
+  }
+  treeRef.value?.setCheckedNodes([])
+  formRef.value?.resetFields()
+}
+/** 添加状态 */
+const addStatusArea = (index) => {
+  const data = formData.value
+  data.statusList.push({
+    name: '',
+    percent: ''
+  })
+}
+/** 删除状态 */
+const deleteStatusArea = (index) => {
+  const data = formData.value
+  data.statusList.splice(index, 1)
+}
+</script>
diff --git a/src/views/crm/businessStatusType/index.vue b/src/views/crm/businessStatusType/index.vue
new file mode 100644
index 00000000..7b2725f3
--- /dev/null
+++ b/src/views/crm/businessStatusType/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <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"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['crm:business-status-type:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:business-status-type:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="状态类型名" align="center" prop="name" />
+      <el-table-column label="使用的部门" align="center" prop="deptNames" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:business-status-type:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:business-status-type:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BusinessStatusTypeForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
+import BusinessStatusTypeForm from './BusinessStatusTypeForm.vue'
+
+defineOptions({ name: 'BusinessStatusType' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BusinessStatusTypeApi.getBusinessStatusTypePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 选择客户操作 */
+const formCustomerRef = ref()
+const openCustomerForm = (id?: number) => {
+  formCustomerRef.value.open(id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BusinessStatusTypeApi.deleteBusinessStatusType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BusinessStatusTypeApi.exportBusinessStatusType(queryParams)
+    download.excel(data, '商机状态类型.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From eb97447bb764b49e2d88f83e8a6ebd0b9c37c127 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 25 Nov 2023 10:42:44 +0800
Subject: [PATCH 02/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             | 280 +++++++++---------
 .../crm/components/CrmPermissionList.vue      |  32 +-
 2 files changed, 153 insertions(+), 159 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index e551a5ef..ac4b52e3 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -1,8 +1,8 @@
 /**
  * 数据字典工具类
  */
-import {useDictStoreWithOut} from '@/store/modules/dict'
-import {ElementPlusInfoType} from '@/types/elementPlus'
+import { useDictStoreWithOut } from '@/store/modules/dict'
+import { ElementPlusInfoType } from '@/types/elementPlus'
 
 const dictStore = useDictStoreWithOut()
 
@@ -13,51 +13,51 @@ const dictStore = useDictStoreWithOut()
  * @returns {*|Array} 数据字典数组
  */
 export interface DictDataType {
-    dictType: string
-    label: string
-    value: string | number | boolean
-    colorType: ElementPlusInfoType | ''
-    cssClass: string
+  dictType: string
+  label: string
+  value: string | number | boolean
+  colorType: ElementPlusInfoType | ''
+  cssClass: string
 }
 
 export const getDictOptions = (dictType: string) => {
-    return dictStore.getDictByType(dictType) || []
+  return dictStore.getDictByType(dictType) || []
 }
 
 export const getIntDictOptions = (dictType: string): DictDataType[] => {
-    const dictOption: DictDataType[] = []
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    dictOptions.forEach((dict: DictDataType) => {
-        dictOption.push({
-            ...dict,
-            value: parseInt(dict.value + '')
-        })
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: parseInt(dict.value + '')
     })
-    return dictOption
+  })
+  return dictOption
 }
 
 export const getStrDictOptions = (dictType: string) => {
-    const dictOption: DictDataType[] = []
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    dictOptions.forEach((dict: DictDataType) => {
-        dictOption.push({
-            ...dict,
-            value: dict.value + ''
-        })
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: dict.value + ''
     })
-    return dictOption
+  })
+  return dictOption
 }
 
 export const getBoolDictOptions = (dictType: string) => {
-    const dictOption: DictDataType[] = []
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    dictOptions.forEach((dict: DictDataType) => {
-        dictOption.push({
-            ...dict,
-            value: dict.value + '' === 'true'
-        })
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: dict.value + '' === 'true'
     })
-    return dictOption
+  })
+  return dictOption
 }
 
 /**
@@ -67,12 +67,12 @@ export const getBoolDictOptions = (dictType: string) => {
  * @return DictDataType 字典对象
  */
 export const getDictObj = (dictType: string, value: any): DictDataType | undefined => {
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    for (const dict of dictOptions) {
-        if (dict.value === value + '') {
-            return dict
-        }
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  for (const dict of dictOptions) {
+    if (dict.value === value + '') {
+      return dict
     }
+  }
 }
 
 /**
@@ -83,121 +83,121 @@ export const getDictObj = (dictType: string, value: any): DictDataType | undefin
  * @return 字典名称
  */
 export const getDictLabel = (dictType: string, value: any): string => {
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    const dictLabel = ref('')
-    dictOptions.forEach((dict: DictDataType) => {
-        if (dict.value === value + '') {
-            dictLabel.value = dict.label
-        }
-    })
-    return dictLabel.value
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictLabel = ref('')
+  dictOptions.forEach((dict: DictDataType) => {
+    if (dict.value === value + '') {
+      dictLabel.value = dict.label
+    }
+  })
+  return dictLabel.value
 }
 
 export enum DICT_TYPE {
-    USER_TYPE = 'user_type',
-    COMMON_STATUS = 'common_status',
-    SYSTEM_TENANT_PACKAGE_ID = 'system_tenant_package_id',
-    TERMINAL = 'terminal', // 终端
+  USER_TYPE = 'user_type',
+  COMMON_STATUS = 'common_status',
+  SYSTEM_TENANT_PACKAGE_ID = 'system_tenant_package_id',
+  TERMINAL = 'terminal', // 终端
 
-    // ========== SYSTEM 模块 ==========
-    SYSTEM_USER_SEX = 'system_user_sex',
-    SYSTEM_MENU_TYPE = 'system_menu_type',
-    SYSTEM_ROLE_TYPE = 'system_role_type',
-    SYSTEM_DATA_SCOPE = 'system_data_scope',
-    SYSTEM_NOTICE_TYPE = 'system_notice_type',
-    SYSTEM_OPERATE_TYPE = 'system_operate_type',
-    SYSTEM_LOGIN_TYPE = 'system_login_type',
-    SYSTEM_LOGIN_RESULT = 'system_login_result',
-    SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
-    SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type',
-    SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status',
-    SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
-    SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
-    SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
-    SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
-    SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
-    SYSTEM_SOCIAL_TYPE = 'system_social_type',
+  // ========== SYSTEM 模块 ==========
+  SYSTEM_USER_SEX = 'system_user_sex',
+  SYSTEM_MENU_TYPE = 'system_menu_type',
+  SYSTEM_ROLE_TYPE = 'system_role_type',
+  SYSTEM_DATA_SCOPE = 'system_data_scope',
+  SYSTEM_NOTICE_TYPE = 'system_notice_type',
+  SYSTEM_OPERATE_TYPE = 'system_operate_type',
+  SYSTEM_LOGIN_TYPE = 'system_login_type',
+  SYSTEM_LOGIN_RESULT = 'system_login_result',
+  SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
+  SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type',
+  SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status',
+  SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
+  SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
+  SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
+  SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
+  SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
+  SYSTEM_SOCIAL_TYPE = 'system_social_type',
 
-    // ========== INFRA 模块 ==========
-    INFRA_BOOLEAN_STRING = 'infra_boolean_string',
-    INFRA_JOB_STATUS = 'infra_job_status',
-    INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
-    INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
-    INFRA_CONFIG_TYPE = 'infra_config_type',
-    INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type',
-    INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
-    INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
-    INFRA_FILE_STORAGE = 'infra_file_storage',
+  // ========== INFRA 模块 ==========
+  INFRA_BOOLEAN_STRING = 'infra_boolean_string',
+  INFRA_JOB_STATUS = 'infra_job_status',
+  INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
+  INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
+  INFRA_CONFIG_TYPE = 'infra_config_type',
+  INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type',
+  INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
+  INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
+  INFRA_FILE_STORAGE = 'infra_file_storage',
 
-    // ========== BPM 模块 ==========
-    BPM_MODEL_CATEGORY = 'bpm_model_category',
-    BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
-    BPM_TASK_ASSIGN_RULE_TYPE = 'bpm_task_assign_rule_type',
-    BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
-    BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result',
-    BPM_TASK_ASSIGN_SCRIPT = 'bpm_task_assign_script',
-    BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
+  // ========== BPM 模块 ==========
+  BPM_MODEL_CATEGORY = 'bpm_model_category',
+  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
+  BPM_TASK_ASSIGN_RULE_TYPE = 'bpm_task_assign_rule_type',
+  BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
+  BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result',
+  BPM_TASK_ASSIGN_SCRIPT = 'bpm_task_assign_script',
+  BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
 
-    // ========== PAY 模块 ==========
-    PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
-    PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
-    PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
-    PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
-    PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
-    PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
-    PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
+  // ========== PAY 模块 ==========
+  PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
+  PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
+  PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
+  PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
+  PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
+  PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
+  PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
 
-    // ========== MP 模块 ==========
-    MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
-    MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
+  // ========== MP 模块 ==========
+  MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
+  MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
 
-    // ========== MALL - 会员模块 ==========
-    MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
-    MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
+  // ========== MALL - 会员模块 ==========
+  MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
+  MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
 
-    // ========== MALL - 商品模块 ==========
-    PRODUCT_UNIT = 'product_unit', // 商品单位
-    PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
-    PROMOTION_TYPE_ENUM = 'promotion_type_enum', // 营销类型枚举
+  // ========== MALL - 商品模块 ==========
+  PRODUCT_UNIT = 'product_unit', // 商品单位
+  PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
+  PROMOTION_TYPE_ENUM = 'promotion_type_enum', // 营销类型枚举
 
-    // ========== MALL - 交易模块 ==========
-    EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式
-    TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
-    TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式
-    TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型
-    TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
-    TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
-    TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
-    TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
-    BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition', // 分佣模式
-    BROKERAGE_BIND_MODE = 'brokerage_bind_mode', // 分销关系绑定模式
-    BROKERAGE_BANK_NAME = 'brokerage_bank_name', // 佣金提现银行
-    BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金提现类型
-    BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
-    BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
-    BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
+  // ========== MALL - 交易模块 ==========
+  EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式
+  TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
+  TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式
+  TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型
+  TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
+  TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
+  TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
+  TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
+  BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition', // 分佣模式
+  BROKERAGE_BIND_MODE = 'brokerage_bind_mode', // 分销关系绑定模式
+  BROKERAGE_BANK_NAME = 'brokerage_bank_name', // 佣金提现银行
+  BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金提现类型
+  BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
+  BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
+  BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
 
-    // ========== MALL - 营销模块 ==========
-    PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
-    PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
-    PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
-    PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
-    PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
-    PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
-    PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
-    PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
-    PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
-    PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
+  // ========== MALL - 营销模块 ==========
+  PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
+  PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
+  PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
+  PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
+  PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
+  PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
+  PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
+  PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
+  PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
+  PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
 
-    // ========== CRM - 客户管理模块 ==========
-    CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',
-    CRM_RETURN_TYPE = 'crm_return_type',
-    CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',
-    CRM_CUSTOMER_LEVEL = 'crm_customer_level',
-    CRM_CUSTOMER_SOURCE = 'crm_customer_source',
-    CRM_PRODUCT_STATUS = 'crm_product_status',
+  // ========== CRM - 客户管理模块 ==========
+  CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',
+  CRM_RETURN_TYPE = 'crm_return_type',
+  CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',
+  CRM_CUSTOMER_LEVEL = 'crm_customer_level',
+  CRM_CUSTOMER_SOURCE = 'crm_customer_source',
+  CRM_PRODUCT_STATUS = 'crm_product_status',
 
-    // ========== CRM - 数据权限模块 ==========
-    CRM_BIZ_TYPE = 'crm_biz_type', // 数据模块类型
-    CRM_PERMISSION_LEVEL = 'crm_permission_level' // 用户数据权限类型
+  // ========== CRM - 数据权限模块 ==========
+  CRM_BIZ_TYPE = 'crm_biz_type', // 数据模块类型
+  CRM_PERMISSION_LEVEL = 'crm_permission_level' // 用户数据权限类型
 }
diff --git a/src/views/crm/components/CrmPermissionList.vue b/src/views/crm/components/CrmPermissionList.vue
index cf50e0bc..8f0cba72 100644
--- a/src/views/crm/components/CrmPermissionList.vue
+++ b/src/views/crm/components/CrmPermissionList.vue
@@ -5,7 +5,7 @@
       <Icon class="mr-5px" icon="ep:plus" />
       新增
     </el-button>
-    <el-button @click="handleEdit">
+    <el-button @click="handleUpdate">
       <Icon class="mr-5px" icon="ep:edit" />
       编辑
     </el-button>
@@ -15,7 +15,7 @@
     </el-button>
     <el-button type="danger" @click="handleQuit"> 退出团队</el-button>
   </el-row>
-  <!--  团队成员展示 -->
+  <!-- 团队成员展示 -->
   <el-table
     v-loading="loading"
     :data="list"
@@ -35,7 +35,9 @@
     </el-table-column>
     <el-table-column :formatter="dateFormatter" align="center" label="加入时间" prop="createTime" />
   </el-table>
-  <CrmPermissionForm ref="permissionFormRef" @success="getList" />
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CrmPermissionForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
@@ -75,22 +77,18 @@ const handleSelectionChange = (val: PermissionApi.PermissionVO[]) => {
   multipleSelection.value = val
 }
 
-const permissionFormRef = ref<InstanceType<typeof CrmPermissionForm>>() // 权限表单 Ref
-/**
- * 编辑团队成员
- */
-const handleEdit = () => {
+/** 编辑团队成员 */
+const formRef = ref<InstanceType<typeof CrmPermissionForm>>() // 权限表单 Ref
+const handleUpdate = () => {
   if (multipleSelection.value?.length === 0) {
     message.warning('请先选择团队成员后操作！')
     return
   }
   const ids = multipleSelection.value?.map((item) => item.id)
-  permissionFormRef.value?.open('update', props.bizType, props.bizId, ids)
+  formRef.value?.open('update', props.bizType, props.bizId, ids)
 }
 
-/**
- * 移除团队成员
- */
+/** 移除团队成员 */
 const handleDelete = async () => {
   if (multipleSelection.value?.length === 0) {
     message.warning('请先选择团队成员后操作！')
@@ -105,17 +103,13 @@ const handleDelete = async () => {
   })
 }
 
-/**
- * 添加团队成员
- */
+/** 添加团队成员 */
 const openForm = () => {
-  permissionFormRef.value?.open('create', props.bizType, props.bizId)
+  formRef.value?.open('create', props.bizType, props.bizId)
 }
 
+/** 退出团队 */
 const userStore = useUserStoreWithOut() // 用户信息缓存
-/**
- * 退出团队
- */
 const handleQuit = async () => {
   const permission = list.value.find(
     (item) => item.userId === userStore.getUser.id && item.level === CrmPermissionLevelEnum.OWNER

From 36702f5f90b7ce27a02657caf1ee392c85d4d733 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 25 Nov 2023 12:01:35 +0800
Subject: [PATCH 03/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E6=9C=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/business/BusinessForm.vue       | 20 ++++-----
 .../BusinessStatusTypeForm.vue                | 44 ++++++++-----------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
index 04f1cf5d..53f5cb8d 100644
--- a/src/views/crm/business/BusinessForm.vue
+++ b/src/views/crm/business/BusinessForm.vue
@@ -10,6 +10,7 @@
       <el-form-item label="商机名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入商机名称" />
       </el-form-item>
+      <!-- TODO 芋艿：客户列表的组件 -->
       <el-form-item label="客户名称" prop="customerName">
         <el-popover
           placement="bottom"
@@ -78,12 +79,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="商机状态" prop="statusId">
-        <el-select
-          v-model="formData.statusId"
-          placeholder="请选择商机状态"
-          clearable
-          size="small"
-        >
+        <el-select v-model="formData.statusId" placeholder="请选择商机状态" clearable size="small">
           <el-option
             v-for="item in businessStatusList"
             :key="item.id"
@@ -122,9 +118,9 @@
 <script setup lang="ts">
 import * as BusinessApi from '@/api/crm/business'
 import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
-import * as CustomerApi from "@/api/crm/customer";
+import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
-import {ElTable} from "element-plus";
+import { ElTable } from 'element-plus'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -233,10 +229,12 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-const changeBusinessStatusType = async (id) => {
-  // 加载商机状态列表
-  businessStatusList.value = await BusinessStatusTypeApi.getBusinessStatusListByTypeId(id)
+
+/** 加载商机状态列表 */
+const changeBusinessStatusType = async (typeId: number) => {
+  businessStatusList.value = await BusinessStatusTypeApi.getBusinessStatusListByTypeId(typeId)
 }
+
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
diff --git a/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
index 2ba71128..edf41966 100644
--- a/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
+++ b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
@@ -23,22 +23,12 @@
       </el-form-item>
       <el-form-item label="状态设置" prop="statusList">
         <el-table border style="width: 100%" :data="formData.statusList">
-          <el-table-column
-             align="center"
-             label="状态"
-             width="120"
-             prop="star"
-          >
+          <el-table-column align="center" label="状态" width="120" prop="star">
             <template #default="scope">
-              <el-text>状态{{scope.$index+1}}</el-text>
+              <el-text>状态{{ scope.$index + 1 }}</el-text>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="状态名称"
-            width="120"
-            prop="name"
-          >
+          <el-table-column align="center" label="状态名称" width="120" prop="name">
             <template #default="{ row }">
               <el-input v-model="row.name" placeholder="请输入状态名称" />
             </template>
@@ -50,10 +40,13 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template #default="scope">
-              <el-button link type="primary" @click="addStatusArea(scope.$index)">
-                添加
-              </el-button>
-              <el-button link type="danger" @click="deleteStatusArea(scope.$index)" v-show="scope.$index>0">
+              <el-button link type="primary" @click="addStatusArea(scope.$index)"> 添加 </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="deleteStatusArea(scope.$index)"
+                v-show="scope.$index > 0"
+              >
                 删除
               </el-button>
             </template>
@@ -69,8 +62,8 @@
 </template>
 <script setup lang="ts">
 import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
-import {defaultProps, handleTree} from "@/utils/tree";
-import * as DeptApi from "@/api/system/dept";
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as DeptApi from '@/api/system/dept'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -86,7 +79,7 @@ const formData = ref({
   statusList: []
 })
 const formRules = reactive({
-  name: [{ required: true, message: '状态类型名不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '状态类型名不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构
@@ -94,7 +87,7 @@ const treeRef = ref() // 菜单树组件 Ref
 const checkStrictly = ref(true) // 是否严格模式，即父子不关联
 
 /** 打开弹窗 */
-const open = async (type: string,  id?: number) => {
+const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -105,7 +98,7 @@ const open = async (type: string,  id?: number) => {
     try {
       formData.value = await BusinessStatusTypeApi.getBusinessStatusType(id)
       treeRef.value.setCheckedKeys(formData.value.deptIds)
-      if(formData.value.statusList.length == 0) {
+      if (formData.value.statusList.length == 0) {
         addStatusArea(0)
       }
     } finally {
@@ -116,7 +109,6 @@ const open = async (type: string,  id?: number) => {
   }
   // 加载部门树
   deptList.value = handleTree(await DeptApi.getSimpleDeptList())
-
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -157,16 +149,18 @@ const resetForm = () => {
   treeRef.value?.setCheckedNodes([])
   formRef.value?.resetFields()
 }
+
 /** 添加状态 */
-const addStatusArea = (index) => {
+const addStatusArea = () => {
   const data = formData.value
   data.statusList.push({
     name: '',
     percent: ''
   })
 }
+
 /** 删除状态 */
-const deleteStatusArea = (index) => {
+const deleteStatusArea = (index: number) => {
   const data = formData.value
   data.statusList.splice(index, 1)
 }

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

---
 src/api/crm/customerLimitConfig/index.ts      | 14 +++
 .../index.ts                                  |  5 +-
 src/views/crm/clue/ClueForm.vue               | 18 +++-
 .../CustomerLimitConfigForm.vue               |  2 +-
 .../CustomerLimitConfigList.vue}              | 18 ++--
 .../customerLimitConfig.ts                    |  4 +
 .../crm/config/customerLimitConfig/index.vue  | 19 +++++
 .../customerPoolConfig}/index.vue             | 52 ++++++------
 .../customer/detail/CustomerDetailsTop.vue    | 85 +++++++++++++++++++
 src/views/crm/customer/detail/index.vue       | 74 +---------------
 .../customerLimitConfig/customerLimitConf.ts  | 14 ---
 src/views/crm/customerLimitConfig/index.vue   | 20 -----
 12 files changed, 181 insertions(+), 144 deletions(-)
 rename src/api/crm/{customerPoolConf => customerPoolConfig}/index.ts (67%)
 rename src/views/crm/{ => config}/customerLimitConfig/CustomerLimitConfigForm.vue (98%)
 rename src/views/crm/{customerLimitConfig/CustomerLimitConfDetails.vue => config/customerLimitConfig/CustomerLimitConfigList.vue} (87%)
 create mode 100644 src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
 create mode 100644 src/views/crm/config/customerLimitConfig/index.vue
 rename src/views/crm/{customerPoolConf => config/customerPoolConfig}/index.vue (70%)
 create mode 100644 src/views/crm/customer/detail/CustomerDetailsTop.vue
 delete mode 100644 src/views/crm/customerLimitConfig/customerLimitConf.ts
 delete mode 100644 src/views/crm/customerLimitConfig/index.vue

diff --git a/src/api/crm/customerLimitConfig/index.ts b/src/api/crm/customerLimitConfig/index.ts
index 22fde3ea..86776326 100644
--- a/src/api/crm/customerLimitConfig/index.ts
+++ b/src/api/crm/customerLimitConfig/index.ts
@@ -9,6 +9,20 @@ export interface CustomerLimitConfigVO {
   dealCountEnabled?: boolean
 }
 
+/**
+ * 客户限制配置类型
+ */
+export enum LimitConfType {
+  /**
+   * 拥有客户数限制
+   */
+  CUSTOMER_QUANTITY_LIMIT = 1,
+  /**
+   * 锁定客户数限制
+   */
+  CUSTOMER_LOCK_LIMIT = 2
+}
+
 // 查询客户限制配置列表
 export const getCustomerLimitConfigPage = async (params) => {
   return await request.get({ url: `/crm/customer-limit-config/page`, params })
diff --git a/src/api/crm/customerPoolConf/index.ts b/src/api/crm/customerPoolConfig/index.ts
similarity index 67%
rename from src/api/crm/customerPoolConf/index.ts
rename to src/api/crm/customerPoolConfig/index.ts
index 8234ba36..3cd8ef28 100644
--- a/src/api/crm/customerPoolConf/index.ts
+++ b/src/api/crm/customerPoolConfig/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { ConfigVO } from '@/api/infra/config'
 
 export interface CustomerPoolConfigVO {
   enabled?: boolean
@@ -14,6 +15,6 @@ export const getCustomerPoolConfig = async () => {
 }
 
 // 更新客户公海规则设置
-export const updateCustomerPoolConfig = async (data: ConfigVO) => {
-  return await request.put({ url: `/crm/customer-pool-config/update`, data })
+export const saveCustomerPoolConfig = async (data: ConfigVO) => {
+  return await request.put({ url: `/crm/customer-pool-config/save`, data })
 }
diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 4321f952..f0cfcab6 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,9 +10,15 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
-      <!-- TODO wanwan 客户选择 -->
       <el-form-item label="客户" prop="customerId">
-        <el-input v-model="formData.customerId" placeholder="请选择客户" />
+        <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
+          <el-option
+            v-for="item in customerList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="下次联系时间" prop="contactNextTime">
         <el-date-picker
@@ -47,6 +53,7 @@
 </template>
 <script setup lang="ts">
 import * as ClueApi from '@/api/crm/clue'
+import * as CustomerApi from '@/api/crm/customer'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -55,6 +62,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const customerList = ref([]) // 客户列表
 const formData = ref({
   id: undefined,
   name: undefined,
@@ -79,6 +87,12 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  const customerData = await CustomerApi.getCustomerPage({
+    pageNo: 1,
+    pageSize: 100,
+    pool: false
+  })
+  customerList.value = customerData.list
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
similarity index 98%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue
rename to src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
index 880106f0..e7dee69f 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
@@ -57,11 +57,11 @@
 </template>
 <script setup lang="ts">
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as UserApi from '@/api/system/user'
 import { cloneDeep } from 'lodash-es'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
similarity index 87%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue
rename to src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
index 611bdadf..d0181421 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
@@ -19,8 +19,16 @@
   >
     <el-table-column label="编号" align="center" prop="id" />
     <el-table-column label="规则类型" align="center" prop="type" />
-    <el-table-column label="规则适用人群" align="center" prop="userNames" />
-    <el-table-column label="规则适用部门" align="center" prop="deptNames" />
+    <el-table-column
+      label="规则适用人群"
+      align="center"
+      :formatter="(row) => row.users?.map((user: any) => user.nickname).join('，')"
+    />
+    <el-table-column
+      label="规则适用部门"
+      align="center"
+      :formatter="(row) => row.depts?.map((dept: any) => dept.name).join('，')"
+    />
     <el-table-column
       :label="
         confType === LimitConfType.CUSTOMER_QUANTITY_LIMIT ? '拥有客户数上限' : '锁定客户数上限'
@@ -80,11 +88,11 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import CustomerLimitConfigForm from '@/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
+import CustomerLimitConfigForm from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
-defineOptions({ name: 'CustomerLimitConfDetails' })
+defineOptions({ name: 'CustomerLimitConfigList' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
diff --git a/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
new file mode 100644
index 00000000..7584849a
--- /dev/null
+++ b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
@@ -0,0 +1,4 @@
+// TODO 可以挪到它对应的 api.ts 文件里哈
+/**
+ * 客户限制配置类型
+ */
diff --git a/src/views/crm/config/customerLimitConfig/index.vue b/src/views/crm/config/customerLimitConfig/index.vue
new file mode 100644
index 00000000..d385f46b
--- /dev/null
+++ b/src/views/crm/config/customerLimitConfig/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs>
+      <el-tab-pane label="拥有客户数限制">
+        <CustomerLimitConfigList :confType="LimitConfType.CUSTOMER_QUANTITY_LIMIT" />
+      </el-tab-pane>
+      <el-tab-pane label="锁定客户数限制">
+        <CustomerLimitConfigList :confType="LimitConfType.CUSTOMER_LOCK_LIMIT" />
+      </el-tab-pane>
+    </el-tabs>
+  </ContentWrap>
+</template>
+<script setup lang="ts">
+import CustomerLimitConfigList from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
+
+defineOptions({ name: 'CrmCustomerLimitConfig' })
+</script>
diff --git a/src/views/crm/customerPoolConf/index.vue b/src/views/crm/config/customerPoolConfig/index.vue
similarity index 70%
rename from src/views/crm/customerPoolConf/index.vue
rename to src/views/crm/config/customerPoolConfig/index.vue
index 5fa98711..c7db3301 100644
--- a/src/views/crm/customerPoolConf/index.vue
+++ b/src/views/crm/config/customerPoolConfig/index.vue
@@ -23,7 +23,7 @@
         </template>
         <!-- 表单 -->
         <el-form-item label="客户公海规则设置" prop="enabled">
-          <el-radio-group v-model="formData.enabled" class="ml-4">
+          <el-radio-group v-model="formData.enabled" @change="changeEnable" class="ml-4">
             <el-radio :label="false" size="large">不启用</el-radio>
             <el-radio :label="true" size="large">启用</el-radio>
           </el-radio-group>
@@ -36,7 +36,11 @@
             天未成交
           </el-form-item>
           <el-form-item label="提前提醒设置" prop="notifyEnabled">
-            <el-radio-group v-model="formData.notifyEnabled" class="ml-4">
+            <el-radio-group
+              v-model="formData.notifyEnabled"
+              @change="changeNotifyEnable"
+              class="ml-4"
+            >
               <el-radio :label="false" size="large">不提醒</el-radio>
               <el-radio :label="true" size="large">提醒</el-radio>
             </el-radio-group>
@@ -52,11 +56,10 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import * as CustomerPoolConfApi from '@/api/crm/customerPoolConf'
+import * as CustomerPoolConfigApi from '@/api/crm/customerPoolConfig'
 import { CardTitle } from '@/components/Card'
 
-// TODO @wanwan：CustomerPoolConf =》 CustomerPoolConfig；另外，我们在 crm 目录下，新建一个 config 目录，然后把 customerPoolConfig 和 customerLimitConfig 都挪进
-defineOptions({ name: 'CustomerPoolConf' })
+defineOptions({ name: 'CrmCustomerPoolConfig' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -78,7 +81,7 @@ const formRef = ref() // 表单 Ref
 const getConfig = async () => {
   try {
     formLoading.value = true
-    const data = await CustomerPoolConfApi.getCustomerPoolConfig()
+    const data = await CustomerPoolConfigApi.getCustomerPoolConfig()
     if (data === null) {
       return
     }
@@ -97,8 +100,8 @@ const onSubmit = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as CustomerPoolConfApi.CustomerPoolConfigVO
-    await CustomerPoolConfApi.updateCustomerPoolConfig(data)
+    const data = formData.value as unknown as CustomerPoolConfigApi.CustomerPoolConfigVO
+    await CustomerPoolConfigApi.saveCustomerPoolConfig(data)
     message.success(t('common.updateSuccess'))
     await getConfig()
     formLoading.value = false
@@ -107,27 +110,22 @@ const onSubmit = async () => {
   }
 }
 
-// TODO @wanwan：el-radio-group 选择后，触发会不会更好哈；
-watch(
-  () => formData.value.enabled,
-  (val: boolean) => {
-    if (!val) {
-      formData.value.contactExpireDays = undefined
-      formData.value.dealExpireDays = undefined
-      formData.value.notifyEnabled = false
-      formData.value.notifyDays = undefined
-    }
+/** 更改客户公海规则设置 */
+const changeEnable = () => {
+  if (!formData.value.enabled) {
+    formData.value.contactExpireDays = undefined
+    formData.value.dealExpireDays = undefined
+    formData.value.notifyEnabled = false
+    formData.value.notifyDays = undefined
   }
-)
-// TODO @wanwan：el-radio-group 选择后，触发会不会更好哈；
-watch(
-  () => formData.value.notifyEnabled,
-  (val: boolean) => {
-    if (!val) {
-      formData.value.notifyDays = undefined
-    }
+}
+
+/** 更改提前提醒设置 */
+const changeNotifyEnable = () => {
+  if (!formData.value.notifyEnabled) {
+    formData.value.notifyDays = undefined
   }
-)
+}
 
 onMounted(() => {
   getConfig()
diff --git a/src/views/crm/customer/detail/CustomerDetailsTop.vue b/src/views/crm/customer/detail/CustomerDetailsTop.vue
new file mode 100644
index 00000000..509d0a27
--- /dev/null
+++ b/src/views/crm/customer/detail/CustomerDetailsTop.vue
@@ -0,0 +1,85 @@
+<template>
+  <div v-loading="loading">
+    <div class="flex items-start justify-between">
+      <div>
+        <!-- 左上：客户基本信息 -->
+        <CustomerBasicInfo :customer="customer" />
+      </div>
+      <div>
+        <!-- 右上：按钮 -->
+        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
+          编辑
+        </el-button>
+        <el-button>更改成交状态</el-button>
+      </div>
+    </div>
+    <el-row class="mt-10px">
+      <el-button>
+        <Icon class="mr-5px" icon="ph:calendar-fill" />
+        创建任务
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="carbon:email" />
+        发送邮件
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="system-uicons:contacts" />
+        创建联系人
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="ep:opportunity" />
+        创建商机
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="clarity:contract-line" />
+        创建合同
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="icon-park:income-one" />
+        创建回款
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="fluent:people-team-add-20-filled" />
+        添加团队成员
+      </el-button>
+    </el-row>
+  </div>
+  <ContentWrap class="mt-10px">
+    <el-descriptions :column="5" direction="vertical">
+      <el-descriptions-item label="客户级别">
+        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
+      </el-descriptions-item>
+      <el-descriptions-item label="成交状态">
+        {{ customer.dealStatus ? '已成交' : '未成交' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        {{ customer.ownerUserName }}
+      </el-descriptions-item>
+      <!-- TODO wanwan 首要联系人? -->
+      <el-descriptions-item label="首要联系人" />
+      <!-- TODO wanwan 首要联系人电话? -->
+      <el-descriptions-item label="首要联系人电话">
+        {{ customer.mobile }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CustomerForm ref="formRef" @success="emit('refresh')" />
+</template>
+<script setup lang="ts">
+import * as CustomerApi from '@/api/crm/customer'
+import { DICT_TYPE } from '@/utils/dict'
+import CustomerBasicInfo from '@/views/crm/customer/detail/CustomerBasicInfo.vue'
+import CustomerForm from '@/views/crm/customer/CustomerForm.vue'
+
+const { customer, loading } = defineProps<{ customer: CustomerApi.CustomerVO; loading: boolean }>()
+
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+const formRef = ref()
+
+const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
+</script>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index c88137fa..59b18c5b 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -1,69 +1,5 @@
 <template>
-  <!-- TODO @wanwan：要不要把上面这一整块，搞成一个组件，就是把 下面 + Details + BasitcInfo 合并成一个 -->
-  <div v-loading="loading">
-    <div class="flex items-start justify-between">
-      <div>
-        <!-- 左上：客户基本信息 -->
-        <CustomerBasicInfo :customer="customer" />
-      </div>
-      <div>
-        <!-- 右上：按钮 -->
-        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
-          编辑
-        </el-button>
-        <el-button>更改成交状态</el-button>
-      </div>
-    </div>
-    <el-row class="mt-10px">
-      <el-button>
-        <Icon class="mr-5px" icon="ph:calendar-fill" />
-        创建任务
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="carbon:email" />
-        发送邮件
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="system-uicons:contacts" />
-        创建联系人
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="ep:opportunity" />
-        创建商机
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="clarity:contract-line" />
-        创建合同
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="icon-park:income-one" />
-        创建回款
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="fluent:people-team-add-20-filled" />
-        添加团队成员
-      </el-button>
-    </el-row>
-  </div>
-  <ContentWrap class="mt-10px">
-    <el-descriptions :column="5" direction="vertical">
-      <el-descriptions-item label="客户级别">
-        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
-      </el-descriptions-item>
-      <el-descriptions-item label="成交状态">
-        {{ customer.dealStatus ? '已成交' : '未成交' }}
-      </el-descriptions-item>
-      <el-descriptions-item label="负责人">
-        {{ customer.ownerUserName }}
-      </el-descriptions-item>
-      <!-- TODO wanwan 首要联系人? -->
-      <el-descriptions-item label="首要联系人" />
-      <!-- TODO wanwan 首要联系人电话? -->
-      <el-descriptions-item label="首要联系人电话">
-        {{ customer.mobile }}
-      </el-descriptions-item>
-    </el-descriptions>
-  </ContentWrap>
+  <CustomerDetailsTop :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -107,9 +43,6 @@
       <el-tab-pane label="发票" lazy> 发票</el-tab-pane>
     </el-tabs>
   </el-col>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <CustomerForm ref="formRef" @success="getCustomerData(id)" />
 </template>
 
 <script lang="ts" setup>
@@ -145,11 +78,6 @@ const getCustomerData = async (id: number) => {
   }
 }
 
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
 /**
  * 初始化
  */
diff --git a/src/views/crm/customerLimitConfig/customerLimitConf.ts b/src/views/crm/customerLimitConfig/customerLimitConf.ts
deleted file mode 100644
index 1336e137..00000000
--- a/src/views/crm/customerLimitConfig/customerLimitConf.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO 可以挪到它对应的 api.ts 文件里哈
-/**
- * 客户限制配置类型
- */
-export enum LimitConfType {
-  /**
-   * 拥有客户数限制
-   */
-  CUSTOMER_QUANTITY_LIMIT = 1,
-  /**
-   * 锁定客户数限制
-   */
-  CUSTOMER_LOCK_LIMIT = 2
-}
diff --git a/src/views/crm/customerLimitConfig/index.vue b/src/views/crm/customerLimitConfig/index.vue
deleted file mode 100644
index 1bccf4d3..00000000
--- a/src/views/crm/customerLimitConfig/index.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-tabs>
-      <el-tab-pane label="拥有客户数限制">
-        <!-- TODO @wanwan：CustomerLimitConfigList，因为它是列表哈 -->
-        <CustomerLimitConfDetails :confType="LimitConfType.CUSTOMER_QUANTITY_LIMIT" />
-      </el-tab-pane>
-      <el-tab-pane label="锁定客户数限制">
-        <CustomerLimitConfDetails :confType="LimitConfType.CUSTOMER_LOCK_LIMIT" />
-      </el-tab-pane>
-    </el-tabs>
-  </ContentWrap>
-</template>
-<script setup lang="ts">
-import CustomerLimitConfDetails from '@/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
-
-defineOptions({ name: 'CrmCustomerLimitConfig' })
-</script>

From cec8582a90e1c6fd3e0ae22aca60093c70768a9b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 26 Nov 2023 20:18:33 +0800
Subject: [PATCH 05/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/clue/ClueForm.vue                  |  1 +
 .../customerLimitConfig/customerLimitConfig.ts   |  4 ----
 .../crm/customer/detail/CustomerBasicInfo.vue    |  4 +++-
 .../crm/customer/detail/CustomerDetails.vue      |  4 +++-
 ...rDetailsTop.vue => CustomerDetailsHeader.vue} | 16 ++++++++++------
 src/views/crm/customer/detail/index.vue          |  4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
 rename src/views/crm/customer/detail/{CustomerDetailsTop.vue => CustomerDetailsHeader.vue} (90%)

diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index f0cfcab6..1b2637c9 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,6 +10,7 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
+      <!-- TODO 芋艿：后续客户的选择 -->
       <el-form-item label="客户" prop="customerId">
         <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
           <el-option
diff --git a/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
deleted file mode 100644
index 7584849a..00000000
--- a/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO 可以挪到它对应的 api.ts 文件里哈
-/**
- * 客户限制配置类型
- */
diff --git a/src/views/crm/customer/detail/CustomerBasicInfo.vue b/src/views/crm/customer/detail/CustomerBasicInfo.vue
index 86f9c9d7..2542b006 100644
--- a/src/views/crm/customer/detail/CustomerBasicInfo.vue
+++ b/src/views/crm/customer/detail/CustomerBasicInfo.vue
@@ -12,5 +12,7 @@
 <script setup lang="ts">
 import * as CustomerApi from '@/api/crm/customer'
 
-const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
+const { customer } = defineProps<{
+  customer: CustomerApi.CustomerVO
+}>()
 </script>
diff --git a/src/views/crm/customer/detail/CustomerDetails.vue b/src/views/crm/customer/detail/CustomerDetails.vue
index 67beae94..f7c92ca2 100644
--- a/src/views/crm/customer/detail/CustomerDetails.vue
+++ b/src/views/crm/customer/detail/CustomerDetails.vue
@@ -87,7 +87,9 @@ import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 
-const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
+const { customer } = defineProps<{
+  customer: CustomerApi.CustomerVO
+}>()
 
 // 展示的折叠面板
 const activeNames = ref(['basicInfo', 'systemInfo'])
diff --git a/src/views/crm/customer/detail/CustomerDetailsTop.vue b/src/views/crm/customer/detail/CustomerDetailsHeader.vue
similarity index 90%
rename from src/views/crm/customer/detail/CustomerDetailsTop.vue
rename to src/views/crm/customer/detail/CustomerDetailsHeader.vue
index 509d0a27..6e14c829 100644
--- a/src/views/crm/customer/detail/CustomerDetailsTop.vue
+++ b/src/views/crm/customer/detail/CustomerDetailsHeader.vue
@@ -7,7 +7,7 @@
       </div>
       <div>
         <!-- 右上：按钮 -->
-        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
+        <el-button v-hasPermi="['crm:customer:update']" @click="openForm(customer.id)">
           编辑
         </el-button>
         <el-button>更改成交状态</el-button>
@@ -70,16 +70,20 @@
 <script setup lang="ts">
 import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
+// TODO @wanwan：是不是把 CustomerBasicInfo 也放进来。
 import CustomerBasicInfo from '@/views/crm/customer/detail/CustomerBasicInfo.vue'
 import CustomerForm from '@/views/crm/customer/CustomerForm.vue'
 
-const { customer, loading } = defineProps<{ customer: CustomerApi.CustomerVO; loading: boolean }>()
-
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
+const { customer, loading } = defineProps<{
+  customer: CustomerApi.CustomerVO
+  loading: boolean
+}>()
 
+/** 修改操作 */
 const formRef = ref()
+const openForm = (id?: number) => {
+  formRef.value.open('update', id)
+}
 
 const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
 </script>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 59b18c5b..e6c9e9a9 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <CustomerDetailsTop :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
+  <CustomerDetailsHeader :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -66,7 +66,7 @@ const loading = ref(true) // 加载中
 /**
  * 获取详情
  *
- * @param id
+ * @param id 客户编号
  */
 const customer = ref<CustomerApi.CustomerVO>({} as CustomerApi.CustomerVO) // 客户详情
 const getCustomerData = async (id: number) => {

From 4e1748caa30672e83e330ba18e89f8ae0cc4fe54 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 25 Nov 2023 10:42:44 +0800
Subject: [PATCH 06/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             | 280 +++++++++---------
 .../crm/components/CrmPermissionList.vue      |  32 +-
 2 files changed, 153 insertions(+), 159 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index e551a5ef..ac4b52e3 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -1,8 +1,8 @@
 /**
  * 数据字典工具类
  */
-import {useDictStoreWithOut} from '@/store/modules/dict'
-import {ElementPlusInfoType} from '@/types/elementPlus'
+import { useDictStoreWithOut } from '@/store/modules/dict'
+import { ElementPlusInfoType } from '@/types/elementPlus'
 
 const dictStore = useDictStoreWithOut()
 
@@ -13,51 +13,51 @@ const dictStore = useDictStoreWithOut()
  * @returns {*|Array} 数据字典数组
  */
 export interface DictDataType {
-    dictType: string
-    label: string
-    value: string | number | boolean
-    colorType: ElementPlusInfoType | ''
-    cssClass: string
+  dictType: string
+  label: string
+  value: string | number | boolean
+  colorType: ElementPlusInfoType | ''
+  cssClass: string
 }
 
 export const getDictOptions = (dictType: string) => {
-    return dictStore.getDictByType(dictType) || []
+  return dictStore.getDictByType(dictType) || []
 }
 
 export const getIntDictOptions = (dictType: string): DictDataType[] => {
-    const dictOption: DictDataType[] = []
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    dictOptions.forEach((dict: DictDataType) => {
-        dictOption.push({
-            ...dict,
-            value: parseInt(dict.value + '')
-        })
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: parseInt(dict.value + '')
     })
-    return dictOption
+  })
+  return dictOption
 }
 
 export const getStrDictOptions = (dictType: string) => {
-    const dictOption: DictDataType[] = []
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    dictOptions.forEach((dict: DictDataType) => {
-        dictOption.push({
-            ...dict,
-            value: dict.value + ''
-        })
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: dict.value + ''
     })
-    return dictOption
+  })
+  return dictOption
 }
 
 export const getBoolDictOptions = (dictType: string) => {
-    const dictOption: DictDataType[] = []
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    dictOptions.forEach((dict: DictDataType) => {
-        dictOption.push({
-            ...dict,
-            value: dict.value + '' === 'true'
-        })
+  const dictOption: DictDataType[] = []
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  dictOptions.forEach((dict: DictDataType) => {
+    dictOption.push({
+      ...dict,
+      value: dict.value + '' === 'true'
     })
-    return dictOption
+  })
+  return dictOption
 }
 
 /**
@@ -67,12 +67,12 @@ export const getBoolDictOptions = (dictType: string) => {
  * @return DictDataType 字典对象
  */
 export const getDictObj = (dictType: string, value: any): DictDataType | undefined => {
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    for (const dict of dictOptions) {
-        if (dict.value === value + '') {
-            return dict
-        }
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  for (const dict of dictOptions) {
+    if (dict.value === value + '') {
+      return dict
     }
+  }
 }
 
 /**
@@ -83,121 +83,121 @@ export const getDictObj = (dictType: string, value: any): DictDataType | undefin
  * @return 字典名称
  */
 export const getDictLabel = (dictType: string, value: any): string => {
-    const dictOptions: DictDataType[] = getDictOptions(dictType)
-    const dictLabel = ref('')
-    dictOptions.forEach((dict: DictDataType) => {
-        if (dict.value === value + '') {
-            dictLabel.value = dict.label
-        }
-    })
-    return dictLabel.value
+  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictLabel = ref('')
+  dictOptions.forEach((dict: DictDataType) => {
+    if (dict.value === value + '') {
+      dictLabel.value = dict.label
+    }
+  })
+  return dictLabel.value
 }
 
 export enum DICT_TYPE {
-    USER_TYPE = 'user_type',
-    COMMON_STATUS = 'common_status',
-    SYSTEM_TENANT_PACKAGE_ID = 'system_tenant_package_id',
-    TERMINAL = 'terminal', // 终端
+  USER_TYPE = 'user_type',
+  COMMON_STATUS = 'common_status',
+  SYSTEM_TENANT_PACKAGE_ID = 'system_tenant_package_id',
+  TERMINAL = 'terminal', // 终端
 
-    // ========== SYSTEM 模块 ==========
-    SYSTEM_USER_SEX = 'system_user_sex',
-    SYSTEM_MENU_TYPE = 'system_menu_type',
-    SYSTEM_ROLE_TYPE = 'system_role_type',
-    SYSTEM_DATA_SCOPE = 'system_data_scope',
-    SYSTEM_NOTICE_TYPE = 'system_notice_type',
-    SYSTEM_OPERATE_TYPE = 'system_operate_type',
-    SYSTEM_LOGIN_TYPE = 'system_login_type',
-    SYSTEM_LOGIN_RESULT = 'system_login_result',
-    SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
-    SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type',
-    SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status',
-    SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
-    SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
-    SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
-    SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
-    SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
-    SYSTEM_SOCIAL_TYPE = 'system_social_type',
+  // ========== SYSTEM 模块 ==========
+  SYSTEM_USER_SEX = 'system_user_sex',
+  SYSTEM_MENU_TYPE = 'system_menu_type',
+  SYSTEM_ROLE_TYPE = 'system_role_type',
+  SYSTEM_DATA_SCOPE = 'system_data_scope',
+  SYSTEM_NOTICE_TYPE = 'system_notice_type',
+  SYSTEM_OPERATE_TYPE = 'system_operate_type',
+  SYSTEM_LOGIN_TYPE = 'system_login_type',
+  SYSTEM_LOGIN_RESULT = 'system_login_result',
+  SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
+  SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type',
+  SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status',
+  SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
+  SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type',
+  SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
+  SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
+  SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
+  SYSTEM_SOCIAL_TYPE = 'system_social_type',
 
-    // ========== INFRA 模块 ==========
-    INFRA_BOOLEAN_STRING = 'infra_boolean_string',
-    INFRA_JOB_STATUS = 'infra_job_status',
-    INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
-    INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
-    INFRA_CONFIG_TYPE = 'infra_config_type',
-    INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type',
-    INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
-    INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
-    INFRA_FILE_STORAGE = 'infra_file_storage',
+  // ========== INFRA 模块 ==========
+  INFRA_BOOLEAN_STRING = 'infra_boolean_string',
+  INFRA_JOB_STATUS = 'infra_job_status',
+  INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
+  INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
+  INFRA_CONFIG_TYPE = 'infra_config_type',
+  INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type',
+  INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
+  INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
+  INFRA_FILE_STORAGE = 'infra_file_storage',
 
-    // ========== BPM 模块 ==========
-    BPM_MODEL_CATEGORY = 'bpm_model_category',
-    BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
-    BPM_TASK_ASSIGN_RULE_TYPE = 'bpm_task_assign_rule_type',
-    BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
-    BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result',
-    BPM_TASK_ASSIGN_SCRIPT = 'bpm_task_assign_script',
-    BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
+  // ========== BPM 模块 ==========
+  BPM_MODEL_CATEGORY = 'bpm_model_category',
+  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
+  BPM_TASK_ASSIGN_RULE_TYPE = 'bpm_task_assign_rule_type',
+  BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
+  BPM_PROCESS_INSTANCE_RESULT = 'bpm_process_instance_result',
+  BPM_TASK_ASSIGN_SCRIPT = 'bpm_task_assign_script',
+  BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
 
-    // ========== PAY 模块 ==========
-    PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
-    PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
-    PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
-    PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
-    PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
-    PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
-    PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
+  // ========== PAY 模块 ==========
+  PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
+  PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态
+  PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
+  PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
+  PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
+  PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
+  PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
 
-    // ========== MP 模块 ==========
-    MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
-    MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
+  // ========== MP 模块 ==========
+  MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
+  MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
 
-    // ========== MALL - 会员模块 ==========
-    MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
-    MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
+  // ========== MALL - 会员模块 ==========
+  MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
+  MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
 
-    // ========== MALL - 商品模块 ==========
-    PRODUCT_UNIT = 'product_unit', // 商品单位
-    PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
-    PROMOTION_TYPE_ENUM = 'promotion_type_enum', // 营销类型枚举
+  // ========== MALL - 商品模块 ==========
+  PRODUCT_UNIT = 'product_unit', // 商品单位
+  PRODUCT_SPU_STATUS = 'product_spu_status', //商品状态
+  PROMOTION_TYPE_ENUM = 'promotion_type_enum', // 营销类型枚举
 
-    // ========== MALL - 交易模块 ==========
-    EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式
-    TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
-    TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式
-    TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型
-    TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
-    TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
-    TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
-    TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
-    BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition', // 分佣模式
-    BROKERAGE_BIND_MODE = 'brokerage_bind_mode', // 分销关系绑定模式
-    BROKERAGE_BANK_NAME = 'brokerage_bank_name', // 佣金提现银行
-    BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金提现类型
-    BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
-    BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
-    BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
+  // ========== MALL - 交易模块 ==========
+  EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', //快递的计费方式
+  TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
+  TRADE_AFTER_SALE_WAY = 'trade_after_sale_way', // 售后 - 方式
+  TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type', // 售后 - 类型
+  TRADE_ORDER_TYPE = 'trade_order_type', // 订单 - 类型
+  TRADE_ORDER_STATUS = 'trade_order_status', // 订单 - 状态
+  TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status', // 订单项 - 售后状态
+  TRADE_DELIVERY_TYPE = 'trade_delivery_type', // 配送方式
+  BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition', // 分佣模式
+  BROKERAGE_BIND_MODE = 'brokerage_bind_mode', // 分销关系绑定模式
+  BROKERAGE_BANK_NAME = 'brokerage_bank_name', // 佣金提现银行
+  BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type', // 佣金提现类型
+  BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type', // 佣金业务类型
+  BROKERAGE_RECORD_STATUS = 'brokerage_record_status', // 佣金状态
+  BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status', // 佣金提现状态
 
-    // ========== MALL - 营销模块 ==========
-    PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
-    PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
-    PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
-    PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
-    PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
-    PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
-    PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
-    PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
-    PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
-    PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
+  // ========== MALL - 营销模块 ==========
+  PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
+  PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
+  PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
+  PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
+  PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
+  PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
+  PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
+  PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
+  PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
+  PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
 
-    // ========== CRM - 客户管理模块 ==========
-    CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',
-    CRM_RETURN_TYPE = 'crm_return_type',
-    CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',
-    CRM_CUSTOMER_LEVEL = 'crm_customer_level',
-    CRM_CUSTOMER_SOURCE = 'crm_customer_source',
-    CRM_PRODUCT_STATUS = 'crm_product_status',
+  // ========== CRM - 客户管理模块 ==========
+  CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',
+  CRM_RETURN_TYPE = 'crm_return_type',
+  CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',
+  CRM_CUSTOMER_LEVEL = 'crm_customer_level',
+  CRM_CUSTOMER_SOURCE = 'crm_customer_source',
+  CRM_PRODUCT_STATUS = 'crm_product_status',
 
-    // ========== CRM - 数据权限模块 ==========
-    CRM_BIZ_TYPE = 'crm_biz_type', // 数据模块类型
-    CRM_PERMISSION_LEVEL = 'crm_permission_level' // 用户数据权限类型
+  // ========== CRM - 数据权限模块 ==========
+  CRM_BIZ_TYPE = 'crm_biz_type', // 数据模块类型
+  CRM_PERMISSION_LEVEL = 'crm_permission_level' // 用户数据权限类型
 }
diff --git a/src/views/crm/components/CrmPermissionList.vue b/src/views/crm/components/CrmPermissionList.vue
index cf50e0bc..8f0cba72 100644
--- a/src/views/crm/components/CrmPermissionList.vue
+++ b/src/views/crm/components/CrmPermissionList.vue
@@ -5,7 +5,7 @@
       <Icon class="mr-5px" icon="ep:plus" />
       新增
     </el-button>
-    <el-button @click="handleEdit">
+    <el-button @click="handleUpdate">
       <Icon class="mr-5px" icon="ep:edit" />
       编辑
     </el-button>
@@ -15,7 +15,7 @@
     </el-button>
     <el-button type="danger" @click="handleQuit"> 退出团队</el-button>
   </el-row>
-  <!--  团队成员展示 -->
+  <!-- 团队成员展示 -->
   <el-table
     v-loading="loading"
     :data="list"
@@ -35,7 +35,9 @@
     </el-table-column>
     <el-table-column :formatter="dateFormatter" align="center" label="加入时间" prop="createTime" />
   </el-table>
-  <CrmPermissionForm ref="permissionFormRef" @success="getList" />
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CrmPermissionForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
@@ -75,22 +77,18 @@ const handleSelectionChange = (val: PermissionApi.PermissionVO[]) => {
   multipleSelection.value = val
 }
 
-const permissionFormRef = ref<InstanceType<typeof CrmPermissionForm>>() // 权限表单 Ref
-/**
- * 编辑团队成员
- */
-const handleEdit = () => {
+/** 编辑团队成员 */
+const formRef = ref<InstanceType<typeof CrmPermissionForm>>() // 权限表单 Ref
+const handleUpdate = () => {
   if (multipleSelection.value?.length === 0) {
     message.warning('请先选择团队成员后操作！')
     return
   }
   const ids = multipleSelection.value?.map((item) => item.id)
-  permissionFormRef.value?.open('update', props.bizType, props.bizId, ids)
+  formRef.value?.open('update', props.bizType, props.bizId, ids)
 }
 
-/**
- * 移除团队成员
- */
+/** 移除团队成员 */
 const handleDelete = async () => {
   if (multipleSelection.value?.length === 0) {
     message.warning('请先选择团队成员后操作！')
@@ -105,17 +103,13 @@ const handleDelete = async () => {
   })
 }
 
-/**
- * 添加团队成员
- */
+/** 添加团队成员 */
 const openForm = () => {
-  permissionFormRef.value?.open('create', props.bizType, props.bizId)
+  formRef.value?.open('create', props.bizType, props.bizId)
 }
 
+/** 退出团队 */
 const userStore = useUserStoreWithOut() // 用户信息缓存
-/**
- * 退出团队
- */
 const handleQuit = async () => {
   const permission = list.value.find(
     (item) => item.userId === userStore.getUser.id && item.level === CrmPermissionLevelEnum.OWNER

From b3515b2db54bdcae8d43fe89e2acaf72716595b4 Mon Sep 17 00:00:00 2001
From: ljlleo <e0101561@ceic.com>
Date: Fri, 24 Nov 2023 14:21:21 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=95=86=E6=9C=BA=E3=80=81=E5=95=86?=
 =?UTF-8?q?=E6=9C=BA=E7=8A=B6=E6=80=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/business/index.ts                 |  52 ++++
 src/api/crm/businessStatusType/index.ts       |  48 +++
 src/views/crm/business/BusinessForm.vue       | 281 ++++++++++++++++++
 src/views/crm/business/index.vue              | 207 +++++++++++++
 .../BusinessStatusTypeForm.vue                | 173 +++++++++++
 src/views/crm/businessStatusType/index.vue    | 171 +++++++++++
 6 files changed, 932 insertions(+)
 create mode 100644 src/api/crm/business/index.ts
 create mode 100644 src/api/crm/businessStatusType/index.ts
 create mode 100644 src/views/crm/business/BusinessForm.vue
 create mode 100644 src/views/crm/business/index.vue
 create mode 100644 src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
 create mode 100644 src/views/crm/businessStatusType/index.vue

diff --git a/src/api/crm/business/index.ts b/src/api/crm/business/index.ts
new file mode 100644
index 00000000..89cd871f
--- /dev/null
+++ b/src/api/crm/business/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+export interface BusinessVO {
+  id: number
+  name: string
+  statusTypeId: number
+  statusId: number
+  contactNextTime: Date
+  customerId: number
+  dealTime: Date
+  price: number
+  discountPercent: number
+  productPrice: number
+  remark: string
+  ownerUserId: number
+  roUserIds: string
+  rwUserIds: string
+  endStatus: number
+  endRemark: string
+  contactLastTime: Date
+  followUpStatus: number
+}
+
+// 查询商机列表
+export const getBusinessPage = async (params) => {
+  return await request.get({ url: `/crm/business/page`, params })
+}
+
+// 查询商机详情
+export const getBusiness = async (id: number) => {
+  return await request.get({ url: `/crm/business/get?id=` + id })
+}
+
+// 新增商机
+export const createBusiness = async (data: BusinessVO) => {
+  return await request.post({ url: `/crm/business/create`, data })
+}
+
+// 修改商机
+export const updateBusiness = async (data: BusinessVO) => {
+  return await request.put({ url: `/crm/business/update`, data })
+}
+
+// 删除商机
+export const deleteBusiness = async (id: number) => {
+  return await request.delete({ url: `/crm/business/delete?id=` + id })
+}
+
+// 导出商机 Excel
+export const exportBusiness = async (params) => {
+  return await request.download({ url: `/crm/business/export-excel`, params })
+}
diff --git a/src/api/crm/businessStatusType/index.ts b/src/api/crm/businessStatusType/index.ts
new file mode 100644
index 00000000..cc4b46aa
--- /dev/null
+++ b/src/api/crm/businessStatusType/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export interface BusinessStatusTypeVO {
+  id: number
+  name: string
+  deptIds: number[]
+  status: boolean
+}
+
+// 查询商机状态类型列表
+export const getBusinessStatusTypePage = async (params) => {
+  return await request.get({ url: `/crm/business-status-type/page`, params })
+}
+
+// 查询商机状态类型详情
+export const getBusinessStatusType = async (id: number) => {
+  return await request.get({ url: `/crm/business-status-type/get?id=` + id })
+}
+
+// 新增商机状态类型
+export const createBusinessStatusType = async (data: BusinessStatusTypeVO) => {
+  return await request.post({ url: `/crm/business-status-type/create`, data })
+}
+
+// 修改商机状态类型
+export const updateBusinessStatusType = async (data: BusinessStatusTypeVO) => {
+  return await request.put({ url: `/crm/business-status-type/update`, data })
+}
+
+// 删除商机状态类型
+export const deleteBusinessStatusType = async (id: number) => {
+  return await request.delete({ url: `/crm/business-status-type/delete?id=` + id })
+}
+
+// 导出商机状态类型 Excel
+export const exportBusinessStatusType = async (params) => {
+  return await request.download({ url: `/crm/business-status-type/export-excel`, params })
+}
+
+// 获取商机状态类型信息列表
+export const getBusinessStatusTypeList = async () => {
+  return await request.get({ url: `/crm/business-status-type/get-simple-list` })
+}
+
+// 根据类型ID获取商机状态信息列表
+export const getBusinessStatusListByTypeId = async (typeId: number) => {
+  return await request.get({ url: `/crm/business-status-type/get-status-list?typeId=` + typeId })
+}
diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
new file mode 100644
index 00000000..04f1cf5d
--- /dev/null
+++ b/src/views/crm/business/BusinessForm.vue
@@ -0,0 +1,281 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="商机名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入商机名称" />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-popover
+          placement="bottom"
+          :width="600"
+          trigger="click"
+          :teleported="false"
+          :visible="showCustomer"
+          :offset="10"
+        >
+          <template #reference>
+            <el-input
+              placeholder="请选择客户"
+              @click="openCustomerSelect"
+              v-model="formData.customerName"
+            />
+          </template>
+          <el-table :data="customerList" ref="multipleTableRef" @select="handleSelectionChange">
+            <el-table-column width="55" label="选择" type="selection" />
+            <el-table-column width="100" label="编号" property="id" />
+            <el-table-column width="150" label="客户名称" property="name" />
+            <el-table-column width="100" label="客户来源" prop="source" align="center">
+              <template #default="scope">
+                <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
+              </template>
+            </el-table-column>
+            <el-table-column label="客户等级" align="center" 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>
+          <!-- 分页 -->
+          <el-row :gutter="20">
+            <el-col>
+              <Pagination
+                :total="total"
+                v-model:page="queryParams.pageNo"
+                v-model:limit="queryParams.pageSize"
+                @pagination="getCustomerList"
+                layout="sizes, prev, pager, next"
+              />
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="10" :offset="13">
+              <el-button @click="selectCustomer">确认</el-button>
+              <el-button @click="showCustomer = false">取消</el-button>
+            </el-col>
+          </el-row>
+        </el-popover>
+      </el-form-item>
+      <el-form-item label="商机状态类型" prop="statusTypeId">
+        <el-select
+          v-model="formData.statusTypeId"
+          placeholder="请选择商机状态类型"
+          clearable
+          size="small"
+          @change="changeBusinessStatusType"
+        >
+          <el-option
+            v-for="item in businessStatusTypeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商机状态" prop="statusId">
+        <el-select
+          v-model="formData.statusId"
+          placeholder="请选择商机状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="item in businessStatusList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="预计成交日期" prop="dealTime">
+        <el-date-picker
+          v-model="formData.dealTime"
+          type="date"
+          value-format="x"
+          placeholder="选择预计成交日期"
+        />
+      </el-form-item>
+      <el-form-item label="商机金额" prop="price">
+        <el-input v-model="formData.price" placeholder="请输入商机金额" />
+      </el-form-item>
+      <el-form-item label="整单折扣" prop="discountPercent">
+        <el-input v-model="formData.discountPercent" placeholder="请输入整单折扣" />
+      </el-form-item>
+      <el-form-item label="产品总金额" prop="productPrice">
+        <el-input v-model="formData.productPrice" 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 @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as BusinessApi from '@/api/crm/business'
+import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
+import * as CustomerApi from "@/api/crm/customer";
+import { DICT_TYPE } from '@/utils/dict'
+import {ElTable} from "element-plus";
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+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,
+  statusTypeId: undefined,
+  statusId: undefined,
+  contactNextTime: undefined,
+  customerId: undefined,
+  dealTime: undefined,
+  price: undefined,
+  discountPercent: undefined,
+  productPrice: undefined,
+  remark: undefined,
+  ownerUserId: undefined,
+  roUserIds: undefined,
+  rwUserIds: undefined,
+  endStatus: undefined,
+  endRemark: undefined,
+  contactLastTime: undefined,
+  followUpStatus: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '商机名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const businessStatusList = ref([]) // 商机状态列表
+const businessStatusTypeList = ref([]) //商机状态类型列表
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const customerList = ref([]) // 客户列表的数据
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await BusinessApi.getBusiness(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 加载商机状态类型列表
+  businessStatusTypeList.value = await BusinessStatusTypeApi.getBusinessStatusTypeList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BusinessApi.BusinessVO
+    if (formType.value === 'create') {
+      await BusinessApi.createBusiness(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BusinessApi.updateBusiness(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    statusTypeId: undefined,
+    statusId: undefined,
+    contactNextTime: undefined,
+    customerId: undefined,
+    dealTime: undefined,
+    price: undefined,
+    discountPercent: undefined,
+    productPrice: undefined,
+    remark: undefined,
+    ownerUserId: undefined,
+    roUserIds: undefined,
+    rwUserIds: undefined,
+    endStatus: undefined,
+    endRemark: undefined,
+    contactLastTime: undefined,
+    followUpStatus: undefined
+  }
+  formRef.value?.resetFields()
+}
+const changeBusinessStatusType = async (id) => {
+  // 加载商机状态列表
+  businessStatusList.value = await BusinessStatusTypeApi.getBusinessStatusListByTypeId(id)
+}
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  mobile: null,
+  industryId: null,
+  level: null,
+  source: null
+})
+// 选择客户
+const showCustomer = ref(false)
+const openCustomerSelect = () => {
+  showCustomer.value = !showCustomer.value
+  queryParams.pageNo = 1
+  getCustomerList()
+}
+/** 查询客户列表 */
+const getCustomerList = async () => {
+  loading.value = true
+  try {
+    const data = await CustomerApi.getCustomerPage(queryParams)
+    console.log(JSON.stringify(data))
+    customerList.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+const multipleTableRef = ref<InstanceType<typeof ElTable>>()
+const multipleSelection = ref()
+const handleSelectionChange = ({}, row) => {
+  multipleSelection.value = row
+  multipleTableRef.value!.clearSelection()
+  multipleTableRef.value!.toggleRowSelection(row, undefined)
+}
+
+const selectCustomer = () => {
+  formData.value.customerId = multipleSelection.value.id
+  formData.value.customerName = multipleSelection.value.name
+  showCustomer.value = !showCustomer.value
+}
+</script>
diff --git a/src/views/crm/business/index.vue b/src/views/crm/business/index.vue
new file mode 100644
index 00000000..c1c63fa1
--- /dev/null
+++ b/src/views/crm/business/index.vue
@@ -0,0 +1,207 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="商机名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入商机名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" @click="openForm('create')" v-hasPermi="['crm:business:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:business:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="商机名称" align="center" prop="name" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="商机金额" align="center" prop="price" />
+      <el-table-column
+        label="预计成交日期"
+        align="center"
+        prop="dealTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="商机状态类型" align="center" prop="statusTypeName" />
+      <el-table-column label="商机状态" align="center" prop="statusName" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="负责人" align="center" prop="ownerUserId" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="跟进状态" align="center" prop="followUpStatus" />
+      <el-table-column label="操作" align="center" fixed="right" width="130px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:business:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:business:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BusinessForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as BusinessApi from '@/api/crm/business'
+import BusinessForm from './BusinessForm.vue'
+
+defineOptions({ name: 'CrmBusiness' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  statusTypeId: null,
+  statusId: null,
+  contactNextTime: [],
+  customerId: null,
+  dealTime: [],
+  price: null,
+  discountPercent: null,
+  productPrice: null,
+  remark: null,
+  ownerUserId: null,
+  createTime: [],
+  roUserIds: null,
+  rwUserIds: null,
+  endStatus: null,
+  endRemark: null,
+  contactLastTime: [],
+  followUpStatus: null
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BusinessApi.getBusinessPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BusinessApi.deleteBusiness(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BusinessApi.exportBusiness(queryParams)
+    download.excel(data, '商机.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
new file mode 100644
index 00000000..2ba71128
--- /dev/null
+++ b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
@@ -0,0 +1,173 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="状态类型名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入状态类型名" />
+      </el-form-item>
+      <el-form-item label="应用部门" prop="deptIds">
+        <el-tree
+          ref="treeRef"
+          :data="deptList"
+          :props="defaultProps"
+          :check-strictly="!checkStrictly"
+          node-key="id"
+          placeholder="请选择归属部门"
+          show-checkbox
+        />
+      </el-form-item>
+      <el-form-item label="状态设置" prop="statusList">
+        <el-table border style="width: 100%" :data="formData.statusList">
+          <el-table-column
+             align="center"
+             label="状态"
+             width="120"
+             prop="star"
+          >
+            <template #default="scope">
+              <el-text>状态{{scope.$index+1}}</el-text>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="状态名称"
+            width="120"
+            prop="name"
+          >
+            <template #default="{ row }">
+              <el-input v-model="row.name" placeholder="请输入状态名称" />
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="赢单率" prop="percent">
+            <template #default="{ row }">
+              <el-input v-model="row.percent" placeholder="请输入赢单率" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template #default="scope">
+              <el-button link type="primary" @click="addStatusArea(scope.$index)">
+                添加
+              </el-button>
+              <el-button link type="danger" @click="deleteStatusArea(scope.$index)" v-show="scope.$index>0">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
+import {defaultProps, handleTree} from "@/utils/tree";
+import * as DeptApi from "@/api/system/dept";
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: 0,
+  name: '',
+  deptIds: [],
+  statusList: []
+})
+const formRules = reactive({
+  name: [{ required: true, message: '状态类型名不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+const deptList = ref<Tree[]>([]) // 树形结构
+const treeRef = ref() // 菜单树组件 Ref
+const checkStrictly = ref(true) // 是否严格模式，即父子不关联
+
+/** 打开弹窗 */
+const open = async (type: string,  id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await BusinessStatusTypeApi.getBusinessStatusType(id)
+      treeRef.value.setCheckedKeys(formData.value.deptIds)
+      if(formData.value.statusList.length == 0) {
+        addStatusArea(0)
+      }
+    } finally {
+      formLoading.value = false
+    }
+  } else {
+    addStatusArea(0)
+  }
+  // 加载部门树
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as BusinessStatusTypeApi.BusinessStatusTypeVO
+    data.deptIds = treeRef.value.getCheckedKeys(false)
+    if (formType.value === 'create') {
+      await BusinessStatusTypeApi.createBusinessStatusType(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await BusinessStatusTypeApi.updateBusinessStatusType(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  checkStrictly.value = true
+  formData.value = {
+    id: 0,
+    name: '',
+    deptIds: [],
+    statusList: []
+  }
+  treeRef.value?.setCheckedNodes([])
+  formRef.value?.resetFields()
+}
+/** 添加状态 */
+const addStatusArea = (index) => {
+  const data = formData.value
+  data.statusList.push({
+    name: '',
+    percent: ''
+  })
+}
+/** 删除状态 */
+const deleteStatusArea = (index) => {
+  const data = formData.value
+  data.statusList.splice(index, 1)
+}
+</script>
diff --git a/src/views/crm/businessStatusType/index.vue b/src/views/crm/businessStatusType/index.vue
new file mode 100644
index 00000000..7b2725f3
--- /dev/null
+++ b/src/views/crm/businessStatusType/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <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"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['crm:business-status-type:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:business-status-type:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="状态类型名" align="center" prop="name" />
+      <el-table-column label="使用的部门" align="center" prop="deptNames" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:business-status-type:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:business-status-type:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BusinessStatusTypeForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
+import BusinessStatusTypeForm from './BusinessStatusTypeForm.vue'
+
+defineOptions({ name: 'BusinessStatusType' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await BusinessStatusTypeApi.getBusinessStatusTypePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 选择客户操作 */
+const formCustomerRef = ref()
+const openCustomerForm = (id?: number) => {
+  formCustomerRef.value.open(id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BusinessStatusTypeApi.deleteBusinessStatusType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BusinessStatusTypeApi.exportBusinessStatusType(queryParams)
+    download.excel(data, '商机状态类型.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From 3c19cb1a85b8bec70ce07da17eed2829c632c500 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 25 Nov 2023 12:01:35 +0800
Subject: [PATCH 08/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E5=95=86?=
 =?UTF-8?q?=E6=9C=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/business/BusinessForm.vue       | 20 ++++-----
 .../BusinessStatusTypeForm.vue                | 44 ++++++++-----------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
index 04f1cf5d..53f5cb8d 100644
--- a/src/views/crm/business/BusinessForm.vue
+++ b/src/views/crm/business/BusinessForm.vue
@@ -10,6 +10,7 @@
       <el-form-item label="商机名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入商机名称" />
       </el-form-item>
+      <!-- TODO 芋艿：客户列表的组件 -->
       <el-form-item label="客户名称" prop="customerName">
         <el-popover
           placement="bottom"
@@ -78,12 +79,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="商机状态" prop="statusId">
-        <el-select
-          v-model="formData.statusId"
-          placeholder="请选择商机状态"
-          clearable
-          size="small"
-        >
+        <el-select v-model="formData.statusId" placeholder="请选择商机状态" clearable size="small">
           <el-option
             v-for="item in businessStatusList"
             :key="item.id"
@@ -122,9 +118,9 @@
 <script setup lang="ts">
 import * as BusinessApi from '@/api/crm/business'
 import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
-import * as CustomerApi from "@/api/crm/customer";
+import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
-import {ElTable} from "element-plus";
+import { ElTable } from 'element-plus'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -233,10 +229,12 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-const changeBusinessStatusType = async (id) => {
-  // 加载商机状态列表
-  businessStatusList.value = await BusinessStatusTypeApi.getBusinessStatusListByTypeId(id)
+
+/** 加载商机状态列表 */
+const changeBusinessStatusType = async (typeId: number) => {
+  businessStatusList.value = await BusinessStatusTypeApi.getBusinessStatusListByTypeId(typeId)
 }
+
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
diff --git a/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
index 2ba71128..edf41966 100644
--- a/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
+++ b/src/views/crm/businessStatusType/BusinessStatusTypeForm.vue
@@ -23,22 +23,12 @@
       </el-form-item>
       <el-form-item label="状态设置" prop="statusList">
         <el-table border style="width: 100%" :data="formData.statusList">
-          <el-table-column
-             align="center"
-             label="状态"
-             width="120"
-             prop="star"
-          >
+          <el-table-column align="center" label="状态" width="120" prop="star">
             <template #default="scope">
-              <el-text>状态{{scope.$index+1}}</el-text>
+              <el-text>状态{{ scope.$index + 1 }}</el-text>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="状态名称"
-            width="120"
-            prop="name"
-          >
+          <el-table-column align="center" label="状态名称" width="120" prop="name">
             <template #default="{ row }">
               <el-input v-model="row.name" placeholder="请输入状态名称" />
             </template>
@@ -50,10 +40,13 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template #default="scope">
-              <el-button link type="primary" @click="addStatusArea(scope.$index)">
-                添加
-              </el-button>
-              <el-button link type="danger" @click="deleteStatusArea(scope.$index)" v-show="scope.$index>0">
+              <el-button link type="primary" @click="addStatusArea(scope.$index)"> 添加 </el-button>
+              <el-button
+                link
+                type="danger"
+                @click="deleteStatusArea(scope.$index)"
+                v-show="scope.$index > 0"
+              >
                 删除
               </el-button>
             </template>
@@ -69,8 +62,8 @@
 </template>
 <script setup lang="ts">
 import * as BusinessStatusTypeApi from '@/api/crm/businessStatusType'
-import {defaultProps, handleTree} from "@/utils/tree";
-import * as DeptApi from "@/api/system/dept";
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as DeptApi from '@/api/system/dept'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -86,7 +79,7 @@ const formData = ref({
   statusList: []
 })
 const formRules = reactive({
-  name: [{ required: true, message: '状态类型名不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '状态类型名不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构
@@ -94,7 +87,7 @@ const treeRef = ref() // 菜单树组件 Ref
 const checkStrictly = ref(true) // 是否严格模式，即父子不关联
 
 /** 打开弹窗 */
-const open = async (type: string,  id?: number) => {
+const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -105,7 +98,7 @@ const open = async (type: string,  id?: number) => {
     try {
       formData.value = await BusinessStatusTypeApi.getBusinessStatusType(id)
       treeRef.value.setCheckedKeys(formData.value.deptIds)
-      if(formData.value.statusList.length == 0) {
+      if (formData.value.statusList.length == 0) {
         addStatusArea(0)
       }
     } finally {
@@ -116,7 +109,6 @@ const open = async (type: string,  id?: number) => {
   }
   // 加载部门树
   deptList.value = handleTree(await DeptApi.getSimpleDeptList())
-
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -157,16 +149,18 @@ const resetForm = () => {
   treeRef.value?.setCheckedNodes([])
   formRef.value?.resetFields()
 }
+
 /** 添加状态 */
-const addStatusArea = (index) => {
+const addStatusArea = () => {
   const data = formData.value
   data.statusList.push({
     name: '',
     percent: ''
   })
 }
+
 /** 删除状态 */
-const deleteStatusArea = (index) => {
+const deleteStatusArea = (index: number) => {
   const data = formData.value
   data.statusList.splice(index, 1)
 }

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

---
 src/api/crm/customerLimitConfig/index.ts      | 14 +++
 .../index.ts                                  |  5 +-
 src/views/crm/clue/ClueForm.vue               | 18 +++-
 .../CustomerLimitConfigForm.vue               |  2 +-
 .../CustomerLimitConfigList.vue}              | 18 ++--
 .../customerLimitConfig.ts                    |  4 +
 .../crm/config/customerLimitConfig/index.vue  | 19 +++++
 .../customerPoolConfig}/index.vue             | 52 ++++++------
 .../customer/detail/CustomerDetailsTop.vue    | 85 +++++++++++++++++++
 src/views/crm/customer/detail/index.vue       | 74 +---------------
 .../customerLimitConfig/customerLimitConf.ts  | 14 ---
 src/views/crm/customerLimitConfig/index.vue   | 20 -----
 12 files changed, 181 insertions(+), 144 deletions(-)
 rename src/api/crm/{customerPoolConf => customerPoolConfig}/index.ts (67%)
 rename src/views/crm/{ => config}/customerLimitConfig/CustomerLimitConfigForm.vue (98%)
 rename src/views/crm/{customerLimitConfig/CustomerLimitConfDetails.vue => config/customerLimitConfig/CustomerLimitConfigList.vue} (87%)
 create mode 100644 src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
 create mode 100644 src/views/crm/config/customerLimitConfig/index.vue
 rename src/views/crm/{customerPoolConf => config/customerPoolConfig}/index.vue (70%)
 create mode 100644 src/views/crm/customer/detail/CustomerDetailsTop.vue
 delete mode 100644 src/views/crm/customerLimitConfig/customerLimitConf.ts
 delete mode 100644 src/views/crm/customerLimitConfig/index.vue

diff --git a/src/api/crm/customerLimitConfig/index.ts b/src/api/crm/customerLimitConfig/index.ts
index 22fde3ea..86776326 100644
--- a/src/api/crm/customerLimitConfig/index.ts
+++ b/src/api/crm/customerLimitConfig/index.ts
@@ -9,6 +9,20 @@ export interface CustomerLimitConfigVO {
   dealCountEnabled?: boolean
 }
 
+/**
+ * 客户限制配置类型
+ */
+export enum LimitConfType {
+  /**
+   * 拥有客户数限制
+   */
+  CUSTOMER_QUANTITY_LIMIT = 1,
+  /**
+   * 锁定客户数限制
+   */
+  CUSTOMER_LOCK_LIMIT = 2
+}
+
 // 查询客户限制配置列表
 export const getCustomerLimitConfigPage = async (params) => {
   return await request.get({ url: `/crm/customer-limit-config/page`, params })
diff --git a/src/api/crm/customerPoolConf/index.ts b/src/api/crm/customerPoolConfig/index.ts
similarity index 67%
rename from src/api/crm/customerPoolConf/index.ts
rename to src/api/crm/customerPoolConfig/index.ts
index 8234ba36..3cd8ef28 100644
--- a/src/api/crm/customerPoolConf/index.ts
+++ b/src/api/crm/customerPoolConfig/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { ConfigVO } from '@/api/infra/config'
 
 export interface CustomerPoolConfigVO {
   enabled?: boolean
@@ -14,6 +15,6 @@ export const getCustomerPoolConfig = async () => {
 }
 
 // 更新客户公海规则设置
-export const updateCustomerPoolConfig = async (data: ConfigVO) => {
-  return await request.put({ url: `/crm/customer-pool-config/update`, data })
+export const saveCustomerPoolConfig = async (data: ConfigVO) => {
+  return await request.put({ url: `/crm/customer-pool-config/save`, data })
 }
diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 4321f952..f0cfcab6 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,9 +10,15 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
-      <!-- TODO wanwan 客户选择 -->
       <el-form-item label="客户" prop="customerId">
-        <el-input v-model="formData.customerId" placeholder="请选择客户" />
+        <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
+          <el-option
+            v-for="item in customerList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="下次联系时间" prop="contactNextTime">
         <el-date-picker
@@ -47,6 +53,7 @@
 </template>
 <script setup lang="ts">
 import * as ClueApi from '@/api/crm/clue'
+import * as CustomerApi from '@/api/crm/customer'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -55,6 +62,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const customerList = ref([]) // 客户列表
 const formData = ref({
   id: undefined,
   name: undefined,
@@ -79,6 +87,12 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  const customerData = await CustomerApi.getCustomerPage({
+    pageNo: 1,
+    pageSize: 100,
+    pool: false
+  })
+  customerList.value = customerData.list
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
similarity index 98%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue
rename to src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
index 880106f0..e7dee69f 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
@@ -57,11 +57,11 @@
 </template>
 <script setup lang="ts">
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as UserApi from '@/api/system/user'
 import { cloneDeep } from 'lodash-es'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
similarity index 87%
rename from src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue
rename to src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
index 611bdadf..d0181421 100644
--- a/src/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue
+++ b/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
@@ -19,8 +19,16 @@
   >
     <el-table-column label="编号" align="center" prop="id" />
     <el-table-column label="规则类型" align="center" prop="type" />
-    <el-table-column label="规则适用人群" align="center" prop="userNames" />
-    <el-table-column label="规则适用部门" align="center" prop="deptNames" />
+    <el-table-column
+      label="规则适用人群"
+      align="center"
+      :formatter="(row) => row.users?.map((user: any) => user.nickname).join('，')"
+    />
+    <el-table-column
+      label="规则适用部门"
+      align="center"
+      :formatter="(row) => row.depts?.map((dept: any) => dept.name).join('，')"
+    />
     <el-table-column
       :label="
         confType === LimitConfType.CUSTOMER_QUANTITY_LIMIT ? '拥有客户数上限' : '锁定客户数上限'
@@ -80,11 +88,11 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import CustomerLimitConfigForm from '@/views/crm/customerLimitConfig/CustomerLimitConfigForm.vue'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
+import CustomerLimitConfigForm from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
 
-defineOptions({ name: 'CustomerLimitConfDetails' })
+defineOptions({ name: 'CustomerLimitConfigList' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
diff --git a/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
new file mode 100644
index 00000000..7584849a
--- /dev/null
+++ b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
@@ -0,0 +1,4 @@
+// TODO 可以挪到它对应的 api.ts 文件里哈
+/**
+ * 客户限制配置类型
+ */
diff --git a/src/views/crm/config/customerLimitConfig/index.vue b/src/views/crm/config/customerLimitConfig/index.vue
new file mode 100644
index 00000000..d385f46b
--- /dev/null
+++ b/src/views/crm/config/customerLimitConfig/index.vue
@@ -0,0 +1,19 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs>
+      <el-tab-pane label="拥有客户数限制">
+        <CustomerLimitConfigList :confType="LimitConfType.CUSTOMER_QUANTITY_LIMIT" />
+      </el-tab-pane>
+      <el-tab-pane label="锁定客户数限制">
+        <CustomerLimitConfigList :confType="LimitConfType.CUSTOMER_LOCK_LIMIT" />
+      </el-tab-pane>
+    </el-tabs>
+  </ContentWrap>
+</template>
+<script setup lang="ts">
+import CustomerLimitConfigList from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue'
+import { LimitConfType } from '@/api/crm/customerLimitConfig'
+
+defineOptions({ name: 'CrmCustomerLimitConfig' })
+</script>
diff --git a/src/views/crm/customerPoolConf/index.vue b/src/views/crm/config/customerPoolConfig/index.vue
similarity index 70%
rename from src/views/crm/customerPoolConf/index.vue
rename to src/views/crm/config/customerPoolConfig/index.vue
index 5fa98711..c7db3301 100644
--- a/src/views/crm/customerPoolConf/index.vue
+++ b/src/views/crm/config/customerPoolConfig/index.vue
@@ -23,7 +23,7 @@
         </template>
         <!-- 表单 -->
         <el-form-item label="客户公海规则设置" prop="enabled">
-          <el-radio-group v-model="formData.enabled" class="ml-4">
+          <el-radio-group v-model="formData.enabled" @change="changeEnable" class="ml-4">
             <el-radio :label="false" size="large">不启用</el-radio>
             <el-radio :label="true" size="large">启用</el-radio>
           </el-radio-group>
@@ -36,7 +36,11 @@
             天未成交
           </el-form-item>
           <el-form-item label="提前提醒设置" prop="notifyEnabled">
-            <el-radio-group v-model="formData.notifyEnabled" class="ml-4">
+            <el-radio-group
+              v-model="formData.notifyEnabled"
+              @change="changeNotifyEnable"
+              class="ml-4"
+            >
               <el-radio :label="false" size="large">不提醒</el-radio>
               <el-radio :label="true" size="large">提醒</el-radio>
             </el-radio-group>
@@ -52,11 +56,10 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import * as CustomerPoolConfApi from '@/api/crm/customerPoolConf'
+import * as CustomerPoolConfigApi from '@/api/crm/customerPoolConfig'
 import { CardTitle } from '@/components/Card'
 
-// TODO @wanwan：CustomerPoolConf =》 CustomerPoolConfig；另外，我们在 crm 目录下，新建一个 config 目录，然后把 customerPoolConfig 和 customerLimitConfig 都挪进
-defineOptions({ name: 'CustomerPoolConf' })
+defineOptions({ name: 'CrmCustomerPoolConfig' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -78,7 +81,7 @@ const formRef = ref() // 表单 Ref
 const getConfig = async () => {
   try {
     formLoading.value = true
-    const data = await CustomerPoolConfApi.getCustomerPoolConfig()
+    const data = await CustomerPoolConfigApi.getCustomerPoolConfig()
     if (data === null) {
       return
     }
@@ -97,8 +100,8 @@ const onSubmit = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as CustomerPoolConfApi.CustomerPoolConfigVO
-    await CustomerPoolConfApi.updateCustomerPoolConfig(data)
+    const data = formData.value as unknown as CustomerPoolConfigApi.CustomerPoolConfigVO
+    await CustomerPoolConfigApi.saveCustomerPoolConfig(data)
     message.success(t('common.updateSuccess'))
     await getConfig()
     formLoading.value = false
@@ -107,27 +110,22 @@ const onSubmit = async () => {
   }
 }
 
-// TODO @wanwan：el-radio-group 选择后，触发会不会更好哈；
-watch(
-  () => formData.value.enabled,
-  (val: boolean) => {
-    if (!val) {
-      formData.value.contactExpireDays = undefined
-      formData.value.dealExpireDays = undefined
-      formData.value.notifyEnabled = false
-      formData.value.notifyDays = undefined
-    }
+/** 更改客户公海规则设置 */
+const changeEnable = () => {
+  if (!formData.value.enabled) {
+    formData.value.contactExpireDays = undefined
+    formData.value.dealExpireDays = undefined
+    formData.value.notifyEnabled = false
+    formData.value.notifyDays = undefined
   }
-)
-// TODO @wanwan：el-radio-group 选择后，触发会不会更好哈；
-watch(
-  () => formData.value.notifyEnabled,
-  (val: boolean) => {
-    if (!val) {
-      formData.value.notifyDays = undefined
-    }
+}
+
+/** 更改提前提醒设置 */
+const changeNotifyEnable = () => {
+  if (!formData.value.notifyEnabled) {
+    formData.value.notifyDays = undefined
   }
-)
+}
 
 onMounted(() => {
   getConfig()
diff --git a/src/views/crm/customer/detail/CustomerDetailsTop.vue b/src/views/crm/customer/detail/CustomerDetailsTop.vue
new file mode 100644
index 00000000..509d0a27
--- /dev/null
+++ b/src/views/crm/customer/detail/CustomerDetailsTop.vue
@@ -0,0 +1,85 @@
+<template>
+  <div v-loading="loading">
+    <div class="flex items-start justify-between">
+      <div>
+        <!-- 左上：客户基本信息 -->
+        <CustomerBasicInfo :customer="customer" />
+      </div>
+      <div>
+        <!-- 右上：按钮 -->
+        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
+          编辑
+        </el-button>
+        <el-button>更改成交状态</el-button>
+      </div>
+    </div>
+    <el-row class="mt-10px">
+      <el-button>
+        <Icon class="mr-5px" icon="ph:calendar-fill" />
+        创建任务
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="carbon:email" />
+        发送邮件
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="system-uicons:contacts" />
+        创建联系人
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="ep:opportunity" />
+        创建商机
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="clarity:contract-line" />
+        创建合同
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="icon-park:income-one" />
+        创建回款
+      </el-button>
+      <el-button>
+        <Icon class="mr-5px" icon="fluent:people-team-add-20-filled" />
+        添加团队成员
+      </el-button>
+    </el-row>
+  </div>
+  <ContentWrap class="mt-10px">
+    <el-descriptions :column="5" direction="vertical">
+      <el-descriptions-item label="客户级别">
+        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
+      </el-descriptions-item>
+      <el-descriptions-item label="成交状态">
+        {{ customer.dealStatus ? '已成交' : '未成交' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        {{ customer.ownerUserName }}
+      </el-descriptions-item>
+      <!-- TODO wanwan 首要联系人? -->
+      <el-descriptions-item label="首要联系人" />
+      <!-- TODO wanwan 首要联系人电话? -->
+      <el-descriptions-item label="首要联系人电话">
+        {{ customer.mobile }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CustomerForm ref="formRef" @success="emit('refresh')" />
+</template>
+<script setup lang="ts">
+import * as CustomerApi from '@/api/crm/customer'
+import { DICT_TYPE } from '@/utils/dict'
+import CustomerBasicInfo from '@/views/crm/customer/detail/CustomerBasicInfo.vue'
+import CustomerForm from '@/views/crm/customer/CustomerForm.vue'
+
+const { customer, loading } = defineProps<{ customer: CustomerApi.CustomerVO; loading: boolean }>()
+
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+const formRef = ref()
+
+const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
+</script>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index c88137fa..59b18c5b 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -1,69 +1,5 @@
 <template>
-  <!-- TODO @wanwan：要不要把上面这一整块，搞成一个组件，就是把 下面 + Details + BasitcInfo 合并成一个 -->
-  <div v-loading="loading">
-    <div class="flex items-start justify-between">
-      <div>
-        <!-- 左上：客户基本信息 -->
-        <CustomerBasicInfo :customer="customer" />
-      </div>
-      <div>
-        <!-- 右上：按钮 -->
-        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
-          编辑
-        </el-button>
-        <el-button>更改成交状态</el-button>
-      </div>
-    </div>
-    <el-row class="mt-10px">
-      <el-button>
-        <Icon class="mr-5px" icon="ph:calendar-fill" />
-        创建任务
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="carbon:email" />
-        发送邮件
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="system-uicons:contacts" />
-        创建联系人
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="ep:opportunity" />
-        创建商机
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="clarity:contract-line" />
-        创建合同
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="icon-park:income-one" />
-        创建回款
-      </el-button>
-      <el-button>
-        <Icon class="mr-5px" icon="fluent:people-team-add-20-filled" />
-        添加团队成员
-      </el-button>
-    </el-row>
-  </div>
-  <ContentWrap class="mt-10px">
-    <el-descriptions :column="5" direction="vertical">
-      <el-descriptions-item label="客户级别">
-        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
-      </el-descriptions-item>
-      <el-descriptions-item label="成交状态">
-        {{ customer.dealStatus ? '已成交' : '未成交' }}
-      </el-descriptions-item>
-      <el-descriptions-item label="负责人">
-        {{ customer.ownerUserName }}
-      </el-descriptions-item>
-      <!-- TODO wanwan 首要联系人? -->
-      <el-descriptions-item label="首要联系人" />
-      <!-- TODO wanwan 首要联系人电话? -->
-      <el-descriptions-item label="首要联系人电话">
-        {{ customer.mobile }}
-      </el-descriptions-item>
-    </el-descriptions>
-  </ContentWrap>
+  <CustomerDetailsTop :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -107,9 +43,6 @@
       <el-tab-pane label="发票" lazy> 发票</el-tab-pane>
     </el-tabs>
   </el-col>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <CustomerForm ref="formRef" @success="getCustomerData(id)" />
 </template>
 
 <script lang="ts" setup>
@@ -145,11 +78,6 @@ const getCustomerData = async (id: number) => {
   }
 }
 
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
 /**
  * 初始化
  */
diff --git a/src/views/crm/customerLimitConfig/customerLimitConf.ts b/src/views/crm/customerLimitConfig/customerLimitConf.ts
deleted file mode 100644
index 1336e137..00000000
--- a/src/views/crm/customerLimitConfig/customerLimitConf.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO 可以挪到它对应的 api.ts 文件里哈
-/**
- * 客户限制配置类型
- */
-export enum LimitConfType {
-  /**
-   * 拥有客户数限制
-   */
-  CUSTOMER_QUANTITY_LIMIT = 1,
-  /**
-   * 锁定客户数限制
-   */
-  CUSTOMER_LOCK_LIMIT = 2
-}
diff --git a/src/views/crm/customerLimitConfig/index.vue b/src/views/crm/customerLimitConfig/index.vue
deleted file mode 100644
index 1bccf4d3..00000000
--- a/src/views/crm/customerLimitConfig/index.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-tabs>
-      <el-tab-pane label="拥有客户数限制">
-        <!-- TODO @wanwan：CustomerLimitConfigList，因为它是列表哈 -->
-        <CustomerLimitConfDetails :confType="LimitConfType.CUSTOMER_QUANTITY_LIMIT" />
-      </el-tab-pane>
-      <el-tab-pane label="锁定客户数限制">
-        <CustomerLimitConfDetails :confType="LimitConfType.CUSTOMER_LOCK_LIMIT" />
-      </el-tab-pane>
-    </el-tabs>
-  </ContentWrap>
-</template>
-<script setup lang="ts">
-import CustomerLimitConfDetails from '@/views/crm/customerLimitConfig/CustomerLimitConfDetails.vue'
-import { LimitConfType } from '@/views/crm/customerLimitConfig/customerLimitConf'
-
-defineOptions({ name: 'CrmCustomerLimitConfig' })
-</script>

From 24773a6eaae8bcd91c83de5c1753c26b20725f27 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 26 Nov 2023 20:18:33 +0800
Subject: [PATCH 10/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/clue/ClueForm.vue                  |  1 +
 .../customerLimitConfig/customerLimitConfig.ts   |  4 ----
 .../crm/customer/detail/CustomerBasicInfo.vue    |  4 +++-
 .../crm/customer/detail/CustomerDetails.vue      |  4 +++-
 ...rDetailsTop.vue => CustomerDetailsHeader.vue} | 16 ++++++++++------
 src/views/crm/customer/detail/index.vue          |  4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
 rename src/views/crm/customer/detail/{CustomerDetailsTop.vue => CustomerDetailsHeader.vue} (90%)

diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index f0cfcab6..1b2637c9 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,6 +10,7 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
+      <!-- TODO 芋艿：后续客户的选择 -->
       <el-form-item label="客户" prop="customerId">
         <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
           <el-option
diff --git a/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts b/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
deleted file mode 100644
index 7584849a..00000000
--- a/src/views/crm/config/customerLimitConfig/customerLimitConfig.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO 可以挪到它对应的 api.ts 文件里哈
-/**
- * 客户限制配置类型
- */
diff --git a/src/views/crm/customer/detail/CustomerBasicInfo.vue b/src/views/crm/customer/detail/CustomerBasicInfo.vue
index 86f9c9d7..2542b006 100644
--- a/src/views/crm/customer/detail/CustomerBasicInfo.vue
+++ b/src/views/crm/customer/detail/CustomerBasicInfo.vue
@@ -12,5 +12,7 @@
 <script setup lang="ts">
 import * as CustomerApi from '@/api/crm/customer'
 
-const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
+const { customer } = defineProps<{
+  customer: CustomerApi.CustomerVO
+}>()
 </script>
diff --git a/src/views/crm/customer/detail/CustomerDetails.vue b/src/views/crm/customer/detail/CustomerDetails.vue
index 67beae94..f7c92ca2 100644
--- a/src/views/crm/customer/detail/CustomerDetails.vue
+++ b/src/views/crm/customer/detail/CustomerDetails.vue
@@ -87,7 +87,9 @@ import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 
-const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
+const { customer } = defineProps<{
+  customer: CustomerApi.CustomerVO
+}>()
 
 // 展示的折叠面板
 const activeNames = ref(['basicInfo', 'systemInfo'])
diff --git a/src/views/crm/customer/detail/CustomerDetailsTop.vue b/src/views/crm/customer/detail/CustomerDetailsHeader.vue
similarity index 90%
rename from src/views/crm/customer/detail/CustomerDetailsTop.vue
rename to src/views/crm/customer/detail/CustomerDetailsHeader.vue
index 509d0a27..6e14c829 100644
--- a/src/views/crm/customer/detail/CustomerDetailsTop.vue
+++ b/src/views/crm/customer/detail/CustomerDetailsHeader.vue
@@ -7,7 +7,7 @@
       </div>
       <div>
         <!-- 右上：按钮 -->
-        <el-button v-hasPermi="['crm:customer:update']" @click="openForm('update', customer.id)">
+        <el-button v-hasPermi="['crm:customer:update']" @click="openForm(customer.id)">
           编辑
         </el-button>
         <el-button>更改成交状态</el-button>
@@ -70,16 +70,20 @@
 <script setup lang="ts">
 import * as CustomerApi from '@/api/crm/customer'
 import { DICT_TYPE } from '@/utils/dict'
+// TODO @wanwan：是不是把 CustomerBasicInfo 也放进来。
 import CustomerBasicInfo from '@/views/crm/customer/detail/CustomerBasicInfo.vue'
 import CustomerForm from '@/views/crm/customer/CustomerForm.vue'
 
-const { customer, loading } = defineProps<{ customer: CustomerApi.CustomerVO; loading: boolean }>()
-
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
+const { customer, loading } = defineProps<{
+  customer: CustomerApi.CustomerVO
+  loading: boolean
+}>()
 
+/** 修改操作 */
 const formRef = ref()
+const openForm = (id?: number) => {
+  formRef.value.open('update', id)
+}
 
 const emit = defineEmits(['refresh']) // 定义 success 事件，用于操作成功后的回调
 </script>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 59b18c5b..e6c9e9a9 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <CustomerDetailsTop :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
+  <CustomerDetailsHeader :customer="customer" :loading="loading" @refresh="getCustomerData(id)" />
   <el-col>
     <el-tabs>
       <el-tab-pane label="详细资料">
@@ -66,7 +66,7 @@ const loading = ref(true) // 加载中
 /**
  * 获取详情
  *
- * @param id
+ * @param id 客户编号
  */
 const customer = ref<CustomerApi.CustomerVO>({} as CustomerApi.CustomerVO) // 客户详情
 const getCustomerData = async (id: number) => {

From 1ba450103eb59eb3dfa7682857e48c6ce6fb5659 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 27 Nov 2023 20:33:53 +0800
Subject: [PATCH 11/11] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contact/index.ts                  |  12 +-
 src/api/crm/customer/index.ts                 |   5 +-
 src/views/crm/contact/ContactForm.vue         | 124 +++++++++++++-----
 .../crm/contact/detail/ContactDetails.vue     |   7 -
 4 files changed, 100 insertions(+), 48 deletions(-)

diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index e980d361..de4710e8 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -1,10 +1,3 @@
-/*
- * @Author: zyna
- * @Date: 2023-11-05 13:34:41
- * @LastEditTime: 2023-11-26 20:47:04
- * @FilePath: \yudao-ui-admin-vue3\src\api\crm\contact\index.ts
- * @Description:
- */
 import request from '@/config/axios'
 
 export interface ContactVO {
@@ -28,8 +21,8 @@ export interface ContactVO {
   creatorName: string
   updateTime?: Date
   createTime?: Date
-  customerName: string,
-  areaName: string,
+  customerName: string
+  areaName: string
   ownerUserName: string
 }
 
@@ -62,6 +55,7 @@ export const deleteContact = async (id: number) => {
 export const exportContact = async (params) => {
   return await request.download({ url: `/crm/contact/export-excel`, params })
 }
+
 export const simpleAllList = async () => {
   return await request.get({ url: `/crm/contact/simple-all-list` })
 }
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index 30d8981a..5ef43950 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -62,7 +62,8 @@ export const deleteCustomer = async (id: number) => {
 export const exportCustomer = async (params) => {
   return await request.download({ url: `/crm/customer/export-excel`, params })
 }
-//客户列表
+
+// 客户列表
 export const queryAllList = async () => {
   return await request.get({ url: `/crm/customer/query-all-list` })
-}
\ No newline at end of file
+}
diff --git a/src/views/crm/contact/ContactForm.vue b/src/views/crm/contact/ContactForm.vue
index 288539fc..a71c44ae 100644
--- a/src/views/crm/contact/ContactForm.vue
+++ b/src/views/crm/contact/ContactForm.vue
@@ -1,6 +1,12 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" :width="820">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="110px" v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+      v-loading="formLoading"
+    >
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="姓名" prop="name">
@@ -9,8 +15,18 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="负责人" prop="ownerUserId">
-            <el-select v-model="formData.ownerUserId" placeholder="请选择负责人" value-key="id" lable-key="nickname">
-              <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
+            <el-select
+              v-model="formData.ownerUserId"
+              placeholder="请选择负责人"
+              value-key="id"
+              lable-key="nickname"
+            >
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -18,23 +34,41 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="客户名称" prop="customerName">
-            <el-select v-model="formData.customerId" placeholder="请选择客户" value-key="id" lable-key="name">
-              <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="formData.customerId"
+              placeholder="请选择客户"
+              value-key="id"
+              lable-key="name"
+            >
+              <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="sex">
+        <el-col :span="12"
+          ><el-form-item label="性别" prop="sex">
             <el-select v-model="formData.sex" placeholder="请选择">
               <el-option
-v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
-                :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item></el-col>
+                v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select> </el-form-item
+        ></el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号" prop="mobile">
-            <el-input input-style="width:190px;" v-model="formData.mobile" placeholder="请输入手机号" />
+            <el-input
+              input-style="width:190px;"
+              v-model="formData.mobile"
+              placeholder="请输入手机号"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -46,7 +80,11 @@ v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
       <el-row>
         <el-col :span="12">
           <el-form-item label="邮箱" prop="email">
-            <el-input input-style="width:190px;" v-model="formData.email" placeholder="请输入邮箱" />
+            <el-input
+              input-style="width:190px;"
+              v-model="formData.email"
+              placeholder="请输入邮箱"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -58,11 +96,21 @@ v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
       <el-row>
         <el-col :span="12">
           <el-form-item label="微信" prop="wechat">
-            <el-input input-style="width:190px;" v-model="formData.wechat" placeholder="请输入微信" />
+            <el-input
+              input-style="width:190px;"
+              v-model="formData.wechat"
+              placeholder="请输入微信"
+            />
           </el-form-item>
         </el-col>
-        <el-col :span="12"> <el-form-item label="下次联系时间" prop="nextTime">
-            <el-date-picker v-model="formData.nextTime" type="date" value-format="x" placeholder="选择下次联系时间" />
+        <el-col :span="12">
+          <el-form-item label="下次联系时间" prop="nextTime">
+            <el-date-picker
+              v-model="formData.nextTime"
+              type="date"
+              value-format="x"
+              placeholder="选择下次联系时间"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -70,35 +118,50 @@ v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
         <el-col :span="12">
           <el-form-item label="所在地" prop="areaId">
             <el-tree-select
-v-model="formData.areaId" :data="areaList" :props="defaultProps"
-              :render-after-expand="true" />
+              v-model="formData.areaId"
+              :data="areaList"
+              :props="defaultProps"
+              :render-after-expand="true"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="地址" prop="address">
-            <el-input input-style="width:190px;" v-model="formData.address" placeholder="请输入地址" />
+            <el-input
+              input-style="width:190px;"
+              v-model="formData.address"
+              placeholder="请输入地址"
+            />
           </el-form-item>
-        </el-col>
-      </el-row><el-row>
+        </el-col> </el-row
+      ><el-row>
         <el-col :span="12">
           <el-form-item label="直属上级" prop="parentId">
             <el-select v-model="formData.parentId" placeholder="请选择">
               <el-option
-v-for="item in allContactList" :key="item.id" :label="item.name" :value="item.id"
-                :disabled="item.id == formData.id" />
+                v-for="item in allContactList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.id == formData.id"
+              />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12"> <el-form-item label="职位" prop="post">
+        <el-col :span="12">
+          <el-form-item label="职位" prop="post">
             <el-input input-style="width:190px;" v-model="formData.post" placeholder="请输入职位" />
           </el-form-item>
-        </el-col>
-      </el-row><el-row>
-        <el-col :span="12"><el-form-item label="是否关键决策人" prop="master" style="width: 400px">
+        </el-col> </el-row
+      ><el-row>
+        <el-col :span="12"
+          ><el-form-item label="是否关键决策人" prop="master" style="width: 400px">
             <el-radio-group v-model="formData.master">
               <el-radio
-v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value"
-                :label="dict.value">
+                v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+                :key="dict.value"
+                :label="dict.value"
+              >
                 {{ dict.label }}
               </el-radio>
             </el-radio-group>
@@ -106,7 +169,8 @@ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.va
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="24"><el-form-item label="备注" prop="remark">
+        <el-col :span="24"
+          ><el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" placeholder="请输入备注" />
           </el-form-item>
         </el-col>
@@ -123,7 +187,6 @@ import * as ContactApi from '@/api/crm/contact'
 import { DICT_TYPE, getIntDictOptions, getBoolDictOptions } from '@/utils/dict'
 import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
-import { ElTable } from 'element-plus'
 import * as AreaApi from '@/api/system/area'
 import { defaultProps } from '@/utils/tree'
 
@@ -163,6 +226,7 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const ownerUserList = ref<any[]>([])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+// TODO 芋艿：统一的客户选择面板
 const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
 const allContactList = ref([]) // 所有联系人列表
 /** 打开弹窗 */
diff --git a/src/views/crm/contact/detail/ContactDetails.vue b/src/views/crm/contact/detail/ContactDetails.vue
index de31306e..3aa111bd 100644
--- a/src/views/crm/contact/detail/ContactDetails.vue
+++ b/src/views/crm/contact/detail/ContactDetails.vue
@@ -1,10 +1,3 @@
-<!--
- * @Author: zyna
- * @Date: 2023-11-26 10:39:46
- * @LastEditTime: 2023-11-26 20:43:43
- * @FilePath: \yudao-ui-admin-vue3\src\views\crm\contact\detail\ContactDetails.vue
- * @Description: 
--->
 <template>
   <el-collapse v-model="activeNames">
     <el-collapse-item name="basicInfo">