fix: bug修复

boyang
1 parent f82f9285
Showing 2 changed files with 31 additions and 3 deletions
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
@@ -116,11 +116,22 @@
     bordered: true,
     columns: COLUMNS,
     rowKey: 'orderId',
+    customRow: () => {
+      return {
+        onClick: (e) => {
+          // Prevent row selection when clicking anywhere except checkboxes
+          if (!e.target.closest('.ant-checkbox-wrapper')) {
+            e.stopPropagation();
+          }
+        },
+      };
+    },
     rowSelection: {
       type: 'checkbox',
       selectedRowKeys: checkedKeys as any,
       onSelect: onSelect,
       onSelectAll: onSelectAll,
+      checkStrictly: true,
     },
     formConfig: {
       labelWidth: 120,
@@ -119,18 +119,29 @@
     api: getPackageProfit,
     bordered: true,
     columns: COLUMNS,
-    rowKey: 'id',
+    rowKey: (record) => record.orderId,
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
     },
-    rowKey: (record) => record.orderId,
+    // Add custom row props to prevent selection when clicking rows
+    customRow: () => {
+      return {
+        onClick: (e) => {
+          // Prevent row selection when clicking anywhere except checkboxes
+          if (!e.target.closest('.ant-checkbox-wrapper')) {
+            e.stopPropagation();
+          }
+        },
+      };
+    },
     rowSelection: {
       type: 'checkbox',
       selectedRowKeys: checkedKeys as any,
       onSelect: onSelect,
       onSelectAll: onSelectAll,
+      checkStrictly: true,
     },
     useSearchForm: true,
     showTableSetting: true,
@@ -350,7 +361,13 @@
     handleClearChoose();
     reload();
   }
-  async function onSelect(record, selected: boolean) {
+  async function onSelect(record, selected: boolean, _selectedRows, nativeEvent) {
+    // Only process selection if it's coming from a checkbox click or programmatically
+    // This checks if the event is from clicking the row - then we ignore it
+    if (nativeEvent && nativeEvent.target && !nativeEvent.target.closest('.ant-checkbox-wrapper')) {
+      return;
+    }
+    
     const rowKey = record.orderId;
     if (selected) {
       checkedKeys.value = [...checkedKeys.value, rowKey];