@dongkboy 3 月之前
父節點
當前提交
1994a37c12
共有 1 個文件被更改,包括 22 次插入 和 6 次删除
  1. 22 6
      src/views/finance/modules/auditDetail.vue

+ 22 - 6
src/views/finance/modules/auditDetail.vue

@@ -302,7 +302,7 @@
         <div class="title">险种信息</div>
         <div class="title">险种信息</div>
         <el-row :gutter="20" style="margin-bottom: 16px">
         <el-row :gutter="20" style="margin-bottom: 16px">
           <el-col :span="14">
           <el-col :span="14">
-            <el-table :data="detailData?.kindInfoVo" border>
+            <el-table :data="detailData?.kindInfoVo" border :span-method="objectSpanMethod">
               <el-table-column label="名称" prop="kindName" width="100">
               <el-table-column label="名称" prop="kindName" width="100">
                 <template #default="scope">
                 <template #default="scope">
                   <span v-if="scope.row.kindCode === 'J1'">交强险</span>
                   <span v-if="scope.row.kindCode === 'J1'">交强险</span>
@@ -1076,15 +1076,31 @@ let carData = ref([
     d: 3
     d: 3
   },
   },
 ])
 ])
-const typeSpanMethod = ({
+const objectSpanMethod = ({
   row,
   row,
   column,
   column,
   rowIndex,
   rowIndex,
-  columnIndex
-}) => {
+  columnIndex,
+}: SpanMethodProps) => {
+  const totalRows = detailData.value?.kindInfoVo.length || 0;
   if (columnIndex === 0) {
   if (columnIndex === 0) {
-    if (rowIndex === 1) {
-      return [typeData.value.length - 1, 1]
+    if (rowIndex === 0) {
+      return { rowspan: 1, colspan: 1 }
+    } else if (rowIndex === 1) {
+      // 从第2行到最后一行的行数 = 总行数 - 1
+      return { rowspan: totalRows - 1, colspan: 1 }
+    } else {
+      return { rowspan: 0, colspan: 0 }
+    }
+  }
+  if (columnIndex === 1) {
+    if (rowIndex === 0) {
+      return { rowspan: 1, colspan: 1 }
+    } else if (rowIndex === 1) {
+      // 从第2行到最后一行的行数 = 总行数 - 1
+      return { rowspan: totalRows - 1, colspan: 1 }
+    } else {
+      return { rowspan: 0, colspan: 0 }
     }
     }
   }
   }
 }
 }