From d0210be4cd89f49e73e89d90be22453b3c840f79 Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Fri, 27 Jun 2025 22:39:03 +0800
Subject: [PATCH] fix: bugs

---
 apps/web-antd/src/adapter/vxe-table.ts                      | 6 +++---
 apps/web-antd/src/views/crm/contract/modules/detail.vue     | 4 ++--
 apps/web-antd/src/views/crm/product/modules/detail-data.ts  | 6 ++++++
 apps/web-antd/src/views/crm/receivable/modules/detail.vue   | 2 +-
 .../src/views/crm/receivable/plan/modules/detail.vue        | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts
index f2816cb13..2e8fb5bc6 100644
--- a/apps/web-antd/src/adapter/vxe-table.ts
+++ b/apps/web-antd/src/adapter/vxe-table.ts
@@ -11,9 +11,9 @@ import {
   useVbenVxeGrid,
 } from '@vben/plugins/vxe-table';
 import {
+  erpCountInputFormatter,
   erpNumberFormatter,
   formatPast2,
-  formatToFractionDigit,
   isFunction,
   isString,
 } from '@vben/utils';
@@ -333,8 +333,8 @@ setupVbenVxeTable({
 
     // add by 星语：数量格式化，例如说：金额
     vxeUI.formats.add('formatNumber', {
-      tableCellFormatMethod({ cellValue }, digits = 2) {
-        return formatToFractionDigit(cellValue, digits);
+      tableCellFormatMethod({ cellValue }) {
+        return erpCountInputFormatter(cellValue);
       },
     });
 
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 ad283e4e5..eb8c12669 100644
--- a/apps/web-antd/src/views/crm/contract/modules/detail.vue
+++ b/apps/web-antd/src/views/crm/contract/modules/detail.vue
@@ -64,14 +64,14 @@ const [TransferModal, transferModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-/** 加载线索详情 */
+/** 加载合同详情 */
 async function loadContractDetail() {
   loading.value = true;
   const data = await getContract(contractId.value);
   contract.value = data;
   // 操作日志
   const logList = await getOperateLogPage({
-    bizType: BizTypeEnum.CRM_CLUE,
+    bizType: BizTypeEnum.CRM_CONTRACT,
     bizId: contractId.value,
   });
   contractLogList.value = logList.list;
diff --git a/apps/web-antd/src/views/crm/product/modules/detail-data.ts b/apps/web-antd/src/views/crm/product/modules/detail-data.ts
index 609612d42..f5b1ed9c8 100644
--- a/apps/web-antd/src/views/crm/product/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/product/modules/detail-data.ts
@@ -104,6 +104,12 @@ export function useDetailListColumns(
       formatter: 'formatAmount2',
       visible: showBussinePrice,
     },
+    {
+      field: 'contractPrice',
+      title: '合同价格（元）',
+      formatter: 'formatAmount2',
+      visible: !showBussinePrice,
+    },
     {
       field: 'count',
       title: '数量',
diff --git a/apps/web-antd/src/views/crm/receivable/modules/detail.vue b/apps/web-antd/src/views/crm/receivable/modules/detail.vue
index 8fddd38b5..038908dec 100644
--- a/apps/web-antd/src/views/crm/receivable/modules/detail.vue
+++ b/apps/web-antd/src/views/crm/receivable/modules/detail.vue
@@ -53,7 +53,7 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-/** 加载线索详情 */
+/** 加载回款详情 */
 async function loadReceivableDetail() {
   loading.value = true;
   const data = await getReceivable(receivableId.value);
diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue
index 573f97cb4..0ca57a9ae 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue
+++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue
@@ -53,7 +53,7 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-/** 加载线索详情 */
+/** 加载回款计划详情 */
 async function loadreceivablePlanDetail() {
   loading.value = true;
   const data = await getReceivablePlan(receivablePlanId.value);