merge

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

@@ -143,7 +143,7 @@ export default {
       comMaxHeight: null,
       hasQueryParams: false,
       comMaxBodyHeight: 0,
-      headerLastBlockHeight: 40,
+      headerLastBlockHeight: 0,
       observer: null,
       resizeTimer: null
     };
@@ -234,12 +234,13 @@ export default {
             const bodyMaxHeight = containerMaxHeight - headerHeight - 16;
             // console.log(bodyMaxHeight, "bodyMaxHeight");
             this.comMaxBodyHeight = bodyMaxHeight;
-          }
-          // 正常情况下 计算默认header高度
-          const defaultHeader = this.$el.querySelector(".el-table__header-wrapper");
-          if (defaultHeader) {
-            const headerHeight = parseInt(window.getComputedStyle(defaultHeader).height);
-            this.headerLastBlockHeight = headerHeight;
+          } else {
+            // 没有固定列 正常情况下 计算默认header高度
+            const defaultHeader = this.$el.querySelector(".el-table__header-wrapper");
+            if (defaultHeader) {
+              const headerHeight = parseInt(window.getComputedStyle(defaultHeader).height);
+              this.headerLastBlockHeight = headerHeight;
+            }
           }
         }
       } catch (error) {

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

@@ -158,7 +158,7 @@ export default {
       menuDetails:{},
       menuOptions: {
         nodeName: "menuName",
-        nodeValue: "menuName",
+        nodeValue: "menuId",
         children : "childrenList"
       },
       detailsId:'',
@@ -206,7 +206,7 @@ export default {
           this.menuTreeList.push(_tempArray);
           const defaultCurrent = this.findMenuNode(this.menuTreeList, "土石方部分");
           if (defaultCurrent) {
-            this.defaultActive = defaultCurrent.menuName;
+            this.defaultActive = defaultCurrent.menuId;
             this.menuId = defaultCurrent.menuId;
           }
           this.getCbDirectExpenseList(defaultCurrent.menuId)
@@ -233,8 +233,8 @@ export default {
     },
     handleSelect(menuPath, menuPathArray){
       this.defaultActive=menuPath;
-      this.menuId=menuPathArray.originData.menuId
-      this.getCbDirectExpenseList(menuPathArray.originData.menuId)
+      this.menuId=menuPath
+      this.getCbDirectExpenseList(menuPath)
     },
     tableRowClassName({row, rowIndex}) {
       if (row.expenseCategoryTag === '清') {
@@ -286,7 +286,7 @@ export default {
       });
     },
     findMenuNode(tree, nodeName) {
-      console.log(tree)
+      // console.log(tree)
       for (const item of tree) {
         if (item.menuName == nodeName) return item;
         if (item.childrenList instanceof Array) {

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

@@ -104,7 +104,7 @@ export default {
           { label: '截至本月总费用', prop: "jzbyzfy", minWidth: "175", uid: v4() },
         ],
         "其他费用(包含建设其他费)": [
-          { label: '序号', prop: "number", width: "53", fixed: false, uid: v4() },
+          { label: '序号', prop: "number", width: "60", fixed: false, uid: v4() },
           { label: '名称', prop: "expenseName", width: "121", uid: v4(), showOverflowTooltip: true },
           { label: '单位', prop: "unit", width: "121", uid: v4() },
           { label: '成本数量', prop: "cbCount", width: "121", uid: v4() },
@@ -119,7 +119,7 @@ export default {
           { label: '截止本月总费用', prop: "jzbyzfy", width: "129", uid: v4() },
         ],
         "工资统筹": [
-          { label: '序号', prop: "number", width: "53", fixed: false, uid: v4() },
+          { label: '序号', prop: "number", width: "60", fixed: false, uid: v4() },
           { label: '名称', prop: "expenseName", minWidth: "121", uid: v4(), showOverflowTooltip: true },
           { label: '单位', prop: "unit", width: "121", uid: v4() },
           { label: '成本数量', prop: "cbCount", width: "121", uid: v4() },
@@ -133,7 +133,7 @@ export default {
           { label: '截止本月总费用', prop: "jzbyzfy", width: "128", uid: v4() },
         ],
         "现场管理费": [
-          { label: '序号', prop: "number", width: "53", fixed: false, uid: v4() },
+          { label: '序号', prop: "number", width: "60", fixed: false, uid: v4() },
           { label: '名称', prop: "expenseName", minWidth: "121", uid: v4(), showOverflowTooltip: true },
           { label: '单位', prop: "unit", width: "121", uid: v4() },
           { label: '工程量', prop: "engineeringVolume", width: "121", uid: v4() },