diff --git a/src/api/crm/receivable/index.ts b/src/api/crm/receivable/index.ts index 7d2d3a2d..1c184925 100644 --- a/src/api/crm/receivable/index.ts +++ b/src/api/crm/receivable/index.ts @@ -5,14 +5,24 @@ export interface ReceivableVO { no: string planId: number customerId: number + customerName?: string contractId: number + contract?: { + no: string + totalPrice: number + } auditStatus: number processInstanceId: number returnTime: Date returnType: string price: number ownerUserId: number + ownerUserName?: string remark: string + creator: string // 创建人 + creatorName?: string // 创建人名称 + createTime: Date // 创建时间 + updateTime: Date // 更新时间 } // 查询回款列表 diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index a5a0f505..dd4b7a33 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -546,10 +546,21 @@ const remainingRouter: AppRouteRecordRaw[] = [ title: '回款计划详情', noCache: true, hidden: true, - activeMenu: '/crm/contract' + activeMenu: '/crm/receivable-plan' }, component: () => import('@/views/crm/receivable/plan/detail/index.vue') }, + { + path: 'receivable/detail/:id', + name: 'CrmReceivableDetail', + meta: { + title: '回款详情', + noCache: true, + hidden: true, + activeMenu: '/crm/receivable' + }, + component: () => import('@/views/crm/receivable/detail/index.vue') + }, { path: 'contact/detail/:id', name: 'CrmContactDetail', diff --git a/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue b/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue new file mode 100644 index 00000000..62201dec --- /dev/null +++ b/src/views/crm/receivable/detail/ReceivableDetailsHeader.vue @@ -0,0 +1,43 @@ + + + + + + + {{ receivable.no }} + + + + + + + + + + + + + {{ receivable.customerName }} + + + {{ erpPriceInputFormatter(receivable.contract?.totalPrice) }} + + + {{ formatDate(receivable.returnTime) }} + + + {{ erpPriceInputFormatter(receivable.price) }} + + + {{ receivable.ownerUserName }} + + + + + diff --git a/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue b/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue new file mode 100644 index 00000000..003029fb --- /dev/null +++ b/src/views/crm/receivable/detail/ReceivableDetailsInfo.vue @@ -0,0 +1,62 @@ + + + + + + 基本信息 + + + {{ receivable.no }} + + {{ receivable.customerName }} + + + {{ receivable.contract?.no }} + + + {{ formatDate(receivable.returnTime, 'YYYY-MM-DD') }} + + + {{ erpPriceInputFormatter(receivable.price) }} + + + + + {{ receivable.remark }} + + + + + 系统信息 + + + + {{ receivable.ownerUserName }} + + + {{ receivable.creatorName }} + + + {{ formatDate(receivable.createTime) }} + + + {{ formatDate(receivable.updateTime) }} + + + + + + + diff --git a/src/views/crm/receivable/detail/index.vue b/src/views/crm/receivable/detail/index.vue new file mode 100644 index 00000000..51a3ad20 --- /dev/null +++ b/src/views/crm/receivable/detail/index.vue @@ -0,0 +1,98 @@ + + + + 编辑 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/crm/receivable/index.vue b/src/views/crm/receivable/index.vue index 0ec29bdb..856a07f1 100644 --- a/src/views/crm/receivable/index.vue +++ b/src/views/crm/receivable/index.vue @@ -72,7 +72,13 @@ - + + + + {{ scope.row.no }} + + + ( {} as ReceivablePlanApi.ReceivablePlanVO