From d71097ac313e267f426d1e81d14f0ffc55304b84 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 3 Jan 2024 20:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=96=20CRM=EF=BC=9A=E3=80=90=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E9=85=8D=E7=BD=AE=E3=80=91=E8=B0=83=E6=95=B4=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../limitConfig}/index.ts                      |  0
 .../poolConfig}/index.ts                       |  5 ++---
 .../limitConfig}/CustomerLimitConfigForm.vue   | 18 +++++++++---------
 .../limitConfig}/CustomerLimitConfigList.vue   | 14 +++++---------
 .../limitConfig}/index.vue                     |  4 ++--
 .../poolConfig}/index.vue                      | 10 +++++-----
 6 files changed, 23 insertions(+), 28 deletions(-)
 rename src/api/crm/{customerLimitConfig => customer/limitConfig}/index.ts (100%)
 rename src/api/crm/{customerPoolConfig => customer/poolConfig}/index.ts (77%)
 rename src/views/crm/{config/customerLimitConfig => customer/limitConfig}/CustomerLimitConfigForm.vue (94%)
 rename src/views/crm/{config/customerLimitConfig => customer/limitConfig}/CustomerLimitConfigList.vue (88%)
 rename src/views/crm/{config/customerLimitConfig => customer/limitConfig}/index.vue (74%)
 rename src/views/crm/{config/customerPoolConfig => customer/poolConfig}/index.vue (94%)

diff --git a/src/api/crm/customerLimitConfig/index.ts b/src/api/crm/customer/limitConfig/index.ts
similarity index 100%
rename from src/api/crm/customerLimitConfig/index.ts
rename to src/api/crm/customer/limitConfig/index.ts
diff --git a/src/api/crm/customerPoolConfig/index.ts b/src/api/crm/customer/poolConfig/index.ts
similarity index 77%
rename from src/api/crm/customerPoolConfig/index.ts
rename to src/api/crm/customer/poolConfig/index.ts
index 3cd8ef28..b96e61fc 100644
--- a/src/api/crm/customerPoolConfig/index.ts
+++ b/src/api/crm/customer/poolConfig/index.ts
@@ -1,12 +1,11 @@
 import request from '@/config/axios'
-import { ConfigVO } from '@/api/infra/config'
 
 export interface CustomerPoolConfigVO {
   enabled?: boolean
   contactExpireDays?: number
   dealExpireDays?: number
   notifyEnabled?: boolean
-  notifyDays: number
+  notifyDays?: number
 }
 
 // 获取客户公海规则设置
@@ -15,6 +14,6 @@ export const getCustomerPoolConfig = async () => {
 }
 
 // 更新客户公海规则设置
-export const saveCustomerPoolConfig = async (data: ConfigVO) => {
+export const saveCustomerPoolConfig = async (data: CustomerPoolConfigVO) => {
   return await request.put({ url: `/crm/customer-pool-config/save`, data })
 }
diff --git a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue b/src/views/crm/customer/limitConfig/CustomerLimitConfigForm.vue
similarity index 94%
rename from src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
rename to src/views/crm/customer/limitConfig/CustomerLimitConfigForm.vue
index da37e556..218462fb 100644
--- a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue
+++ b/src/views/crm/customer/limitConfig/CustomerLimitConfigForm.vue
@@ -56,12 +56,12 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
+import * as CustomerLimitConfigApi from '@/api/crm/customer/limitConfig'
 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'
+import { LimitConfType } from '@/api/crm/customer/limitConfig'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -72,7 +72,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  type: undefined,
+  type: LimitConfType.CUSTOMER_LOCK_LIMIT, // 给个默认值，避免 IDE 报错
   userIds: undefined,
   deptIds: undefined,
   maxCount: undefined,
@@ -88,15 +88,11 @@ const deptTree = ref() // 部门树形结构
 const userTree = ref() // 用户树形结构
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number, limitConfType?: LimitConfType) => {
+const open = async (type: string, limitConfType: LimitConfType, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  // 获得部门树
-  await getDeptTree()
-  // 获得用户
-  await getUserTree()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -108,6 +104,10 @@ const open = async (type: string, id?: number, limitConfType?: LimitConfType) =>
   } else {
     formData.value.type = limitConfType
   }
+  // 获得部门树
+  await getDeptTree()
+  // 获得用户
+  await getUserTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -141,7 +141,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    type: undefined,
+    type: LimitConfType.CUSTOMER_LOCK_LIMIT,
     userIds: undefined,
     deptIds: undefined,
     maxCount: undefined,
diff --git a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue b/src/views/crm/customer/limitConfig/CustomerLimitConfigList.vue
similarity index 88%
rename from src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
rename to src/views/crm/customer/limitConfig/CustomerLimitConfigList.vue
index d0181421..d229d6d3 100644
--- a/src/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue
+++ b/src/views/crm/customer/limitConfig/CustomerLimitConfigList.vue
@@ -1,7 +1,5 @@
 <template>
-  <el-button type="primary" plain @click="handleQuery">
-    <Icon icon="ep:refresh" class="mr-5px" /> 刷新
-  </el-button>
+  <el-button plain @click="handleQuery"> <Icon icon="ep:refresh" class="mr-5px" /> 刷新 </el-button>
   <el-button
     type="primary"
     plain
@@ -87,10 +85,10 @@
 </template>
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import * as CustomerLimitConfigApi from '@/api/crm/customerLimitConfig'
-import CustomerLimitConfigForm from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigForm.vue'
+import * as CustomerLimitConfigApi from '@/api/crm/customer/limitConfig'
+import CustomerLimitConfigForm from './CustomerLimitConfigForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
-import { LimitConfType } from '@/api/crm/customerLimitConfig'
+import { LimitConfType } from '@/api/crm/customer/limitConfig'
 
 defineOptions({ name: 'CustomerLimitConfigList' })
 
@@ -107,8 +105,6 @@ const queryParams = reactive({
   pageSize: 10,
   type: confType
 })
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 
 /** 查询列表 */
 const getList = async () => {
@@ -125,7 +121,7 @@ const getList = async () => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id, confType)
+  formRef.value.open(type, confType, id)
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/crm/config/customerLimitConfig/index.vue b/src/views/crm/customer/limitConfig/index.vue
similarity index 74%
rename from src/views/crm/config/customerLimitConfig/index.vue
rename to src/views/crm/customer/limitConfig/index.vue
index d385f46b..15ca1b43 100644
--- a/src/views/crm/config/customerLimitConfig/index.vue
+++ b/src/views/crm/customer/limitConfig/index.vue
@@ -12,8 +12,8 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import CustomerLimitConfigList from '@/views/crm/config/customerLimitConfig/CustomerLimitConfigList.vue'
-import { LimitConfType } from '@/api/crm/customerLimitConfig'
+import CustomerLimitConfigList from './CustomerLimitConfigList.vue'
+import { LimitConfType } from '@/api/crm/customer/limitConfig'
 
 defineOptions({ name: 'CrmCustomerLimitConfig' })
 </script>
diff --git a/src/views/crm/config/customerPoolConfig/index.vue b/src/views/crm/customer/poolConfig/index.vue
similarity index 94%
rename from src/views/crm/config/customerPoolConfig/index.vue
rename to src/views/crm/customer/poolConfig/index.vue
index c7db3301..39a5f340 100644
--- a/src/views/crm/config/customerPoolConfig/index.vue
+++ b/src/views/crm/customer/poolConfig/index.vue
@@ -56,7 +56,7 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import * as CustomerPoolConfigApi from '@/api/crm/customerPoolConfig'
+import * as CustomerPoolConfigApi from '@/api/crm/customer/poolConfig'
 import { CardTitle } from '@/components/Card'
 
 defineOptions({ name: 'CrmCustomerPoolConfig' })
@@ -67,10 +67,10 @@ const { t } = useI18n() // 国际化
 const formLoading = ref(false)
 const formData = ref({
   enabled: false,
-  contactExpireDays: 0,
-  dealExpireDays: 0,
+  contactExpireDays: undefined,
+  dealExpireDays: undefined,
   notifyEnabled: false,
-  notifyDays: 0
+  notifyDays: undefined
 })
 const formRules = reactive({
   enabled: [{ required: true, message: '是否启用客户公海不能为空', trigger: 'blur' }]
@@ -100,7 +100,7 @@ const onSubmit = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as CustomerPoolConfigApi.CustomerPoolConfigVO
+    const data = formData.value as CustomerPoolConfigApi.CustomerPoolConfigVO
     await CustomerPoolConfigApi.saveCustomerPoolConfig(data)
     message.success(t('common.updateSuccess'))
     await getConfig()