预算与实际统计更改

src/styles/static/actual.scss

@@ -1,5 +1,6 @@
 .table_box{
-    height: calc(100vh - 450px);overflow-y: auto;   
+    height: calc(100vh - 450px);
+   
 }
 
 

src/views/static/components/tab-all.vue

@@ -1,5 +1,5 @@
 <template>
-          <div class="bg-white p-2  table_box" >
+          <div class="bg-white p-2 table_box" >
             <el-row :gutter="14" style="justify-content: flex-end;">
             
                 <div class="w-36 ml-4 mr-2" >
@@ -8,25 +8,32 @@
                     </el-select>
                 </div>
             </el-row>
-            
-            <el-table :data="tableData" border class="mt-4 "  v-if="costcheck==1" :header-cell-style="headerStyle" stripe>
-                <el-table-column v-for="item in tableColData"  align="center" 
-                :prop="item.id"
-                :label="item.name"
-                :key="item.id">
-                    <el-table-column v-for="item1 in item.children" align="center"
-                        :prop="item1.id"
-                        :label="item1.name"
-                        :key="item1.id">
-                            <el-table-column v-for="item2 in item1.children" align="center"
-                            :prop="item2.id"
-                            :label="item2.name"
-                            :key="item2.id">
-                        </el-table-column>
-                    </el-table-column>
-                </el-table-column>
-            </el-table>
-            <el-table stripe :data="tableData" border class="mt-4" v-if="costcheck==2" :header-cell-style="{ background:'rgb(214, 225, 255)', fontSize:'16px',color:'black'}" >
+              <el-table :data="tableData" border class="mt-4 "  v-if="costcheck==1"  stripe :header-cell-style="headerStyle" style="height: 90%;">
+                  <el-table-column v-for="item in tableColData"  align="center" 
+                  :prop="item.id"
+                  :label="item.name"
+                  :key="item.id"
+                  :min-width="180"
+                  >
+                      <el-table-column v-for="item1 in item.children" align="center"
+                          :prop="item1.id"
+                          :label="item1.name"
+                          :key="item1.id"
+                          :min-width="180"
+                          >
+                              <el-table-column v-for="item2 in item1.children" align="center"
+                              :prop="item2.id"
+                              :label="item2.name"
+                              :key="item2.id"
+                              :min-width="180"
+                              >
+                          </el-table-column>
+                      </el-table-column>
+                  </el-table-column>
+              </el-table>
+       
+       
+            <el-table stripe :data="tableData" border class="mt-4 " v-if="costcheck==2" :header-cell-style="{ background:'rgb(214, 225, 255)', fontSize:'16px',color:'black'}"   style="height: 90%;">
                 <el-table-column 
                 v-for="item in tableprojectColData"  
                 :prop="item.id"
@@ -35,7 +42,7 @@
                 
                 ></el-table-column>
             </el-table>
-            <el-table stripe :data="tableData" border class="mt-4" v-if="costcheck!=='2'&&costcheck!=='1'" :header-cell-style="{ background:'rgb(214, 225, 255)', fontSize:'16px',color:'black'}" >
+            <el-table stripe :data="tableData" border class="mt-4 " v-if="costcheck!=='2'&&costcheck!=='1'" :header-cell-style="{ background:'rgb(214, 225, 255)', fontSize:'16px',color:'black'}"   style="height: 90%;">
                 <el-table-column 
                 v-for="item in otherColData"  
                 :prop="item.id"
@@ -83,7 +90,7 @@ const tableData=ref([
     {time:'九月',beginremain:'2000'},
     {time:'十月',beginremain:'2000'},
     {time:'十一月',beginremain:'2000'},
-    {time:'十二月',beginremain:'2000'},
+    {time:'十二月',beginremain:'20001'},
     
 
 ])
