From 717e9e882241cc30073ff51db2ef38f7d812db85 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Tue, 1 Jul 2025 16:09:37 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laborManage/attendanceGroup.vue           | 15 ++++++++++--
 .../attendanceManage/attendanceManage.vue     | 11 +++++----
 .../laborManage/newAttendanceRules.vue        | 12 +++++++++-
 .../timeSheet/workHoursAbnormalityTable.vue   | 23 +++++++++++++------
 .../timeSheet/workHoursStatisticsTable.vue    | 23 +++++++++++++------
 5 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/views/projectFront/laborManage/attendanceGroup.vue b/src/views/projectFront/laborManage/attendanceGroup.vue
index 755ecceb..1b5ddc6d 100644
--- a/src/views/projectFront/laborManage/attendanceGroup.vue
+++ b/src/views/projectFront/laborManage/attendanceGroup.vue
@@ -38,7 +38,7 @@
         </el-form>
       </div>
       <div class="table_wrap whiteBlock">
-        <el-table ref="multipleTable" class="tables" :data="rulesList">
+        <el-table height="calc(100% - 64px)" max-height="calc(100% - 64px)" ref="multipleTable" class="tables" :data="rulesList">
           <el-table-column type="selection" align="center" width="55"></el-table-column>
           <el-table-column align="center" prop="groupName" label="考勤组名称">
             <template slot-scope="scope">
@@ -487,7 +487,8 @@
         </el-form>
         <el-table
           ref="selectworkerTable"
-          :height="330"
+          height="calc(100% - 64px - 58px)" 
+          max-height="calc(100% - 64px - 58px)"
           class="tables selectworkerTable"
           :data="selectWorkerList"
         >
