表格bug样式修改

dsk-operate-ui/src/assets/styles/index.scss

@@ -361,10 +361,7 @@ li {
     .is-scrolling-left + .el-table__fixed,
     .is-scrolling-middle + .el-table__fixed,
     .is-scrolling-right + .el-table__fixed {
-      //box-shadow:none;
-      //-webkit-box-shadow: 2px 0px 1px -2px #C3CBD5;
       box-shadow: 2px 0 8px -7px #202020;
-      //border-right: 1px solid #C3CBD5;
       height: auto !important;
       bottom: 16px !important;
     }
@@ -455,7 +452,7 @@ li {
   }
 }
 
-// 封装组件样式
+// 封装组件样式 不要改动
 .table-list-com-ins {
   .table-item {
     .el-table {
@@ -514,8 +511,7 @@ li {
       .is-scrolling-middle + .el-table__fixed,
       .is-scrolling-right + .el-table__fixed {
         box-shadow: 2px 0 8px -7px #202020;
-        height: auto !important;
-        bottom: 16px !important;
+        bottom: 15px !important;
       }
       .el-table__body tr.current-row > td.el-table__cell {
         background: none;

dsk-operate-ui/src/components/CustomTable/index.vue

 <template>
-  <div class="table-list-com-ins" :class="{'is-empty-table' : !tableDataTotal,'no-pagination' : !hasQueryParams}">
+  <div class="table-list-com-ins" :class="{'is-empty-table' : !tableDataTotal,'no-pagination' : !hasQueryParams,'auto-max-height' : maxHeight}">
     <div class="table-item">
       <el-table v-if="tableDataTotal>0" class="fixed-table" v-loading="tableLoading" :data="tableData" element-loading-text="Loading" ref="tableRef"
         border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}" @sort-change="sortChange" @selection-change="selectionChange"
@@ -51,7 +51,7 @@ export default {
       type: [String, Number]
     },
     maxHeight: {
-      type: Boolean
+      type: [Boolean, Number]
     },
     isIndex: {
       type: Boolean,
@@ -167,6 +167,10 @@ export default {
     async maxHeightInit() {
       try {
         await this.$nextTick();
+        if (typeof this.maxHeight == "number") {
+          this.comMaxHeight = `${this.maxHeight}px`;
+          return;
+        }
         /** 
          * @type {HTMLDivElement}
         */
@@ -220,6 +224,7 @@ export default {
 
 <style lang="scss" scoped>
 .table-list-com-ins {
+  /* 空数据样式 */
   &.is-empty-table {
     .table-item {
       max-height: unset;
@@ -227,6 +232,32 @@ export default {
     }
   }
 
+  /* maxHeight自适应样式 */
+  &.auto-max-height {
+    ::v-deep .table-item {
+      .el-table {
+        /* 右侧fixed列 */
+        .el-table__fixed-right {
+          z-index: 9;
+          right: 16px !important;
+          bottom: 15px !important;
+          .el-table__fixed-header-wrapper {
+            position: absolute;
+          }
+        }
+        .el-table__fixed-right-patch {
+          width: 16px !important;
+          z-index: 9;
+          background: #f0f3fa;
+          border: 1px solid #e6eaf1;
+          border-left: unset;
+          border-bottom: unset;
+        }
+      }
+    }
+  }
+
+  /* 不需要分页 或没有分页参数 */
   &.no-pagination {
     ::v-deep .table-item {
       max-height: 100%;
@@ -290,13 +321,11 @@ export default {
       .el-table__header-wrapper {
         min-height: 40px;
       }
-      /* 右侧fixed列 */
-      .el-table__fixed-right {
-        right: 16px !important;
-        bottom: 16px !important;
-        .el-table__fixed-header-wrapper {
-          position: absolute;
+      .el-table__fixed {
+        height: 100% !important;
       }
+      .el-table__fixed-right {
+        height: 100% !important;
       }
     }
   }
@@ -344,19 +373,6 @@ export default {
   ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
     background-color: #dcebff;
   }
-  ::v-deep .fixed-table {
-    overflow: visible;
-  }
-  ::v-deep .el-table__header-wrapper {
-    position: sticky;
-    top: 0;
-    z-index: 9;
-  }
-  ::v-deep .el-table__fixed-header-wrapper {
-    position: sticky;
-    z-index: 9;
-    top: 0;
-  }
   ::v-deep .el-table__fixed {
     overflow-x: clip;
     overflow-y: clip;

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

@@ -35,7 +35,7 @@
         <!-- 数据列表部分 -->
         <div class="project-feedsummary-list-container">
           <dsk-skeleton v-if="tableLoading"></dsk-skeleton>
-          <custom-table :tableData="tableDataList" :formColum="formColum" v-else-if="!tableLoading" :maxHeight="true" :tableDataTotal="total"
+          <custom-table :tableData="tableDataList" :formColum="formColum" v-else-if="!tableLoading" :tableDataTotal="total"
             :paging="false">
             <template slot="action-field-bar" slot-scope="scope">
               <div class="project-action-field-bar" v-if="scope.row.id != '0'">
@@ -128,7 +128,7 @@ export default {
       total: 0,
       // 列表表头
       formColum: [
-        { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: false, uid: v4() },
+        { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: "left", uid: v4() },
         { label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4(), slot: true },
         { label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
         { label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
@@ -535,7 +535,7 @@ export default {
       .project-feedsummary-list-container {
         width: 100%;
         height: calc(100% - 48px);
-        /* overflow: auto; */
+        overflow: auto;
 
         .dsk-skeleton-outer-container {
           padding: 0px;

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

@@ -193,8 +193,8 @@ export default {
         const detail = await getProjectDetailApi(projectId);
         if (detail.code == 200 && detail.data) {
           if (detail.data.id) detail.data["projectId"] = detail.data.id;
-          // detail.data["projectId"] = "1754425038355890177";
-          // detail.data["cbStage"] = 0;
+          detail.data["projectId"] = "1754425038355890177";
+          detail.data["cbStage"] = 0;
           this.detailInfo = detail.data;
         }
       } catch (error) {