Merge remote-tracking branch 'yudao/dev' into crm-msg

Author: dhb52

src/api/bpm/model/index.ts

@@ -32,9 +32,7 @@ export const getModelPage = async (params) => {
 export const getModel = async (id: number) => {
   return await request.get({ url: '/bpm/model/get?id=' + id })
 }
-export const getModelByKey = async (key: string) => {
-  return await request.get({ url: '/bpm/model/get-by-key?key=' + key })
-}
+
 export const updateModel = async (data: ModelVO) => {
   return await request.put({ url: '/bpm/model/update', data: data })
 }

src/api/crm/bi/rank.ts

@@ -0,0 +1,25 @@
+import request from '@/config/axios'
+
+export interface BiRankRespVO {
+  count: number
+  nickname: string
+  deptName: string
+}
+
+// 排行 API
+export const RankApi = {
+  // 获得合同排行榜
+  getContractPriceRank: (params: any) => {
+    return request.get({
+      url: '/crm/bi-rank/get-contract-price-rank',
+      params
+    })
+  },
+  // 获得回款排行榜
+  getReceivablePriceRank: (params: any) => {
+    return request.get({
+      url: '/crm/bi-rank/get-receivable-price-rank',
+      params
+    })
+  }
+}

src/api/crm/bi/ranking.ts

@@ -73,6 +73,6 @@ export const getBusinessListByIds = async (val: number[]) => {
 }
 
 // 商机转移
-export const transfer = async (data: TransferReqVO) => {
+export const transferBusiness = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/business/transfer', data })
 }

src/api/crm/business/index.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { TransferReqVO } from '@/api/crm/customer'
 
 export interface ClueVO {
   id: number
@@ -44,3 +45,8 @@ export const deleteClue = async (id: number) => {
 export const exportClue = async (params) => {
   return await request.download({ url: `/crm/clue/export-excel`, params })
 }
+
+// 线索转移
+export const transferClue = async (data: TransferReqVO) => {
+  return await request.put({ url: '/crm/clue/transfer', data })
+}

src/api/crm/clue/index.ts

@@ -88,6 +88,6 @@ export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
 }
 
 // 联系人转移
-export const transfer = async (data: TransferReqVO) => {
+export const transferContact = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/contact/transfer', data })
 }

src/api/crm/contact/index.ts

@@ -7,6 +7,7 @@ export interface ContractVO {
   name: string
   customerId: number
   businessId: number
+  businessName: string
   processInstanceId: number
   orderDate: Date
   ownerUserId: number
@@ -18,8 +19,9 @@ export interface ContractVO {
   productPrice: number
   contactId: number
   signUserId: number
+  signUserName: string
   contactLastTime: Date
-  status: number
+  auditStatus: number
   remark: string
   productItems: ProductExpandVO[]
   creatorName: string
@@ -66,11 +68,11 @@ export const exportContract = async (params) => {
 }
 
 // 提交审核
-export const handleApprove = async (id: number) => {
-  return await request.put({ url: `/crm/contract/approve?id=${id}` })
+export const submitContract = async (id: number) => {
+  return await request.put({ url: `/crm/contract/submit?id=${id}` })
 }
 
 // 合同转移
-export const transfer = async (data: TransferReqVO) => {
+export const transferContract = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/contract/transfer', data })
 }

src/api/crm/contract/index.ts

@@ -82,7 +82,7 @@ export interface TransferReqVO {
 }
 
 // 客户转移
-export const transfer = async (data: TransferReqVO) => {
+export const transferCustomer = async (data: TransferReqVO) => {
   return await request.put({ url: '/crm/customer/transfer', data })
 }
 

src/api/crm/customer/index.ts

@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+// ERP 商品分类 VO
+export interface ProductCategoryVO {
+  // 分类编号
+  id: number
+  // 父分类编号
+  parentId: number
+  // 分类名称
+  name: string
+  // 分类编码
+  code: string
+  // 分类排序
+  sort: number
+  // 开启状态
+  status: number
+}
+
+// ERP 商品分类 API
+export const ProductCategoryApi = {
+  // 查询ERP 商品分类列表
+  getProductCategoryList: async (params) => {
+    return await request.get({ url: `/erp/product-category/list`, params })
+  },
+
+  // 查询ERP 商品分类详情
+  getProductCategory: async (id: number) => {
+    return await request.get({ url: `/erp/product-category/get?id=` + id })
+  },
+
+  // 新增ERP 商品分类
+  createProductCategory: async (data: ProductCategoryVO) => {
+    return await request.post({ url: `/erp/product-category/create`, data })
+  },
+
+  // 修改ERP 商品分类
+  updateProductCategory: async (data: ProductCategoryVO) => {
+    return await request.put({ url: `/erp/product-category/update`, data })
+  },
+
+  // 删除ERP 商品分类
+  deleteProductCategory: async (id: number) => {
+    return await request.delete({ url: `/erp/product-category/delete?id=` + id })
+  },
+
+  // 导出ERP 商品分类 Excel
+  exportProductCategory: async (params) => {
+    return await request.download({ url: `/erp/product-category/export-excel`, params })
+  }
+}

src/api/erp/product/category/index.ts

@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+// ERP 产品 VO
+export interface ProductVO {
+  // 产品编号
+  id: number
+  // 产品名称
+  name: string
+  // 产品条码
+  barCode: string
+  // 产品类型编号
+  categoryId: number
+  // 单位编号
+  unitId: number
+  // 产品状态
+  status: number
+  // 产品规格
+  standard: string
+  // 产品备注
+  remark: string
+  // 保质期天数
+  expiryDay: number
+  // 基础重量（kg）
+  weight: number
+  // 采购价格，单位：元
+  purchasePrice: number
+  // 销售价格，单位：元
+  salePrice: number
+  // 最低价格，单位：元
+  minPrice: number
+}
+
+// ERP 产品 API
+export const ProductApi = {
+  // 查询ERP 产品分页
+  getProductPage: async (params: any) => {
+    return await request.get({ url: `/erp/product/page`, params })
+  },
+
+  // 查询ERP 产品详情
+  getProduct: async (id: number) => {
+    return await request.get({ url: `/erp/product/get?id=` + id })
+  },
+
+  // 新增ERP 产品
+  createProduct: async (data: ProductVO) => {
+    return await request.post({ url: `/erp/product/create`, data })
+  },
+
+  // 修改ERP 产品
+  updateProduct: async (data: ProductVO) => {
+    return await request.put({ url: `/erp/product/update`, data })
+  },
+
+  // 删除ERP 产品
+  deleteProduct: async (id: number) => {
+    return await request.delete({ url: `/erp/product/delete?id=` + id })
+  },
+
+  // 导出ERP 产品 Excel
+  exportProduct: async (params) => {
+    return await request.download({ url: `/erp/product/export-excel`, params })
+  }
+}