From a3094611deac91e0ec35bcfe3f3fdd3bdf993466 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 26 四月 2024 16:18:40 +0800
Subject: [PATCH] 考勤统计模块 增加月份对应的星期的数据处理+对应考勤统计的样式调整

---
 src/components/makepager/TableCommonView.vue |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index cf7f976..482f74a 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -13,8 +13,9 @@
       :show-summary="showSummary.show"
       :summary-method="getSummaries"
       :span-method="arraySpanMethod"
+      :class="tableList.headerHeight?'table-height-47px':''"
       @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#f1f3f8', color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
+      :header-cell-style="{ background: '#f1f3f8', height:tableList.headerHeight?tableList.headerHeight:'37px',color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
       size="mini"
       @row-click="tableRowClick"
       :row-class-name="tableRowClassName"
@@ -42,7 +43,7 @@
       
       <template slot="header">
           {{ item.label }}
-          <span v-if="item.weekDay"> - {{item.weekDay}}</span>
+          <div v-if="item.weekDay">{{item.weekDay}}</div>
           <span v-if="item.iconRight">
             <i
               :class="item.iconRight"
@@ -237,7 +238,7 @@
         this.showcol = newVal
       },
       immediate: true
-    }
+    },
   },
   methods: {
     onMaskClick() {
@@ -489,9 +490,21 @@
       font-weight: bold;
     }
   }
+  .el-table__fixed{
+    height:calc(100% - 8px)!important;
+  }
   .el-table__fixed-body-wrapper{
     top:37px!important;
   }
+  .table-height-47px .el-table__fixed-body-wrapper{
+    top:47px!important;
+  }
+  .el-table__body-wrapper{
+    height:calc(100% - 38px)!important;
+  }
+  .table-height-47px .el-table__body-wrapper{
+    height:calc(100% - 48px)!important;
+  }
 }
 
 ::v-deep .el-table .cell {

--
Gitblit v1.8.0