修改

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

@@ -266,7 +266,14 @@ export default {
   },
   //可访问data属性
   created() {
-    this.init(this.comProjectDetailInfo);
+    const { projectId, cbStage } = this.comProjectDetailInfo;
+    if (!projectId) return;
+    const params = {
+      projectId,
+      cbStage,
+      cbType: this.currentCategory
+    };
+    this.getCostSummaryMenuTree(params);
   },
   //计算集
   computed: {
@@ -328,7 +335,7 @@ export default {
           cbStage,
           cbType: this.currentCategory
         };
-        await this.getCostSummaryMenuTree(params);
+        // await this.getCostSummaryMenuTree(params);
         await this.getCostSummaryMonthList(params, saveReset);
         await this.getLockMonthList(params);
         await this.initDefaultSetting(resetDate, saveReset);
@@ -392,28 +399,51 @@ export default {
       }
       return params;
     },
+    async getMenuTree(params) {
+      try {
+        const result = await getCostSummaryMenuTreeApi(params);
+        if (result.code == 200 && result.data instanceof Array) {
+          const _tempArray = result.data;
+          const _tempMenu = {
+            id: 0,
+            cbName: this.currentCategory == 1 ? "成本汇总" : "房建类成本科目",
+            children: _tempArray
+          };
+          this.menuTreeList = _tempArray.length ? [_tempMenu] : [];
+        }
+      } catch (error) {
+
+      }
+    },
     async getCostSummaryMenuTree(params) {
       try {
         const result = await getCostSummaryMenuTreeApi(params);
         if (result.code == 200 && result.data instanceof Array) {
+          if(this.projectDetailInfo.cbStage === 3 && this.currentCategory === 1){
             if(result.data.length === 0){
-            this.show=true;
-          }
-          const _tempArray = result.data;
-          if(this.projectDetailInfo.cbStage === 3){
-            if(_tempArray.length === 0){
               this.currentCategory=2;
               this.categoryList[0].disabled=true;
-              this.$forceUpdate();
+              const { projectId, cbStage } = this.comProjectDetailInfo;
+              const params = {
+                projectId,
+                cbStage,
+                cbType: this.currentCategory
+              };
+              this.getMenuTree(params);
               return this.init(this.comProjectDetailInfo);
             }
           }
+          if(result.data.length === 0){
+            this.show=true;
+          }
+          const _tempArray = result.data;
           const _tempMenu = {
             id: 0,
             cbName: this.currentCategory == 1 ? "成本汇总" : "房建类成本科目",
             children: _tempArray
           };
           this.menuTreeList = _tempArray.length ? [_tempMenu] : [];
+          this.init(this.comProjectDetailInfo);
         }
       } catch (error) {
 

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

@@ -237,7 +237,6 @@ export default {
       try {
         const result = await getCbProjectInfo(params);
         if (result.code == 200) {
-          console.log(result.data)
           this.forInfo=result.data;
         }
       } catch (error) {

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

@@ -90,7 +90,8 @@
               </el-table-column>
               <el-table-column label="项目状态" prop="customerCode"  width="100" :resizable="false">
                 <template slot-scope="scope">
-                  <template v-for="item in ztStagelist">
+                  <span v-if="scope.row.cbStage ===3">--</span>
+                  <template v-else v-for="item in ztStagelist">
                     <template v-if="item.dictValue == scope.row.projectFileStatus">
                      <span class="zts" :class="'zt'+scope.row.projectFileStatus">{{item.dictLabel}}</span>
                     </template>

dsk-operate-ui/src/views/supplier/supplierOverview/index.vue

@@ -554,6 +554,159 @@
         ],
 
         tableData:[
+          {
+            name:'北京宁盛伟业建筑工程机械设备租赁有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京森桦建业防水工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京致用恒力建筑材料检测有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京振兴万源建筑工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京天罡星机械设备租赁有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'河南省天地建筑防水工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'重庆尔安机电设备工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'山东鸿华建筑安装工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'江苏地基工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'信邦建设集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'华诚博远钢结构有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'江苏金祥建设工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'浙江精工钢结构集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京洪雨建设工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京中城华远建设集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'德州亚太集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'浙江中南绿建科技集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
           {
             name:'中国石油化工股份有限公司',
             fxsl:'27',