diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts index 9d718c23..03aee0ee 100644 --- a/src/api/crm/contract/index.ts +++ b/src/api/crm/contract/index.ts @@ -1,35 +1,48 @@ import request from '@/config/axios' -import { ProductExpandVO } from '@/api/crm/product' import { TransferReqVO } from '@/api/crm/customer' export interface ContractVO { id: number name: string + no: string customerId: number + customerName?: string businessId: number businessName: string - processInstanceId: number - orderDate: Date + contactLastTime: Date ownerUserId: number - no: string + ownerUserName?: string + ownerUserDeptName?: string + processInstanceId: number + auditStatus: number + orderDate: Date startTime: Date endTime: Date - price: number + totalProductPrice: number discountPercent: number - productPrice: number - contactId: number + totalPrice: number + signContactId: number + signContactName?: string signUserId: number signUserName: string - contactLastTime: Date - auditStatus: number remark: string - productItems: ProductExpandVO[] + createTime?: Date + creator: string creatorName: string updateTime?: Date - createTime?: Date - customerName: string - contactName: string - ownerUserName: string + products?: [ + { + id: number + productId: number + productName: string + productNo: string + productUnit: number + productPrice: number + contractPrice: number + count: number + totalPrice: number + } + ] } // 查询 CRM 合同列表 diff --git a/src/api/crm/product/index.ts b/src/api/crm/product/index.ts index b27612d6..787939e8 100644 --- a/src/api/crm/product/index.ts +++ b/src/api/crm/product/index.ts @@ -12,6 +12,7 @@ export interface ProductVO { ownerUserId: number } +// TODO 芋艿:待删除 export interface ProductExpandVO extends ProductVO { count: number discountPercent: number diff --git a/src/views/crm/contact/index.vue b/src/views/crm/contact/index.vue index 5cfde47a..7cf5d61f 100644 --- a/src/views/crm/contact/index.vue +++ b/src/views/crm/contact/index.vue @@ -230,7 +230,6 @@ const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const list = ref([]) // 列表的数据 -const customerList = ref([]) // 客户列表 const queryParams = reactive({ pageNo: 1, pageSize: 10, @@ -245,6 +244,7 @@ const queryParams = reactive({ const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 const activeName = ref('1') // 列表 tab +const customerList = ref([]) // 客户列表 /** 查询列表 */ const getList = async () => { diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue index 417392d3..5716b669 100644 --- a/src/views/crm/contract/index.vue +++ b/src/views/crm/contract/index.vue @@ -25,6 +25,24 @@ placeholder="请输入合同名称" @keyup.enter="handleQuery" /> + + + + + @@ -55,9 +73,20 @@ + + + + + - + + + - - + + + + - - {{ scope.row.contactName }} + {{ scope.row.signContactName }} - + + - + +