Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

src/api/crm/business/index.ts

@@ -0,0 +1,57 @@
+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
+}
+
+// 查询 CRM 商机列表
+export const getBusinessPage = async (params) => {
+  return await request.get({ url: `/crm/business/page`, params })
+}
+
+// 查询 CRM 商机列表，基于指定客户
+export const getBusinessPageByCustomer = async (params) => {
+  return await request.get({ url: `/crm/business/page-by-customer`, params })
+}
+
+// 查询 CRM 商机详情
+export const getBusiness = async (id: number) => {
+  return await request.get({ url: `/crm/business/get?id=` + id })
+}
+
+// 新增 CRM 商机
+export const createBusiness = async (data: BusinessVO) => {
+  return await request.post({ url: `/crm/business/create`, data })
+}
+
+// 修改 CRM 商机
+export const updateBusiness = async (data: BusinessVO) => {
+  return await request.put({ url: `/crm/business/update`, data })
+}
+
+// 删除 CRM 商机
+export const deleteBusiness = async (id: number) => {
+  return await request.delete({ url: `/crm/business/delete?id=` + id })
+}
+
+// 导出 CRM 商机 Excel
+export const exportBusiness = async (params) => {
+  return await request.download({ url: `/crm/business/export-excel`, params })
+}

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 })
+}

src/api/crm/contact/index.ts

@@ -1,10 +1,3 @@
-/*
- * @Author: zyna
- * @Date: 2023-11-05 13:34:41
- * @LastEditTime: 2023-11-11 16:20:19
- * @FilePath: \yudao-ui-admin-vue3\src\api\crm\contact\index.ts
- * @Description:
- */
 import request from '@/config/axios'
 
 export interface ContactVO {
@@ -22,44 +15,53 @@ export interface ContactVO {
   id: number
   parentId: number
   qq: number
-  webchat: string
+  wechat: string
   sex: number
-  policyMakers: boolean
+  master: boolean
   creatorName: string
   updateTime?: Date
   createTime?: Date
   customerName: string
+  areaName: string
+  ownerUserName: string
 }
 
-// 查询crm联系人列表
+// 查询 CRM 联系人列表
 export const getContactPage = async (params) => {
   return await request.get({ url: `/crm/contact/page`, params })
 }
 
-// 查询crm联系人详情
+// 查询 CRM 联系人列表，基于指定客户
+export const getContactPageByCustomer = async (params: any) => {
+  return await request.get({ url: `/crm/contact/page-by-customer`, params })
+}
+
+// 查询 CRM 联系人详情
 export const getContact = async (id: number) => {
   return await request.get({ url: `/crm/contact/get?id=` + id })
 }
 
-// 新增crm联系人
+// 新增 CRM 联系人
 export const createContact = async (data: ContactVO) => {
   return await request.post({ url: `/crm/contact/create`, data })
 }
 
-// 修改crm联系人
+// 修改 CRM 联系人
 export const updateContact = async (data: ContactVO) => {
   return await request.put({ url: `/crm/contact/update`, data })
 }
 
-// 删除crm联系人
+// 删除 CRM 联系人
 export const deleteContact = async (id: number) => {
   return await request.delete({ url: `/crm/contact/delete?id=` + id })
 }
 
-// 导出crm联系人 Excel
+// 导出 CRM 联系人 Excel
 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/simpleAlllist` })
+
+// 获得 CRM 联系人列表（精简）
+export const getSimpleContactList = async () => {
+  return await request.get({ url: `/crm/contact/simple-all-list` })
 }

src/api/crm/contract/index.ts

@@ -22,32 +22,37 @@ export interface ContractVO {
   remark: string
 }
 
-// 查询合同列表
+// 查询 CRM 合同列表
 export const getContractPage = async (params) => {
   return await request.get({ url: `/crm/contract/page`, params })
 }
 
-// 查询合同详情
+// 查询 CRM 联系人列表，基于指定客户
+export const getContractPageByCustomer = async (params: any) => {
+  return await request.get({ url: `/crm/contract/page-by-customer`, params })
+}
+
+// 查询 CRM 合同详情
 export const getContract = async (id: number) => {
   return await request.get({ url: `/crm/contract/get?id=` + id })
 }
 
-// 新增合同
+// 新增 CRM 合同
 export const createContract = async (data: ContractVO) => {
   return await request.post({ url: `/crm/contract/create`, data })
 }
 
-// 修改合同
+// 修改 CRM 合同
 export const updateContract = async (data: ContractVO) => {
   return await request.put({ url: `/crm/contract/update`, data })
 }
 
-// 删除合同
+// 删除 CRM 合同
 export const deleteContract = async (id: number) => {
   return await request.delete({ url: `/crm/contract/delete?id=` + id })
 }
 
-// 导出合同 Excel
+// 导出 CRM 合同 Excel
 export const exportContract = async (params) => {
   return await request.download({ url: `/crm/contract/export-excel`, params })
 }

src/api/crm/customer/index.ts

@@ -62,3 +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` })
+}

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 })

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 })
 }

