项目资料收集

src/views/project/modules/project-list.vue

@@ -75,8 +75,8 @@
                                     <el-table-column prop="key4" label="全年目标" width="100" align="center" />
                                     <el-table-column prop="key5" label="工作计划" width="100" align="center" />
                                     <el-table-column prop="key6" label="累计进展计划" align="center" />
-                                    <el-table-column prop="key7" label="工作计划进展计划" align="center" />
-                                    <el-table-column prop="key8" label="形象进度百分比(%)" width="100" align="center" />
+                                    <el-table-column prop="key7" label="形象进度百分比(%)" width="100" align="center" />
+                                    <el-table-column prop="key8" label="工作计划进展计划" align="center" />
                                 </el-table>
                             </hc-card-item>
                         </div>
@@ -375,18 +375,16 @@ const tableYearData = ref([
     { quarter: '四季度', month: '11月', key1: '16', key2: '2.1', key3: '1.2' },
     { quarter: '四季度', month: '12月', key1: '16', key2: '2.1', key3: '1.3' },
 
-    { quarter: '该年累计完成投资(亿元)', key3: '14.1', key4: '存在问题', key5: '-' },
-    { quarter: '该年力争完成投资(亿元)', key3: '13.2', key4: '-', key5: '-' },
-    { quarter: '该年累计未完成投资(亿元)', key3: '12.3', key4: '填报单位', key5: '-' },
+    { quarter: '该年累计完成投资(亿元)', key3: '14.1', key4: '存在问题', key5: '-', key6: '工作问题', key7: '-' },
+    { quarter: '该年力争完成投资(亿元)', key3: '13.2' },
+    { quarter: '该年累计未完成投资(亿元)', key3: '12.3', key4: '填报单位', key5: '-', key6: '联系人', key7: '-' },
 ])
 
 //合并列或行
 const tableYearMethod = ({ rowIndex, columnIndex }) => {
     const column = columnIndex, row = rowIndex
     if (column === 0) { //第一列
-        const rows = [0, 3, 6, 9]
-        const irows = [1, 2, 4, 5, 7, 8, 10, 11]
-        const bottom = [12, 13, 14]
+        const rows = [0, 3, 6, 9], irows = [1, 2, 4, 5, 7, 8, 10, 11], bottom = [12, 13, 14]
         if (rows.indexOf(row) !== -1) {
             //主要季度隐藏
             return { rowspan: 3, colspan: 1 }
@@ -399,6 +397,77 @@ const tableYearMethod = ({ rowIndex, columnIndex }) => {
         } else {
             return { rowspan: 1, colspan: 1 }
         }
+    } else if (column === 1) { //第二列
+        const bottom = [12, 13, 14]
+        if (bottom.indexOf(row) !== -1) {
+            return { rowspan: 0, colspan: 1 }
+        }
+    } else if (column === 2) { //第三列
+        const rows = [0, 3, 6, 9], irows = [1, 2, 4, 5, 7, 8, 10, 11], bottom = [12, 13, 14]
+        if (rows.indexOf(row) !== -1) {
+            //主要隐藏
+            return { rowspan: 3, colspan: 1 }
+        } else if (irows.indexOf(row) !== -1) {
+            //非主要的隐藏
+            return { rowspan: 0, colspan: 0 }
+        } else if (bottom.indexOf(row) !== -1) {
+            //底部三个隐藏
+            return { rowspan: 0, colspan: 1 }
+        } else {
+            return { rowspan: 1, colspan: 1 }
+        }
+    } else if (column === 3) { //第四列
+        const bottom = [12, 13, 14]
+        if (bottom.indexOf(row) !== -1) {
+            return { rowspan: 0, colspan: 0 }
+        }
+    } else if (column === 5) { //第六列
+        if (row === 0) {
+            return { rowspan: 12, colspan: 1 }
+        } else if (row > 0 && row < 12) {
+            return { rowspan: 0, colspan: 0 }
+        } else if (row === 12) {
+            return { rowspan: 2, colspan: 1 }
+        } else if (row === 13) {
+            return { rowspan: 0, colspan: 0 }
+        } else if (row === 14) {
+            return { rowspan: 1, colspan: 1 }
+        } else {
+            return { rowspan: 1, colspan: 1 }
+        }
+    } else if (column === 6) { //第七列
+        const rows = [0, 3, 6, 9], irows = [1, 2, 4, 5, 7, 8, 10, 11]
+        if (rows.indexOf(row) !== -1) {
+            //主要隐藏
+            return { rowspan: 3, colspan: 1 }
+        } else if (irows.indexOf(row) !== -1) {
+            //非主要的隐藏
+            return { rowspan: 0, colspan: 0 }
+        } else if (row === 12) {
+            return { rowspan: 2, colspan: 2 }
+        } else if (row === 13) {
+            return { rowspan: 0, colspan: 0 }
+        } else if (row === 14) {
+            return { rowspan: 1, colspan: 2 }
+        } else {
+            return { rowspan: 1, colspan: 1 }
+        }
+    } else if (column === 7) { //第八列
+        if (row === 12) {
+            return { rowspan: 2, colspan: 1 }
+        } else if (row === 13) {
+            return { rowspan: 0, colspan: 0 }
+        } else if (row === 14) {
+            return { rowspan: 1, colspan: 1 }
+        }
+    } else if (column === 8) { //第九列
+        if (row === 12) {
+            return { rowspan: 2, colspan: 1 }
+        } else if (row === 13) {
+            return { rowspan: 0, colspan: 0 }
+        } else if (row === 14) {
+            return { rowspan: 1, colspan: 1 }
+        }
     }
 }
 
@@ -447,6 +516,7 @@ defineExpose({
         .el-table {
             --el-table-border-color: #dcdcdc;
             --el-table-header-text-color: #101010;
+            --el-table-row-hover-bg-color: transparent;
         }
         .el-table th.el-table__cell.line {
             padding: 0;