修改

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

@@ -176,8 +176,8 @@ export const getFeedSummaryMenuTreeApi = (params = {}) => request({
  * recordDate : string;
  * projectId : number;
  * cbStage : number
- * }} params 
- * @returns 
+ * }} params
+ * @returns
  */
 export const getFeedSummaryListApi = (params = {}) => request({
   url: "/cb/quantity/summary/subjectList",
@@ -185,6 +185,14 @@ export const getFeedSummaryListApi = (params = {}) => request({
   params
 });
 
+
+
+//工程项目信息
+export const getCbProjectInfo = (relatedId) => request({
+  url: '/cbProjectRecord/getCbProjectInfo/' + relatedId,
+  method: "get",
+});
+
 // 其他项目
 
 //其他项目左侧菜单
@@ -198,3 +206,10 @@ export const getProjectOtherStatistics = (relatedId) => request({
   url: '/cb/projectOther/statistics/' + relatedId,
   method: "get",
 });
+
+//其他费用-其他费用列表
+export const getProjectOtherList = (params = {}) => request({
+  url: "/cb/projectOther/list",
+  method: "get",
+  params
+});

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

@@ -44,33 +44,33 @@
 </template>
 <script>
   import InfoTable from '../../../../component/infoTable';
+  import { getCbProjectInfo } from "@/api/projectCostLedger";
 export default {
   name: "projectInformation",
   components: {InfoTable},
   data() {
     return {
+      comProjectId:'',
       labelWidth: 250,
-      forInfo: {
-        name:'宝安中学（集团）初中部改扩建工程施工总承包（二次公告）',
-      },
+      forInfo: { },
       defaultList1: [
         // { name: '工程名称', prop: 'name', slot: true  },
-        { name: '工程名称', prop: 'name', style: true },
-        { name: '工程所在地', prop: 'creditNo' },
-        { name: '工程详细地址', prop: 'operName' },
+        { name: '工程名称', prop: 'projectName', style: true },
+        { name: '工程所在地', prop: 'areaName' },
+        { name: '工程详细地址', prop: 'projectAddress' },
         { name: '业态', prop: 'status' },
-        { name: '工程类型', prop: 'startDate' },
+        { name: '工程类型', prop: 'projectType1' },
         { name: '计价模式（清单/定额）', prop: 'registCapi' },
         { name: '承包形式（EPC/DB/EP/PC）', prop: 'actualCapi'},
         { name: '合同类型', prop: 'checkDate' },
         { name: '建设单位', prop: 'orgNo' },
-        { name: '设计单位', prop: 'regNo' },
+        { name: '设计单位', prop: 'designOrgName' },
         { name: '勘察单位', prop: 'creditNo' },
-        { name: '监理单位', prop: 'econKind' },
+        { name: '监理单位', prop: 'supervisorOrgName' },
         { name: '代理公司（或工料测量师）', prop: 'term'},
         { name: '招标形式', prop: 'qualification' },
         { name: '承包方式', prop: 'provinceCode'},
-        { name: '资金来源', prop: 'belongOrg' },
+        { name: '资金来源', prop: 'moneySource' },
         { name: '分包标准费用项价格库', prop: 'colleguesNum'},
         { name: '材料机械标准费用价格库', prop: 'colleguesNum'},
         { name: '专业类别', prop: 'scope'},
@@ -87,9 +87,9 @@ export default {
         { name: '结构类型', prop: 'registCapi' },
         { name: '基础类型', prop: 'actualCapi'},
         { name: '单体个数', prop: 'checkDate', style: true  },
-        { name: '地上层数', prop: 'orgNo' },
-        { name: '地下层数', prop: 'regNo' },
-        { name: '建筑高度', prop: 'creditNo' },
+        { name: '地上层数', prop: 'noOfOverfloor' },
+        { name: '地下层数', prop: 'noOfUnderfloor' },
+        { name: '建筑高度', prop: 'constructHeight' },
         { name: '地下深度', prop: 'econKind' },
         { name: '首层（m）', prop: 'term'},
         { name: '标准层（m）', prop: 'qualification' },
@@ -146,9 +146,9 @@ export default {
         time:'2023-10-20'
       },
       defaultListYd4: [
-        { name: '计划开工日期', prop: 'time' },
-        { name: '计划竣工日期', prop: 'operName' },
-        { name: '总工期（天）', prop: 'status' },
+        { name: '计划开工日期', prop: 'planStartDate' },
+        { name: '计划竣工日期', prop: 'planEndDate' },
+        { name: '总工期（天）', prop: 'contractWorkDays' },
         { name: '缺陷责任', prop: 'startDate' },
       ],
       forInfoYd5:{
@@ -191,9 +191,40 @@ export default {
       ],
     };
   },
+  props: {
+    // 项目ID
+    // projectId: {
+    //   type: String,
+    //   required: true,
+    //   default: ""
+    // },
+    // 详情信息
+    projectDetailInfo: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  watch: {
+    projectDetailInfo: {
+      handler(newValue) {
+        this.comProjectDetailInfo = newValue ? newValue : {};
+        // this.getCbProjectInfo(this.comProjectDetailInfo.projectId)
+        this.getCbProjectInfo('1759507630130479106')
+        // this.init(this.comProjectDetailInfo);
+      },
+      deep: true,
+      immediate: true
+    },
+    projectId: {
+      handler(newValue) {
+        this.comProjectId = newValue;
+      },
+      immediate: true
+    }
+  },
   //可访问data属性
   created() {
-
+    // this.getCbProjectInfo()
   },
   //计算集
   computed: {
@@ -201,7 +232,17 @@ export default {
   },
   //方法集
   methods: {
+    async getCbProjectInfo(params) {
+      try {
+        const result = await getCbProjectInfo(params);
+        if (result.code == 200) {
+          console.log(result.data)
+          this.forInfo=result.data;
+        }
+      } catch (error) {
 
+      }
+    },
   },
 }
 </script>

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

@@ -9,10 +9,10 @@
         <!-- 放入组件 v-if current == ‘xxxx’ 详情变量 this.detailInfo 需要深度监听-->
 
         <!-- 工程项目信息 -->
-        <engineering-information v-if="current == 'basicEngineeringInformation'"></engineering-information>
+        <engineering-information v-if="current == 'basicEngineeringInformation'" :project-detail-info="detailInfo"></engineering-information>
 
         <!-- 直接费成本 -->
-        <direct-cost v-if="current == 'directCost'"></direct-cost>
+        <direct-cost v-if="current == 'directCost'" :project-detail-info="detailInfo"></direct-cost>
 
         <!-- 工料汇总 -->
         <feed-summary v-if="current == 'feedSummary'" :project-id="projectID" :project-detail-info="detailInfo"></feed-summary>
@@ -21,7 +21,7 @@
         <measure-items v-if="current == 'measureItem'" :project-id="projectID" :project-detail-info="detailInfo"></measure-items>
 
         <!-- 其他项目 -->
-        <other-projects v-if="current == 'otherItems'"></other-projects>
+        <other-projects v-if="current == 'otherItems'" :project-detail-info="detailInfo"></other-projects>
 
         <!-- 盈亏分析对比 -->
         <profit-Loss v-if="current == 'profitAndLoss'" :project-id="projectID" :project-detail-info="detailInfo"></profit-Loss>