Browse Source

再次调整请假模块的样式

Lijy 3 năm trước cách đây
mục cha
commit
eb153f9020
1 tập tin đã thay đổi với 10 bổ sung11 xóa
  1. 10 11
      fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

+ 10 - 11
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -85,7 +85,7 @@
       <!-- <p style="float: right;margin-right: 25px;"><el-button type="primary" @click="submits('addFormRules')" size="mini">提交</el-button></p> -->
     </div>
     <!-- 上面部分 -->
-    <div v-if="!displayTable && apk == false" class="tops">
+    <div v-if="!displayTable && apk == false" class="tops" :style="'height:' +hubs+'px'">
         <!-- 公共 -->
         <div class="ctons" style="width: 98%">
             <!-- 表单 -->
@@ -170,7 +170,7 @@
     </div>
 
     <!-- 下面部分 -->
-    <div v-if="displayTable && apk == false" class="tops">
+    <div v-if="displayTable && apk == false" class="tops" :style="'height:' +hubs+'px'">
         <!-- 公共 -->
         <div class="ctons" style="width: 98%;">
           <div class="flex">
@@ -207,7 +207,7 @@
               <el-date-picker v-model="createDate" type="date" @change="chufas()" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable="false"> </el-date-picker>
             </div>
           </div>
-            <el-table v-loading="loading" :data="tableData" style="width: 100%" height="90%">
+            <el-table v-loading="loading" :data="tableData" style="width: 100%" height="94%">
                 <el-table-column prop="ownerName" label="请假人" min-width="120" fixed="left"></el-table-column>
                 <el-table-column prop="tel" label="电话" min-width="120"></el-table-column>
                 <el-table-column prop="leaveType" label="请假类型" min-width="120">
@@ -289,7 +289,7 @@
     </div>
 
     <!-- 统计部分 -->
-    <div v-if="displayTable && apk && apk2 == 4" class="tops">
+    <div v-if="displayTable && apk && apk2 == 4" class="tops" :style="'height:' +hubs+'px'">
       <!-- 公共 -->
         <div class="ctons" style="width: 98%;">
           <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
@@ -354,7 +354,7 @@
     </div>
 
 <!-- 审批流 -->
-    <div v-if="displayTable && apk && apk2 == 5" class="tops">
+    <div v-if="displayTable && apk && apk2 == 5" class="tops" :style="'height:' +hubs+'px'">
         
         <div class="ctons" style="width: 98%;">
         <el-col :span="6" >
@@ -419,7 +419,7 @@
 
     </div>
   <!-- 年假管理 -->
-    <div v-if="displayTable && apk && apk2 == 6" class="tops">
+    <div v-if="displayTable && apk && apk2 == 6" class="tops" :style="'height:' +hubs+'px'">
       <div class="ctons" style="width: 98%;">
         <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #f2f2f2">
             <div style="display: inline-block;width: 18%;margin-left:1%">
@@ -494,7 +494,7 @@
       </el-dialog>
     </div>
 
-    <div v-if="displayTable && apk && apk2 == 8" class="tops">
+    <div v-if="displayTable && apk && apk2 == 8" class="tops" :style="'height:' +hubs+'px'">
         <!-- 公共 -->
         <div class="ctons" style="width: 98%;">
           <div class="flex">
@@ -531,7 +531,7 @@
             </div>
             
           </div>
-            <el-table key="apk2is8" v-loading="loading" :data="vacationList" style="width: 100%" height="90%">
+            <el-table key="apk2is8" v-loading="loading" :data="vacationList" style="width: 100%" height="94%">
                 <el-table-column prop="name" label="员工姓名" min-width="120" fixed="left"></el-table-column>
                 <el-table-column label="有效期" min-width="250" align="center">
                   <template slot-scope="scope">
@@ -831,7 +831,7 @@ export default {
   created() {
     let widTHBul = document.documentElement.clientWidth - 440
     this.kuanBl = widTHBul
-    this.hubs = document.documentElement.clientHeight || document.body.clientHeight
+    this.hubs = (document.documentElement.clientHeight || document.body.clientHeight) - 70
     let height = window.innerHeight;
             this.tableHeight = height - 195;
             const that = this;
@@ -2019,7 +2019,6 @@ export default {
 /* 请假模块 */
 .tops {
     width: 100%;
-    height:100%;
     position: relative;
     background: #f7f7f7;
     box-sizing: border-box;
@@ -2042,7 +2041,7 @@ export default {
 }
 .poss {
     position: fixed;
-    bottom: 20px;
+    bottom: 4px;
     right: 1%;
     box-sizing: border-box;
 }