@@ -1495,6 +1496,15 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.table_wrap {
+  position: relative;
+  .pagerBox {
+    margin-top: 0;
+    width: 100%;
+    position: absolute;
+    bottom: 16px;
+  }
+}
 .pagerBox1 {
   margin-top: 20px;
   display: flex;
@@ -1510,6 +1520,7 @@ export default {
   overflow-y: auto;
   .main-table {
     margin-top: 20px;
+    height: calc(100% - 130px - 48px - 20px - 64px - 22px);
     .el-input,
     .el-select {
       width: 192px;
diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
index 7761804c..b0c97f01 100644
--- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
+++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue
@@ -189,7 +189,7 @@
             </el-select>
           </div>
         </div>
-        <el-table :data="tableData" :key="itemKey" max-height="500" width="100%" border>
+        <el-table :data="tableData" :key="itemKey" :max-height="570" width="100%" border>
           <el-table-column
             prop="workerName"
             :label="$t('message.laborMange.compellation')"
@@ -334,7 +334,7 @@
               :label="$t('message.laborMange.compellation')"
               align="center"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="temperature"
               :label="$t('message.laborMange.temperature') + '(℃)'"
               align="center"
@@ -381,7 +381,7 @@
               <template slot-scope="scope">
                 {{ vaccinationFrequencyltsList[scope.row.vaccinateState] || "无" }}
               </template>
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column
               prop="passType"
@@ -1373,9 +1373,10 @@ export default {
     padding: 24px 20px 0;
     box-sizing: border-box;
     border-radius: 3px;
-    margin-bottom: 7px;
+    // margin-bottom: 7px;
     .el-form-item {
       margin-right: 30px;
+      margin-bottom: 20px;
     }
     .el-select,
     .el-date-editor,
@@ -1387,7 +1388,7 @@ export default {
   .table_content {
     width: 100%;
     // background: #fff;
-    padding: 15px 0 0;
+    // padding: 15px 0 0;
     border-radius: 3px;
     min-height: 100%;
     // .left {
diff --git a/src/views/projectFront/laborManage/newAttendanceRules.vue b/src/views/projectFront/laborManage/newAttendanceRules.vue
index 7a621dd1..d031922c 100644
--- a/src/views/projectFront/laborManage/newAttendanceRules.vue
+++ b/src/views/projectFront/laborManage/newAttendanceRules.vue
@@ -69,7 +69,7 @@
       </div>
     </div>
     <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="workerList">
+      <el-table height="calc(100% - 64px)" max-height="calc(100% - 64px)" class="tables" :data="workerList">
         <el-table-column
           align="center"
           prop="planName"
@@ -949,6 +949,16 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.table_wrap {
+  position: relative;
+  .pagerBox {
+    margin-top: 0;
+    width: 100%;
+    position: absolute;
+    bottom: 16px;
+  }
+}
+
 /deep/ .el-dialog {
     margin-top: 2vh !important;
 }
diff --git a/src/views/projectFront/laborManage/timeSheet/workHoursAbnormalityTable.vue b/src/views/projectFront/laborManage/timeSheet/workHoursAbnormalityTable.vue
index 4fd1cad8..3ac202b7 100644
--- a/src/views/projectFront/laborManage/timeSheet/workHoursAbnormalityTable.vue
+++ b/src/views/projectFront/laborManage/timeSheet/workHoursAbnormalityTable.vue
@@ -111,21 +111,23 @@
           <el-form-item>
             <el-button type="primary" plain @click="handleQuery">查询</el-button>
             <el-button type="warning" plain @click="handleRefresh">刷新</el-button>
-            <el-button @click="handleCommandExport(1)" type="primary" plain
+            <el-button @click="handleCommandExport(1)" type="primary"
               >导出</el-button
             >
           </el-form-item>
         </el-form>
-      </div>
-      <div class="table-header">
+        <div class="table-header">
         {{ $store.state.currentProDetail.projectName }}项目异常工时统计表
       </div>
+      </div>
+      
       <el-table
         ref="multipleTable"
         :data="tableData"
         row-key="id"
-        :height="450"
         class="new-tables"
+        height="calc(100% - 128px - 4px)"
+        max-height="calc(100% - 128px)"
         border
       >
         <!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
@@ -446,16 +448,21 @@ export default {
   justify-content: center;
   align-items: center;
   font-weight: 800;
-  font-size: 32px;
+  font-size: 26px;
   color: #333333;
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
 }
 .new-tables {
   width: calc(100% - 32px);
-  margin: 20px 16px 0;
+  margin: 0 16px 0;
   font-size: 15px;
   border-color: #e9e9e9;
   /deep/ .el-table__cell {
     border-color: #e9e9e9 !important;
+    padding: 11px 0;
   }
 }
 :deep(.el-dialog__body) {
@@ -547,8 +554,10 @@ export default {
   box-sizing: border-box;
   position: relative;
   height: 100%;
+  padding-bottom: 64px;
   .header_title {
-    padding: 20px 20px 0 20px;
+    padding: 16px 20px 0 20px;
+    position: relative;
     :deep(.el-cascader__search-input) {
       min-width: 10px;
     }
diff --git a/src/views/projectFront/laborManage/timeSheet/workHoursStatisticsTable.vue b/src/views/projectFront/laborManage/timeSheet/workHoursStatisticsTable.vue
index a4cc9f85..f3c7a548 100644
--- a/src/views/projectFront/laborManage/timeSheet/workHoursStatisticsTable.vue
+++ b/src/views/projectFront/laborManage/timeSheet/workHoursStatisticsTable.vue
@@ -83,20 +83,22 @@
           <el-form-item>
             <el-button type="primary" plain @click="handleQuery">查询</el-button>
             <el-button type="warning" plain @click="handleRefresh">刷新</el-button>
-            <el-button @click="handleCommandExport(1)" type="primary" plain
+            <el-button @click="handleCommandExport(1)" type="primary"
               >导出</el-button
             >
           </el-form-item>
         </el-form>
+        <div class="table-header">{{ $store.state.currentProDetail.projectName }}项目工时统计表({{daterangeUp}})</div>
       </div>
-      <div class="table-header">{{ $store.state.currentProDetail.projectName }}项目工时统计表({{daterangeUp}})</div>
+     
       <el-table
         ref="multipleTable"
         :data="tableData"
         row-key="id"
-        :height="450"
         class="new-tables"
         border
+        height="calc(100% - 128px - 32px - 32px)"
+        max-height="calc(100% - 128px - 32px - 32px)"
         :key="itemKey"
       >
         <!-- <el-table-column type="selection" align="center" width="55"></el-table-column> -->
@@ -141,7 +143,7 @@
           v-for="(item, index) in showTime"
           :key="index"
           align="center"
-          width="60"
+          width="100"
         >
           <template slot="header">
             <div>
@@ -449,16 +451,22 @@ export default {
   justify-content: center;
   align-items: center;
   font-weight: 800;
-  font-size: 32px;
+  font-size: 26px;
   color: #333333;
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
 }
 .new-tables {
   width: calc(100% - 32px);
-  margin: 20px 16px 0;
+  // height: calc(100% - 128px - 32px - 32px);
+  margin: 0 16px 0;
   font-size: 15px;
   border-color: #e9e9e9;
   /deep/ .el-table__cell {
     border-color: #e9e9e9 !important;
+    padding: 11px 0;
   }
 }
 :deep(.el-dialog__body) {
@@ -551,7 +559,8 @@ export default {
   position: relative;
   height: 100%;
   .header_title {
-    padding: 20px 20px 0 20px;
+    padding: 16px 20px 0 20px;
+    position: relative;
     :deep(.el-cascader__search-input) {
       min-width: 10px;
     }