wyq 3 anni fa
parent
commit
6836cfe800
1 ha cambiato i file con 18 aggiunte e 7 eliminazioni
  1. 18 7
      src/components/knowledgeExtra/AddNewRuleTable.vue

+ 18 - 7
src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -796,13 +796,24 @@ export default {
     },
     // 合并单元格
     ObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 0 || columnIndex == 1) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
-        return {
-          rowspan: _row,
-          colspan: _col
-        };
+      if (this.ruleTermCodeStr == '3-108-1' || this.ruleTermCodeStr == '4-108-1') {
+        if (columnIndex == 0) {
+          const _row = this.spanArr[rowIndex];
+          const _col = _row > 0 ? 1 : 0;
+          return {
+            rowspan: _row,
+            colspan: _col
+          };
+        }
+      } else {
+        if (columnIndex == 0 || columnIndex == 1) {
+          const _row = this.spanArr[rowIndex];
+          const _col = _row > 0 ? 1 : 0;
+          return {
+            rowspan: _row,
+            colspan: _col
+          };
+        }
       }
     },
     showDataType(index) {