merge

dsk-operate-ui/src/api/projectCostLedger/index.js

@@ -173,13 +173,12 @@ export function projectVolume(data) {
 }
 
 //措施费-获取实际成本月份列表
-export function actualMonths(params) {
-  return request({
-    url: '/cb/cost/measures/actual/months',
-    method: 'GET',
-    params
-  });
-}
+export const getActualMonthsApi = (params = {}) => request({
+  url: '/cb/cost/measures/actual/months',
+  method: 'get',
+  params
+});
+
 
 
 // 工料汇总

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

@@ -69,17 +69,15 @@ export default {
   watch: {
     projectDetailInfo: {
       handler(newValue) {
-        this.comProjectDetailInfo = newValue ? newValue : {};
+        this.comProjectDetailInfo = newValue ? cloneDeep(newValue) : {};
         this.init(this.comProjectDetailInfo);
       },
       deep: true,
-      immediate: true
     },
     projectId: {
       handler(newValue) {
         this.comProjectId = newValue;
-      },
-      immediate: true
+      }
     }
   },
   components: {
@@ -94,8 +92,8 @@ export default {
         nodeName: "name",
         nodeValue: "name",
       },
-      comProjectDetailInfo: {},
-      comProjectId: "",
+      comProjectDetailInfo: this.projectDetailInfo ? cloneDeep(this.projectDetailInfo) : {},
+      comProjectId: this.projectId,
       menuTreeList: [],
       // 加载数据列表
       tableLoading: false,
@@ -122,7 +120,7 @@ export default {
   },
   //可访问data属性
   created() {
-
+    this.init(this.comProjectDetailInfo);
   },
   //计算集
   computed: {

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

@@ -15,16 +15,16 @@
         <direct-cost v-if="current == 'directCost'"></direct-cost>
 
         <!-- 工料汇总 -->
-        <feed-summary v-if="current == 'feedSummary'" :project-id="projectID" :project-detail-info="detailInfo"></feed-summary>
+        <feed-summary v-if="current == 'feedSummary'" :project-id="projectId" :project-detail-info="detailInfo"></feed-summary>
 
         <!--措施项目-->
-        <measure-items v-if="current == 'measureItem'" :project-id="projectID" :project-detail-info="detailInfo"></measure-items>
+        <measure-items v-if="current == 'measureItem'" :project-id="projectId" :project-detail-info="detailInfo"></measure-items>
 
         <!-- 其他项目 -->
         <other-projects v-if="current == 'otherItems'"></other-projects>
 
         <!-- 盈亏分析对比 -->
-        <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectID" :project-detail-info="detailInfo"></profit-Loss>
+        <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectId" :project-detail-info="detailInfo"></profit-Loss>
 
       </div>
     </div>
@@ -62,13 +62,13 @@ export default {
   },
   data() {
     return {
-      projectID: "",
+      projectId: "",
       current: "",
       // 详情信息变量
       detailInfo: {
         projectId: "1754425038355890177",
         cbStage: 0,
-        cbType:1
+        cbType: 1
       },
       toggleTabs: [
         {
@@ -162,20 +162,21 @@ export default {
     async getProjectQuery() {
       try {
         const { query } = this.$route;
-        // if (!query.projectID) return this.$message.error("缺少项目id");
-        this.projectID = query.projectID;
+        // if (!query.projectId) return this.$message.error("缺少项目id");
+        this.projectId = query.projectId;
+        // 获取详情 保证详情获取完毕 再执行tab命中 进行生命周期
+        await this.getProjectDetail(query.projectId);
         if (query.current) {
           this.current = query.current;
         } else {
           // 默认命中工程项目信息
           this.current = "basicEngineeringInformation";
         };
-        await this.getProjectDetail(query.projectID);
       } catch (error) {
         console.log(error);
       }
     },
-    async getProjectDetail(projectID) {
+    async getProjectDetail(projectId) {
       try {
 
       } catch (error) {