src/api/crm/permission/index.ts

@@ -12,36 +12,60 @@ export interface PermissionVO {
   createTime?: Date
 }
 
-// 查询团队成员列表
+/**
+ * CRM 业务类型枚举
+ *
+ * @author HUIHUI
+ */
+export enum BizTypeEnum {
+  CRM_LEADS = 1, // 线索
+  CRM_CUSTOMER = 2, // 客户
+  CRM_CONTACT = 3, // 联系人
+  CRM_BUSINESS = 5, // 商机
+  CRM_CONTRACT = 6 // 合同
+}
+
+/**
+ * CRM 数据权限级别枚举
+ */
+export enum PermissionLevelEnum {
+  OWNER = 1, // 负责人
+  READ = 2, // 只读
+  WRITE = 3 // 读写
+}
+
+// 获得数据权限列表（查询团队成员列表）
 export const getPermissionList = async (params) => {
   return await request.get({ url: `/crm/permission/list`, params })
 }
 
-// 新增团队成员
+// 创建数据权限（新增团队成员）
 export const createPermission = async (data: PermissionVO) => {
   return await request.post({ url: `/crm/permission/create`, data })
 }
 
-// 修改团队成员权限级别
+// 编辑数据权限（修改团队成员权限级别）
 export const updatePermission = async (data) => {
   return await request.put({ url: `/crm/permission/update`, data })
 }
 
-// 删除团队成员
-export const deletePermission = async (params) => {
+// 删除数据权限（删除团队成员）
+export const deletePermissionBatch = async (params) => {
   return await request.delete({ url: '/crm/permission/delete', params })
 }
 
-// 退出团队
-export const quitTeam = async (id) => {
+// 删除自己的数据权限（退出团队）
+export const deleteSelfPermission = async (id) => {
   return await request.delete({ url: '/crm/permission/quit-team?id=' + id })
 }
 
+// TODO @puhui999：调整下位置
 // 领取公海数据
 export const receive = async (data: { bizType: number; bizId: number }) => {
   return await request.put({ url: `/crm/permission/receive`, data })
 }
 
+// TODO @puhui999：调整下位置
 // 数据放入公海
 export const putPool = async (data: { bizType: number; bizId: number }) => {
   return await request.put({ url: `/crm/permission/put-pool`, data })

src/api/crm/receivable/index.ts

@@ -6,46 +6,47 @@ export interface ReceivableVO {
   planId: number
   customerId: number
   contractId: number
-  checkStatus: number
+  auditStatus: number
   processInstanceId: number
   returnTime: Date
   returnType: string
   price: number
   ownerUserId: number
-  batchId: number
   sort: number
-  dataScope: number
-  dataScopeDeptIds: string
-  status: number
   remark: string
 }
 
-// 查询回款管理列表
+// 查询回款列表
 export const getReceivablePage = async (params) => {
   return await request.get({ url: `/crm/receivable/page`, params })
 }
 
-// 查询回款管理详情
+// 查询回款列表
+export const getReceivablePageByCustomer = async (params) => {
+  return await request.get({ url: `/crm/receivable/page-by-customer`, params })
+}
+
+// 查询回款详情
 export const getReceivable = async (id: number) => {
   return await request.get({ url: `/crm/receivable/get?id=` + id })
 }
 
-// 新增回款管理
+// 新增回款
 export const createReceivable = async (data: ReceivableVO) => {
   return await request.post({ url: `/crm/receivable/create`, data })
 }
 
-// 修改回款管理
+// 修改回款
 export const updateReceivable = async (data: ReceivableVO) => {
   return await request.put({ url: `/crm/receivable/update`, data })
 }
 
-// 删除回款管理
+// 删除回款
 export const deleteReceivable = async (id: number) => {
   return await request.delete({ url: `/crm/receivable/delete?id=` + id })
 }
 
-// 导出回款管理 Excel
+// 导出回款 Excel
 export const exportReceivable = async (params) => {
   return await request.download({ url: `/crm/receivable/export-excel`, params })
 }

src/api/crm/receivable/plan/index.ts

@@ -23,6 +23,11 @@ export const getReceivablePlanPage = async (params) => {
   return await request.get({ url: `/crm/receivable-plan/page`, params })
 }
 
+// 查询回款计划列表
+export const getReceivablePlanPageByCustomer = async (params) => {
+  return await request.get({ url: `/crm/receivable-plan/page-by-customer`, params })
+}
+
 // 查询回款计划详情
 export const getReceivablePlan = async (id: number) => {
   return await request.get({ url: `/crm/receivable-plan/get?id=` + id })

src/api/infra/demo/demo01/index.ts

@@ -37,4 +37,4 @@ export const deleteDemo01Contact = async (id: number) => {
 // 导出示例联系人 Excel
 export const exportDemo01Contact = async (params) => {
   return await request.download({ url: `/infra/demo01-contact/export-excel`, params })
-}
+}

src/api/infra/demo/demo02/index.ts

@@ -34,4 +34,4 @@ export const deleteDemo02Category = async (id: number) => {
 // 导出示例分类 Excel
 export const exportDemo02Category = async (params) => {
   return await request.download({ url: `/infra/demo02-category/export-excel`, params })
-}
+}

src/api/infra/demo/demo03/erp/index.ts

@@ -88,4 +88,4 @@ export const deleteDemo03Grade = async (id: number) => {
 // 获得学生班级
 export const getDemo03Grade = async (id: number) => {
   return await request.get({ url: `/infra/demo03-student/demo03-grade/get?id=` + id })
-}
+}

src/api/infra/demo/demo03/inner/index.ts

@@ -42,12 +42,16 @@ export const exportDemo03Student = async (params) => {
 
 // 获得学生课程列表
 export const getDemo03CourseListByStudentId = async (studentId) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId })
+  return await request.get({
+    url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId
+  })
 }
 
 // ==================== 子表（学生班级） ====================
 
 // 获得学生班级
 export const getDemo03GradeByStudentId = async (studentId) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId })
-}
+  return await request.get({
+    url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId
+  })
+}

src/api/infra/demo/demo03/normal/index.ts

@@ -42,12 +42,16 @@ export const exportDemo03Student = async (params) => {
 
 // 获得学生课程列表
 export const getDemo03CourseListByStudentId = async (studentId) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId })
+  return await request.get({
+    url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId
+  })
 }
 
 // ==================== 子表（学生班级） ====================
 
 // 获得学生班级
 export const getDemo03GradeByStudentId = async (studentId) => {
-  return await request.get({ url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId })
-}
+  return await request.get({
+    url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId
+  })
+}

src/api/infra/fileConfig/index.ts

@@ -17,7 +17,7 @@ export interface FileClientConfig {
 export interface FileConfigVO {
   id: number
   name: string
-  storage: any
+  storage?: number
   master: boolean
   visible: boolean
   config: FileClientConfig

src/api/infra/jobLog/index.ts

@@ -7,8 +7,8 @@ export interface JobLogVO {
   handlerParam: string
   cronExpression: string
   executeIndex: string
-  beginTime: string
-  endTime: string
+  beginTime: Date
+  endTime: Date
   duration: string
   status: number
   createTime: string

src/api/mall/promotion/article/index.ts

@@ -17,7 +17,7 @@ export interface ArticleVO {
 }
 
 // 查询文章管理列表
-export const getArticlePage = async (params) => {
+export const getArticlePage = async (params: any) => {
   return await request.get({ url: `/promotion/article/page`, params })
 }
 

src/api/mp/user/index.ts

@@ -26,6 +26,6 @@ export const getUserPage = (query) => {
 // 同步公众号粉丝
 export const syncUser = (accountId) => {
   return request.post({
-    url: '/mp/tag/sync?accountId=' + accountId
+    url: '/mp/user/sync?accountId=' + accountId
   })
 }

src/api/system/dept/index.ts

@@ -14,7 +14,7 @@ export interface DeptVO {
 
 // 查询部门（精简)列表
 export const getSimpleDeptList = async (): Promise<DeptVO[]> => {
-  return await request.get({ url: '/system/dept/list-all-simple' })
+  return await request.get({ url: '/system/dept/simple-list' })
 }
 
 // 查询部门列表

src/api/system/dict/dict.data.ts

@@ -14,8 +14,8 @@ export type DictDataVO = {
 }
 
 // 查询字典数据（精简)列表
-export const listSimpleDictData = () => {
-  return request.get({ url: '/system/dict-data/list-all-simple' })
+export const getSimpleDictDataList = () => {
+  return request.get({ url: '/system/dict-data/simple-list' })
 }
 
 // 查询字典数据列表
@@ -45,5 +45,5 @@ export const deleteDictData = (id: number) => {
 
 // 导出字典类型数据
 export const exportDictData = (params) => {
-  return request.get({ url: '/system/dict-data/export', params })
+  return request.download({ url: '/system/dict-data/export', params })
 }

src/api/system/dict/dict.type.ts

@@ -40,5 +40,5 @@ export const deleteDictType = (id: number) => {
 }
 // 导出字典类型
 export const exportDictType = (params) => {
-  return request.get({ url: '/system/dict-type/export', params })
+  return request.download({ url: '/system/dict-type/export', params })
 }

src/api/system/loginLog/index.ts

@@ -7,6 +7,7 @@ export interface LoginLogVO {
   userId: number
   userType: number
   username: string
+  result: number
   status: number
   userIp: string
   userAgent: string

src/api/system/mail/account/index.ts

@@ -37,5 +37,5 @@ export const deleteMailAccount = async (id: number) => {
 
 // 获得邮箱账号精简列表
 export const getSimpleMailAccountList = async () => {
-  return request.get({ url: '/system/mail-account/list-all-simple' })
+  return request.get({ url: '/system/mail-account/simple-list' })
 }

src/api/system/menu/index.ts

@@ -20,7 +20,7 @@ export interface MenuVO {
 
 // 查询菜单（精简）列表
 export const getSimpleMenusList = () => {
-  return request.get({ url: '/system/menu/list-all-simple' })
+  return request.get({ url: '/system/menu/simple-list' })
 }
 
 // 查询菜单列表

src/api/system/notify/message/index.ts

@@ -13,6 +13,7 @@ export interface NotifyMessageVO {
   templateParams: string
   readStatus: boolean
   readTime: Date
+  createTime: Date
 }
 
 // 查询站内信消息列表

src/api/system/notify/template/index.ts

@@ -6,7 +6,7 @@ export interface NotifyTemplateVO {
   nickname: string
   code: string
   content: string
-  type: number
+  type?: number
   params: string
   status: number
   remark: string

src/api/system/post/index.ts

@@ -17,7 +17,7 @@ export const getPostPage = async (params: PageParam) => {
 
 // 获取岗位精简信息列表
 export const getSimplePostList = async (): Promise<PostVO[]> => {
-  return await request.get({ url: '/system/post/list-all-simple' })
+  return await request.get({ url: '/system/post/simple-list' })
 }
 
 // 查询岗位详情

src/api/system/role/index.ts

@@ -24,7 +24,7 @@ export const getRolePage = async (params: PageParam) => {
 
 // 查询角色（精简)列表
 export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
-  return await request.get({ url: '/system/role/list-all-simple' })
+  return await request.get({ url: '/system/role/simple-list' })
 }
 
 // 查询角色详情

src/api/system/sms/smsChannel/index.ts

@@ -19,7 +19,7 @@ export const getSmsChannelPage = (params: PageParam) => {
 
 // 获得短信渠道精简列表
 export function getSimpleSmsChannelList() {
-  return request.get({ url: '/system/sms-channel/list-all-simple' })
+  return request.get({ url: '/system/sms-channel/simple-list' })
 }
 
 // 查询短信渠道详情

src/api/system/sms/smsTemplate/index.ts

@@ -1,15 +1,15 @@
 import request from '@/config/axios'
 
 export interface SmsTemplateVO {
-  id: number | null
-  type: number | null
+  id?: number
+  type?: number
   status: number
   code: string
   name: string
   content: string
   remark: string
   apiTemplateId: string
-  channelId: number | null
+  channelId?: number
   channelCode?: string
   params?: string[]
   createTime?: Date

src/api/system/tenantPackage/index.ts

@@ -38,5 +38,5 @@ export const deleteTenantPackage = (id: number) => {
 }
 // 获取租户套餐精简信息列表
 export const getTenantPackageList = () => {
-  return request.get({ url: '/system/tenant-package/get-simple-list' })
+  return request.get({ url: '/system/tenant-package/simple-list' })
 }

src/api/system/user/index.ts

@@ -77,5 +77,5 @@ export const updateUserStatus = (id: number, status: number) => {
 
 // 获取用户精简信息列表
 export const getSimpleUserList = (): Promise<UserVO[]> => {
-  return request.get({ url: '/system/user/list-all-simple' })
+  return request.get({ url: '/system/user/simple-list' })
 }

src/api/system/user/profile.ts

@@ -1,37 +1,25 @@
 import request from '@/config/axios'
 
-export interface ProfileDept {
-  id: number
-  name: string
-}
-export interface ProfileRole {
-  id: number
-  name: string
-}
-export interface ProfilePost {
-  id: number
-  name: string
-}
-export interface SocialUser {
-  id: number
-  type: number
-  openid: string
-  token: string
-  rawTokenInfo: string
-  nickname: string
-  avatar: string
-  rawUserInfo: string
-  code: string
-  state: string
-}
 export interface ProfileVO {
   id: number
   username: string
   nickname: string
-  dept: ProfileDept
-  roles: ProfileRole[]
-  posts: ProfilePost[]
-  socialUsers: SocialUser[]
+  dept: {
+    id: number
+    name: string
+  }
+  roles: {
+    id: number
+    name: string
+  }[]
+  posts: {
+    id: number
+    name: string
+  }[]
+  socialUsers: {
+    type: number
+    openid: string
+  }[]
   email: string
   mobile: string
   sex: number