fix: crm detail

apps/web-antd/src/views/crm/business/modules/detail.vue

@@ -183,6 +183,7 @@ onMounted(() => {
         </Tabs.TabPane>
         <Tabs.TabPane tab="产品" key="4" :force-render="true">
           <ProductDetailsList
+            :biz-id="businessId"
             :biz-type="BizTypeEnum.CRM_BUSINESS"
             :business="business"
           />

apps/web-antd/src/views/crm/contract/modules/detail.vue

@@ -161,8 +161,8 @@ onMounted(() => {
         </Tabs.TabPane>
         <Tabs.TabPane tab="产品" key="3" :force-render="true">
           <ProductDetailsList
+            :biz-id="contractId"
             :biz-type="BizTypeEnum.CRM_CONTRACT"
-            :contract="contract"
           />
         </Tabs.TabPane>
         <Tabs.TabPane tab="回款" key="4" :force-render="true">

apps/web-antd/src/views/crm/product/modules/detail-list.vue

@@ -1,32 +1,49 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { CrmBusinessApi } from '#/api/crm/business';
-import type { CrmContractApi } from '#/api/crm/contract';
 import type { CrmProductApi } from '#/api/crm/product';
 
+import { ref } from 'vue';
+
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getBusiness } from '#/api/crm/business';
+import { getContract } from '#/api/crm/contract';
 import { BizTypeEnum } from '#/api/crm/permission';
 import { erpPriceInputFormatter } from '#/utils';
 
 import { useDetailListColumns } from '../data';
 
 const props = defineProps<{
+  bizId: number;
   bizType: BizTypeEnum;
-  business?: CrmBusinessApi.Business; // 商机
-  contract?: CrmContractApi.Contract; // 合同
 }>();
 
+const discountPercent = ref(0);
+const totalProductPrice = ref(0);
+
 const [Grid] = useVbenVxeGrid({
   gridOptions: {
     columns: useDetailListColumns(props.bizType === BizTypeEnum.CRM_BUSINESS),
-    data:
-      props.bizType === BizTypeEnum.CRM_BUSINESS
-        ? props.business?.products
-        : props.contract?.products,
     height: 600,
     pagerConfig: {
       enabled: false,
     },
+    proxyConfig: {
+      ajax: {
+        query: async (_params) => {
+          const data =
+            props.bizType === BizTypeEnum.CRM_BUSINESS
+              ? await getBusiness(props.bizId)
+              : await getContract(props.bizId);
+          discountPercent.value = data.discountPercent;
+          totalProductPrice.value = data.totalProductPrice;
+          return data.products;
+        },
+      },
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
     keepSource: true,
     rowConfig: {
       keyField: 'id',
@@ -38,21 +55,17 @@ const [Grid] = useVbenVxeGrid({
 <template>
   <div>
     <Grid />
-    <div class="flex justify-end">
+    <div class="flex flex-col items-end justify-end">
-      <span class="font-bold text-red-500">
-        整单折扣：{{
-          erpPriceInputFormatter(
-            business ? business.discountPercent : contract?.discountPercent,
-          )
-        }}%
-      </span>
       <span class="ml-4 font-bold text-red-500">
-        产品总金额：{{
+        {{ `产品总金额：${erpPriceInputFormatter(totalProductPrice)}元` }}
-          erpPriceInputFormatter(
+      </span>
-            business ? business.totalProductPrice : contract?.totalProductPrice,
+      <span class="font-bold text-red-500">
-          )
+        {{ `整单折扣：${erpPriceInputFormatter(discountPercent)}%` }}
+      </span>
+      <span class="font-bold text-red-500">
+        {{
+          `实际金额：${erpPriceInputFormatter(totalProductPrice * (1 - discountPercent / 100))}元`
         }}
-        元
       </span>
     </div>
   </div>

apps/web-antd/src/views/crm/receivable/data.ts

@@ -362,7 +362,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
     },
     {
       title: '合同编号',
-      field: 'contract',
+      field: 'contract.no',
       minWidth: 150,
     },
     {
@@ -396,12 +396,6 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
       field: 'remark',
       minWidth: 150,
     },
-    {
-      title: '合同金额（元）',
-      field: 'contract.totalPrice',
-      minWidth: 150,
-      formatter: 'formatNumber',
-    },
     {
       title: '回款状态',
       field: 'auditStatus',

apps/web-antd/src/views/crm/receivable/modules/detail-list.vue

@@ -2,8 +2,6 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { CrmReceivableApi } from '#/api/crm/receivable';
 
-import { ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 
 import { message } from 'ant-design-vue';
@@ -28,15 +26,6 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-const checkedRows = ref<CrmReceivableApi.Receivable[]>([]);
-function setCheckedRows({
-  records,
-}: {
-  records: CrmReceivableApi.Receivable[];
-}) {
-  checkedRows.value = records;
-}
-
 /** 刷新表格 */
 function onRefresh() {
   gridApi.query();
@@ -73,15 +62,14 @@ async function handleDelete(row: CrmReceivableApi.Receivable) {
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     columns: useDetailListColumns(),
-    height: 600,
+    height: 500,
     keepSource: true,
     proxyConfig: {
       ajax: {
-        query: async ({ page }, formValues) => {
+        query: async ({ page }) => {
           const queryParams: CrmReceivableApi.ReceivablePageParam = {
-            page: page.currentPage,
+            pageNo: page.currentPage,
             pageSize: page.pageSize,
-            ...formValues,
           };
           if (props.customerId && !props.contractId) {
             queryParams.customerId = props.customerId;
@@ -102,10 +90,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
       search: true,
     },
   } as VxeTableGridOptions<CrmReceivableApi.Receivable>,
-  gridEvents: {
-    checkboxAll: setCheckedRows,
-    checkboxChange: setCheckedRows,
-  },
 });
 </script>
 

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: '回款日期',
+      title: '期数',
-      field: 'returnTime',
+      field: 'period',
       minWidth: 150,
-      formatter: 'formatDateTime',
     },
     {
-      title: '回款金额（元）',
+      title: '计划回款(元)',
       field: 'price',
       minWidth: 150,
       formatter: 'formatNumber',
     },
     {
-      title: '回款方式',
+      title: '计划回款日期',
-      field: 'returnType',
+      field: 'returnTime',
       minWidth: 150,
-      cellRender: {
+      formatter: 'formatDateTime',
-        name: 'CellDict',
+    },
-        props: { type: DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE },
+    {
-      },
+      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' },
     },

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<CrmReceivablePlanApi.Plan[]>([]);
-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<CrmReceivablePlanApi.Plan>,
-  gridEvents: {
-    checkboxAll: setCheckedRows,
-    checkboxChange: setCheckedRows,
-  },
 });
 </script>
 
@@ -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),
             },
             {