@@ -92,33 +99,14 @@ const tableColData=ref([
           id: 'time',
           name: '时间',
           children:[
-            {
-              id: 'time',
-              name: '时间',
-              children:[
-                {
-                  id: 'time',
-                  name: '时间',
-                }
-              ]
-            }
+      
           ]
         },
         {
           id: 'beginremain',
           name: '期初上账余额',
           children:[
-            {
-              id: 'beginremain',
-              name: '期初上账余额',
-              children:[
-                {
-                  id: 'beginremain',
-                  name: '期初上账余额',
-                  
-                }
-              ]
-            }
+     
           ]
         },
         {
@@ -129,52 +117,35 @@ const tableColData=ref([
                 id: 'beginremain',
                 name: '计划回款',
                 children:[
-                  {
-                    id: 'beginremain',
-                    name: '计划回款',
-                   
-                  }
+                
                 ]
                 },
                 {
                 id: 'beginremain',
                 name: '项目回款',
                 children:[
-                    {
-                      id: 'beginremain',
-                       name: '项目回款',
-                       
-                    }
+                
                 ]
                 },
                 {
                 id: 'beginremain',
                 name: '营业外收入',
                 children:[
-                  {
-                    id: 'beginremain',
-                    name: '营业外收入',
-                  }
+               
                 ]
                 },
                 {
                 id: 'beginremain',
                 name: '过账资金',
                 children:[
-                  {
-                    id: 'beginremain',
-                    name: '过账资金',
-                  }
+                  
                 ]
                 },
                 {
                 id: 'beginremain',
                 name: '项目保证金、押金退回',
                 children:[
-                  {
-                    id: 'beginremain',
-                    name: '项目保证金、押金退回',
-                  }
+               
                 ]
                 },
           ]
@@ -186,32 +157,17 @@ const tableColData=ref([
                 {
                 id: 'beginremain',
                 name: '借入',
-                children:[
-                  {
-                    id: 'beginremain',
-                    name: '借入',
-                  }
-                ]
+                children:[]
                 },
                 {
                 id: 'beginremain',
                 name: '偿还本金',
-                children:[
-                  {
-                    id: 'beginremain',
-                    name: '偿还本金',
-                  }
-                ]
+                children:[]
                 },
                 {
                 id: 'beginremain',
                 name: '偿还利息',
-                children:[
-                  {
-                    id: 'beginremain',
-                    name: '偿还利息',
-                  }
-                ]
+                children:[]
                 },
           
               
@@ -225,22 +181,12 @@ const tableColData=ref([
                 {
                 id: 'beginremain',
                 name: '员工借款',
-                children:[
-                  {
-                    id: 'beginremain',
-                    name: '员工借款',
-                  }
-                ]
+                children:[ ]
                 },
                 {
                 id: 'beginremain',
                 name: '员工借支还款',
-                children:[
-                  {
-                    id: 'beginremain',
-                    name: '员工借支还款',
-                  }
-                ]
+                children:[]
                 
                 
                 },
@@ -355,50 +301,8 @@ const otherColData=ref([
 //合并
 
 const headerStyle=({ row, column, rowIndex, columnIndex })=>{
-
     const comStyle = {fontSize:"16px" ,background: "rgb(214, 225, 255)",color:'black'}
-      // 1.1 让第0行的第0列跨2行
-      if (rowIndex === 0 && columnIndex === 0
-      ||rowIndex === 0 && columnIndex === 1
-  
-      )
-       {
-        nextTick(() => {
-          document
-            .getElementsByClassName(column.id)[0]
-            .setAttribute("rowSpan", 3);
-         
-          return comStyle;
-        });
-      }else if(
-          rowIndex === 1 && columnIndex === 2
-          ||rowIndex === 1 && columnIndex === 3
-          ||rowIndex === 1 && columnIndex === 4
-          ||rowIndex === 1 && columnIndex === 5
-          ||rowIndex === 1 && columnIndex === 6
-          ||rowIndex === 1 && columnIndex === 7
-          ||rowIndex === 1 && columnIndex === 8
-          ||rowIndex === 1 && columnIndex === 9
-          ||rowIndex === 1 && columnIndex === 10
-          ||rowIndex === 1 && columnIndex === 11
-      ){
-        nextTick(() => {
-          document
-            .getElementsByClassName(column.id)[0]
-            .setAttribute("rowSpan", 2);
-         
-          return comStyle;
-      })
-    }
-      // 1.2 被覆盖的进行隐藏
-      if (rowIndex === 1 && (columnIndex == 0 ||columnIndex == 1)) {
-        return {
-          display: "none",
-          ...comStyle,
-        };
-      }
-
-      return comStyle;
+    return comStyle;
 }
 
 const costcheck=ref('1')
@@ -406,6 +310,13 @@ const costcheck=ref('1')
 
 <style scoped lang="scss">
 
-
+.tableover{
+    height: 550px;
+     overflow-y: auto;
+   }
+.table_box_flo{
+     height: calc(100vh - 450px);
+     
+ }
 
 </style>

src/views/static/components/tab-decost.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="bg-white p-2 table_box" >
      
-          <el-table :data="tableData" border class="mt-4"   :header-cell-style="headerStyle" stripe  :row-class-name="tableRowClassName">
+          <el-table :data="tableData" border class="mt-4"   :header-cell-style="headerStyle" stripe  :row-class-name="tableRowClassName"  style="height: 90%;">
           <el-table-column v-for="item in tableColData"  align="center"
           :prop="item.id"
           :label="item.name"

src/views/static/components/tab-mannager.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="bg-white p-2 table_box" >
      
-          <el-table :data="tableData" border class="mt-4"  stripe     :header-cell-style="headerStyle" :row-class-name="tableRowClassName"
+          <el-table :data="tableData" border class="mt-4"  stripe     :header-cell-style="headerStyle" :row-class-name="tableRowClassName"  style="height: 90%;"
 >
           <el-table-column v-for="item in tableColData"  align="center"
           :prop="item.id"

src/views/static/components/tab-month.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="bg-white p-2 table_box" >
      
-          <el-table :data="tableData" border class="mt-4"  stripe  :header-cell-style="headerStyle"  :row-class-name="tableRowClassName">
+          <el-table :data="tableData" border class="mt-4"  stripe  :header-cell-style="headerStyle"  :row-class-name="tableRowClassName" style="height: 90%;">
           <el-table-column v-for="item in tableColData"  align="center"
           :prop="item.id"
           :label="item.name"