diff --git a/apps/web-antd/src/views/crm/business/modules/detail.vue b/apps/web-antd/src/views/crm/business/modules/detail.vue
index aa91e7c76..aecb77e03 100644
--- a/apps/web-antd/src/views/crm/business/modules/detail.vue
+++ b/apps/web-antd/src/views/crm/business/modules/detail.vue
@@ -183,6 +183,7 @@ onMounted(() => {
diff --git a/apps/web-antd/src/views/crm/contract/modules/detail.vue b/apps/web-antd/src/views/crm/contract/modules/detail.vue
index bf49f9a0c..384400703 100644
--- a/apps/web-antd/src/views/crm/contract/modules/detail.vue
+++ b/apps/web-antd/src/views/crm/contract/modules/detail.vue
@@ -161,8 +161,8 @@ onMounted(() => {
diff --git a/apps/web-antd/src/views/crm/product/modules/detail-list.vue b/apps/web-antd/src/views/crm/product/modules/detail-list.vue
index 96e3d09f6..a2fac8d21 100644
--- a/apps/web-antd/src/views/crm/product/modules/detail-list.vue
+++ b/apps/web-antd/src/views/crm/product/modules/detail-list.vue
@@ -1,32 +1,49 @@
diff --git a/apps/web-antd/src/views/crm/receivable/plan/data.ts b/apps/web-antd/src/views/crm/receivable/plan/data.ts
index 6d57a4e7a..26453cb39 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/data.ts
+++ b/apps/web-antd/src/views/crm/receivable/plan/data.ts
@@ -310,12 +310,6 @@ export function useDetailBaseSchema(): DescriptionItemSchema[] {
/** 详情列表的字段 */
export function useDetailListColumns(): VxeTableGridOptions['columns'] {
return [
- {
- title: '回款编号',
- field: 'no',
- minWidth: 150,
- fixed: 'left',
- },
{
title: '客户名称',
field: 'customerName',
@@ -323,29 +317,36 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
},
{
title: '合同编号',
- field: 'contract',
+ field: 'contractNo',
minWidth: 150,
},
{
- title: '回款日期',
- field: 'returnTime',
+ title: '期数',
+ field: 'period',
minWidth: 150,
- formatter: 'formatDateTime',
},
{
- title: '回款金额(元)',
+ title: '计划回款(元)',
field: 'price',
minWidth: 150,
formatter: 'formatNumber',
},
{
- title: '回款方式',
- field: 'returnType',
+ title: '计划回款日期',
+ field: 'returnTime',
minWidth: 150,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE },
- },
+ formatter: 'formatDateTime',
+ },
+ {
+ title: '提前几天提醒',
+ field: 'remindDays',
+ minWidth: 150,
+ },
+ {
+ title: '提醒日期',
+ field: 'remindTime',
+ minWidth: 150,
+ formatter: 'formatDateTime',
},
{
title: '负责人',
@@ -357,26 +358,10 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
field: 'remark',
minWidth: 150,
},
- {
- title: '合同金额(元)',
- field: 'contract.totalPrice',
- minWidth: 150,
- formatter: 'formatNumber',
- },
- {
- title: '回款状态',
- field: 'auditStatus',
- minWidth: 100,
- fixed: 'right',
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.CRM_AUDIT_STATUS },
- },
- },
{
title: '操作',
field: 'actions',
- width: 130,
+ width: 240,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue
index dde0f0a98..06cae9bd2 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue
+++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-list.vue
@@ -3,8 +3,6 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { CrmReceivableApi } from '#/api/crm/receivable';
import type { CrmReceivablePlanApi } from '#/api/crm/receivable/plan';
-import { ref } from 'vue';
-
import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
@@ -35,11 +33,6 @@ const [ReceivableFormModal, receivableFormModalApi] = useVbenModal({
destroyOnClose: true,
});
-const checkedRows = ref([]);
-function setCheckedRows({ records }: { records: CrmReceivablePlanApi.Plan[] }) {
- checkedRows.value = records;
-}
-
/** 刷新表格 */
function onRefresh() {
gridApi.query();
@@ -81,7 +74,7 @@ async function handleDelete(row: CrmReceivablePlanApi.Plan) {
const [Grid, gridApi] = useVbenVxeGrid({
gridOptions: {
columns: useDetailListColumns(),
- height: 600,
+ height: 400,
keepSource: true,
proxyConfig: {
ajax: {
@@ -110,10 +103,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
search: true,
},
} as VxeTableGridOptions,
- gridEvents: {
- checkboxAll: setCheckedRows,
- checkboxChange: setCheckedRows,
- },
});
@@ -143,6 +132,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
type: 'link',
icon: ACTION_ICON.ADD,
auth: ['crm:receivable-plan:create'],
+ disabled: !!row.receivableId,
onClick: handleCreateReceivable.bind(null, row),
},
{