Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

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

@@ -9,7 +9,7 @@
       <div class="directCost-cont">
         <div class="left">
           <div class="left-side-menu">
-            <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive">
+            <project-side-menu :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" :default-active="defaultActive"  @select="handleSelect">
               <template :slot="`${menuDetails.menuName}-${menuDetails.menuLevel}`">
                 <img src="@/assets/images/projectCostLedger/icon_cost_detail_1.svg" alt="">
                 <div class="project-sub-menu-title-text">{{menuDetails.menuName}}</div>
@@ -162,13 +162,14 @@ export default {
         children : "childrenList"
       },
       detailsId:'',
+      menuId:''
     };
   },
   watch: {
     projectDetailInfo: {
       handler(newValue) {
         this.comProjectDetailInfo = newValue ? newValue : {};
-        this.getCbDirectExpenseList('1763446872284012544')
+        this.getCbDirectExpenseMenuTreeApi(this.comProjectDetailInfo.projectId)
         // this.getProjectOtherStatistics(this.comProjectDetailInfo.projectId)
         // this.getProjectOtherStatistics('1762014527685136385')
         // this.init(this.comProjectDetailInfo);
@@ -185,7 +186,7 @@ export default {
   },
   //可访问data属性
   created() {
-    this.getCbDirectExpenseMenuTreeApi('1760222923030876161')
+
   },
   mounted() {
 
@@ -204,10 +205,11 @@ export default {
           this.menuDetails=_tempArray
           this.menuTreeList.push(_tempArray);
           const defaultCurrent = this.findMenuNode(this.menuTreeList, "土石方部分");
-          console.log(defaultCurrent)
           if (defaultCurrent) {
             this.defaultActive = defaultCurrent.menuName;
+            this.menuId = defaultCurrent.menuId;
           }
+          this.getCbDirectExpenseList(defaultCurrent.menuId)
         }
       } catch (error) {
 
@@ -229,6 +231,11 @@ export default {
 
       }
     },
+    handleSelect(menuPath, menuPathArray){
+      this.defaultActive=menuPath;
+      this.menuId=menuPathArray.originData.menuId
+      this.getCbDirectExpenseList(menuPathArray.originData.menuId)
+    },
     tableRowClassName({row, rowIndex}) {
       if (row.expenseCategoryTag === '清') {
         return 'color1';
@@ -248,7 +255,7 @@ export default {
       cbDirectExpenseAdd(JSON.stringify(this.ruleForm)).then(res=>{
         if(res.code == 200){
           this.dialogVisible = false
-          this.getCbDirectExpenseList('1763446872284012544')
+          this.getCbDirectExpenseList(this.menuId)
         }
       })
     },
@@ -264,7 +271,7 @@ export default {
               type: 'success',
               message: '删除成功!'
             });
-            this.getCbDirectExpenseList()
+            this.getCbDirectExpenseList(this.menuId)
           }
         })
       }).catch(() => {

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

@@ -209,8 +209,8 @@ export default {
     projectDetailInfo: {
       handler(newValue) {
         this.comProjectDetailInfo = newValue ? newValue : {};
-        // this.getCbProjectInfo(this.comProjectDetailInfo.projectId)
-        this.getCbProjectInfo('1759507630130479106')
+        this.getCbProjectInfo(this.comProjectDetailInfo.projectId)
+        // this.getCbProjectInfo('1759507630130479106')
         // this.init(this.comProjectDetailInfo);
       },
       deep: true,

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

@@ -226,7 +226,7 @@ export default {
     projectDetailInfo: {
       handler(newValue) {
         this.comProjectDetailInfo = newValue ? newValue : {};
-        this.getProjectOtherStatistics(this.comProjectDetailInfo.projectId)
+        this.getProjectOtherMenuTreeApi(this.comProjectDetailInfo.projectId)
         // this.getProjectOtherStatistics('1762014527685136385')
         // this.init(this.comProjectDetailInfo);
       },
@@ -242,7 +242,7 @@ export default {
   },
   //可访问data属性
   created() {
-    this.getProjectOtherMenuTreeApi('1762014527685136385')
+
 
   },
   //计算集
@@ -268,9 +268,9 @@ export default {
         const result = await getProjectOtherMenuTreeApi(params);
         if (result.code == 200) {
           const _tempArray = result.data;
-
           _tempArray.unshift({id:"11",itemContent:"费用汇总"});
           this.menuTreeList[0].children = _tempArray;
+          this.getProjectOtherStatistics(this.comProjectDetailInfo.projectId)
         }
       } catch (error) {