Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -765,6 +765,17 @@
 .hiddenFirstCol {
     .ant-table {
         .ant-table-content {
+            .ant-table-scroll {
+                .ant-table-hide-scrollbar {
+                    .ant-table-fixed {
+                        .ant-table-thead {
+                            .ant-table-expand-icon-th {
+                                display: none;
+                            }
+                        }
+                    }
+                }
+            }
             .ant-table-body {
                 table {
                     .ant-table-thead {

src/layout/components/main.vue

@@ -87,7 +87,4 @@ export default defineComponent({
         }
     }
 }
-.ant-layout.ant-layout-has-sider > .ant-layout, .ant-layout.ant-layout-has-sider > .ant-layout-content {
-    overflow: auto;
-}
 </style>;

src/views/information/spot-contract/list/checkpending/index.vue

@@ -12,7 +12,8 @@
                rowKey="key"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />

src/views/information/spot-contract/list/finished/index.vue

@@ -12,7 +12,8 @@
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />

src/views/information/spot-contract/list/performance/index.vue

@@ -12,7 +12,8 @@
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -12,7 +12,8 @@
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"
                rowKey="key"
-               :data-source="tableList">
+               :data-source="tableList"
+               :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 153px)' }">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />