*

dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue

@@ -21,7 +21,7 @@
         </div>
         <!--汇总-->
         <div class="table-item" v-if="isall">
-          <el-table element-loading-text="Loading" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all
+          <el-table element-loading-text="Loading" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all :max-height="tableHeight"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}" border highlight-current-row :cell-class-name="tored" :header-cell-class-name="tored">
             <el-table-column label="序号" width="60" align="left" type="index"></el-table-column>
             <el-table-column label="名称" width="220" prop="expenseName">
@@ -40,7 +40,7 @@
         </div>
         <!--单条-->
         <div class="table-item" v-else>
-          <el-table element-loading-text="Loading" ref="edittable" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all
+          <el-table element-loading-text="Loading" ref="edittable" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all :max-height="tableHeight"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}" border highlight-current-row :cell-class-name="tored1" :header-cell-class-name="tored1">
             <el-table-column label="序号" width="60" align="left" type="index" fixed="left"></el-table-column>
             <el-table-column label="清单内容" width="130" prop="itemContent" fixed="left">
@@ -247,8 +247,7 @@ export default {
       comProjectDetailInfo: this.projectDetailInfo ? cloneDeep(this.projectDetailInfo) : {},
       comProjectId: this.projectId,
       defaultActive: "",
-      menuTreeList: [
-      ],
+      menuTreeList: [],
       id: 0,
       expenseDate: '',
       tableData: [],
@@ -259,6 +258,7 @@ export default {
       cbVisible:false,
       chooseDate:"",
       isinput:false,//是否填写
+      tableHeight: window.innerHeight - 355
     };
   },
   //可访问data属性
@@ -315,6 +315,7 @@ export default {
       }
     },
     async select(menuPath) {
+      console.log(menuPath)
       this.id = menuPath;
       this.getactualMonths();
       // let month = this.expenseDate.replace('-', "");
@@ -483,6 +484,9 @@ export default {
       .table-item {
         margin-top: 16px;
       }
+      ::v-deep .el-scrollbar.el-table-horizontal-scrollbar {
+        display: none !important;
+      }
     }
   }
   .search {

dsk-operate-ui/src/views/projectCostLedger/detail/components/ProfitLoss/index.vue

@@ -29,6 +29,7 @@
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
             border
             highlight-current-row
+            :max-height="tableHeight"
           >
             <el-table-column label="序号" width="60" align="left" type="index"></el-table-column>
             <el-table-column label="名称" width="300" prop="cbName">
@@ -77,8 +78,9 @@
   </div>
 </template>
 <script>
-  import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
-  import { getProfitLossMenuTreeApi,getAnalysislist } from "@/api/projectCostLedger";
+  import ProjectSideMenu from '@/views/projectCostLedger/detail/components/ProjectSideMenu'
+  import { getAnalysislist, getProfitLossMenuTreeApi } from '@/api/projectCostLedger'
+
   export default {
     name: "orifitloss",
     props: {
@@ -132,70 +134,11 @@
         comProjectDetailInfo: {},
         comProjectId: "",
         defaultActive: "",
-        menuTreeList: [
-          // {
-          //   nodeName: "房建类成本科目",
-          //   id: "1",
-          //   children: [
-          //     {
-          //       nodeName: "劳务分包工程",
-          //       id: "1-1",
-          //       children: [
-          //         {
-          //           nodeName: "主体工程-结构劳务",
-          //           id: "1-1-1",
-          //           children: [
-          //             {
-          //               nodeName: "结构劳务分包",
-          //               id: "1-1-1-1",
-          //             }
-          //           ]
-          //         },
-          //         {
-          //           nodeName: "二次结构及粗装修劳务",
-          //           id: "1-2-1",
-          //           children: [
-          //             {
-          //               nodeName: "二次机构及粗装修劳务",
-          //               id: "1-2-1",
-          //             }
-          //           ]
-          //         },
-          //         {
-          //           nodeName: "拆除、修缮、清理、改造劳...",
-          //           id: "1-3-1",
-          //           children: [
-          //             {
-          //               nodeName: "拆除、修缮、清理、改造劳...",
-          //               id: "1-3-1",
-          //             }
-          //           ]
-          //         }
-          //       ]
-          //     },
-          //     {
-          //       nodeName: "专业分包工程",
-          //       id: "2-1",
-          //     },
-          //     {
-          //       nodeName: "实体工程材料（土建）",
-          //       id: "3-1",
-          //     },
-          //     {
-          //       nodeName: "其他直接费成本",
-          //       id: "4-1",
-          //     },
-          //   ]
-          // },
-          // {
-          //   nodeName: "未归类项目",
-          //   id: "2",
-          //   children: []
-          // }
-        ],
+        menuTreeList: [],
         id: 0,
         expenseDate:'',
         tableData:[],
+        tableHeight: window.innerHeight - 355
       };
     },
     //可访问data属性
@@ -284,6 +227,9 @@
         .table-item{
           margin-top: 16px;
         }
+        ::v-deep .el-scrollbar.el-table-horizontal-scrollbar {
+          display: none !important;
+        }
       }
     }
   }

dsk-operate-ui/src/views/projectCostLedger/index.vue

@@ -40,7 +40,9 @@
           <div class="item-jf-titel">暂无数据，点击按钮导入项目成本数据</div>
           <el-button type="primary" class="jf-btn" size="small" @click="addPro">新增项目</el-button>
         </div>
-        <skeleton v-if="isSkeleton"></skeleton>
+        <div style="padding: 16px;" v-if="isSkeleton">
+        <skeleton></skeleton>
+        </div>
         <div style='padding: 16px' v-if="!isSkeleton&&total>0">
           <div class="total-title">
             <div class="totals">共{{total}}条</div>
@@ -345,6 +347,7 @@
     },
     //获取台账列表
     getlist(){
+      this.isSkeleton = true
       getProjectList(this.formdata).then(res=>{
         if(res.code == 200){
           this.total = res.total
@@ -357,6 +360,7 @@
           this.total = 0
           this.tableData = []
         }
+        this.isSkeleton = false
       })
     },
     handleCheckAllChange(val){