Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

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

@@ -31,4 +31,15 @@ export const getConsultingOrgEenterpriseDetailWithSearchApi = (params) => reques
   url: "/advisory/body/getCooperateProjectDetailList",
   method: "get",
   params
+});
+
+/**
+ * 咨询机构项目列表 项目跳转详情获取
+ * @param {*} params 
+ * @returns 
+ */
+export const getgetConsultingOrgProjectDetailApi = (params) => request({
+  url: "/advisory/body/getProjectDetail",
+  method: "get",
+  params
 });
\ No newline at end of file

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

@@ -6,7 +6,29 @@ import request from '@/utils/request';
  * @returns 
  */
 export const getCooperativeOwnerUnitsListApi = (data) => request({
+  url: "/consultancy/page",
+  method: "post",
+  data
+});
+
+/**
+ * 获取(常合作业主单位、常合作施工单位、常合作集团)详情
+ * @param {*} data 
+ * @returns 
+ */
+export const getCooperativeOwnerUnitsDetailApi = (data) => request({
   url: "/consultancy/detailPage",
   method: "post",
   data
+});
+
+/**
+ * 获取下拉列表选项
+ * @param {*} data 
+ * @returns 
+ */
+export const getCooperativeOwnerUnitsOptionsApi = (data) => request({
+  url: "/consultancy/pageSelect",
+  method: "post",
+  data
 });
\ No newline at end of file

dsk-operate-ui/src/assets/styles/index.scss

@@ -454,13 +454,10 @@ li {
 .table-list-com-ins {
   .table-item {
     width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+    max-height: 100%;
     .el-table {
       width: 100%;
-      height: 100%;
+      height: auto;
       font-size: 14px;
       color: #232323;
 

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

@@ -4,7 +4,7 @@
       <el-table v-if="tableDataTotal>0" class="fixed-table" :class="headerFixed ? 'headerFixed':''" v-loading="tableLoading" :data="tableData"
         element-loading-text="Loading" ref="tableRef" border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}"
         @sort-change="sortChange" @selection-change="selectionChange" :cell-class-name="cellClassName" :cell-style="cellStyle"
-        :row-class-name="rowClassName" :row-style="rowStyle" :height="height" :maxHeight="maxHeight" v-sticky-header="stickyHeader">
+        :row-class-name="rowClassName" :row-style="rowStyle" :height="height" :maxHeight="comMaxHeight" v-sticky-header="stickyHeader">
         <el-table-column type="selection" :width="needSelection.width ? needSelection.width : '38px'" v-if="needSelection.flag"
           :fixed="needSelection.fixed" :align="needSelection.align" :show-overflow-tooltip="needSelection.showOverflowTooltip">
         </el-table-column>
@@ -58,7 +58,7 @@
         </template>
       </el-table>
 
-      <div style="padding: 30px 0;box-sizing:border-box;" v-else>
+      <div class="table-empty-container" v-else>
         <no-data />
       </div>
     </div>
@@ -80,7 +80,7 @@ export default {
       type: [String, Number]
     },
     maxHeight: {
-      type: [String, Number]
+      type: Boolean
     },
     isIndex: {
       type: Boolean,
@@ -168,7 +168,8 @@ export default {
   data() {
     return {
       current_page: this.queryParams.pageNum,
-      show_page: this.paging
+      show_page: this.paging,
+      comMaxHeight: null
     };
   },
   watch: {
@@ -177,9 +178,24 @@ export default {
     }
   },
   created() {
-
+    this.maxHeight ? this.maxHeightInit() : null;
   },
   methods: {
+    // 自适应当前容器
+    async maxHeightInit() {
+      try {
+        await this.$nextTick();
+        /** 
+         * @type {HTMLDivElement}
+        */
+        const container = document.querySelector(".table-list-com-ins .table-item");
+        if (container) {
+          this.comMaxHeight = `${container.offsetHeight}px`;
+        }
+      } catch (error) {
+
+      }
+    },
     handleCurrentChange(e) {
       if (this.MaxPage < e) {
         this.show_page = false;
@@ -250,11 +266,21 @@ export default {
       height: 16px;
     }
 
+    // 空状态容器
+    .table-empty-container {
+      width: 100%;
+      height: 100%;
+      padding: 30px 0;
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
     .el-table {
-      /* .cell {
-        display: flex;
-        align-items: center;
-      } */
+      .el-table__header-wrapper {
+        min-height: 40px;
+      }
     }
   }
 

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/basicEngineeringInformation.vue

+<template>
+  <div class="basic-engineering-information">
+    <div class="basic-engineering-information-inner">
+      <!-- 项目主体 -->
+      <div class="project-subject">
+        <div class="info-module-title"><span>项目主体</span></div>
+        <table>
+          <colgroup>
+            <col>
+            <col :style="{width : tableKeyWidth}">
+            <col>
+            <col :style="{width : tableKeyWidth}">
+          </colgroup>
+          <tr>
+            <td class="table-key">业主单位</td>
+            <td>{{comProjectDetailInfo.ownerName ? comProjectDetailInfo.ownerName : "-"}}</td>
+            <td class="table-key">工程承包单位</td>
+            <td>{{comProjectDetailInfo.contractOrgName ? comProjectDetailInfo.contractOrgName : "-"}}</td>
+          </tr>
+          <tr>
+            <td class="table-key">履约责任单位</td>
+            <td>{{comProjectDetailInfo.ownerName ? comProjectDetailInfo.ownerName : "-"}}</td>
+            <td class="table-key">咨询单位</td>
+            <td>{{comProjectDetailInfo.advisoryBodyName ? comProjectDetailInfo.advisoryBodyName : "-"}}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "basicEngineeringInformation",
+  props: {
+    projectDetailInfo: Object
+  },
+  watch: {
+    projectDetailInfo: {
+      handler(newValue) {
+        this.comProjectDetailInfo = newValue;
+      },
+      deep: true
+    }
+  },
+  data() {
+    return {
+      comProjectDetailInfo: this.projectDetailInfo,
+      tableKeyWidth: 0
+    };
+  },
+  //可访问data属性
+  created() {
+    this.setTableKeyWidth();
+  },
+  //计算集
+  computed: {
+
+  },
+  //方法集
+  methods: {
+    async setTableKeyWidth() {
+      try {
+        await this.$nextTick();
+        /** 
+         * @type {HTMLDivElement}
+        */
+        const inner = document.querySelector(".basic-engineering-information-inner");
+        if (inner) {
+          const td = parseInt((inner.offsetWidth - 140 * 2) / 2);
+          this.tableKeyWidth = `${parseInt(parseFloat(td / inner.offsetWidth) * 100)}%`;
+        }
+      } catch (error) {
+
+      }
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.basic-engineering-information {
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  padding: 16px;
+  box-sizing: border-box;
+  overflow: auto;
+
+  .basic-engineering-information-inner {
+    width: 100%;
+    height: 100%;
+    .info-module-title {
+      line-height: 24px;
+      color: #232323;
+      font-weight: bold;
+      font-size: 16px;
+      margin-bottom: 16px;
+      display: flex;
+      align-items: center;
+      & > span {
+        display: inline-block;
+        position: relative;
+        padding-left: 8px;
+        box-sizing: border-box;
+        &::before {
+          content: "";
+          position: absolute;
+          left: 0px;
+          top: 50%;
+          transform: translateY(-50%);
+          background: rgba(35, 35, 35, 0.8);
+          width: 2px;
+          height: 14px;
+        }
+      }
+    }
+    table {
+      width: 100%;
+      border-spacing: 0;
+      border-collapse: collapse;
+      &,
+      th,
+      td {
+        border: 1px solid #e6eaf1;
+        box-sizing: border-box;
+      }
+
+      td {
+        padding: 9px 12px;
+        line-height: 22px;
+        color: #232323;
+        font-size: 12px;
+      }
+
+      .table-key {
+        background: #f0f3fa;
+        color: rgba(35, 35, 35, 0.8);
+        width: 140px;
+        &.lot {
+          height: 62px;
+        }
+      }
+      .data-td {
+        width: calc(100% - 140px);
+      }
+    }
+  }
+}
+</style>

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue

@@ -53,7 +53,7 @@
         <skeleton v-if="tableLoading"></skeleton>
         <!-- table 列表 -->
         <table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
-          v-else-if="!tableLoading" :height="'100%'" @handle-current-change="handleCurrentChange">
+          v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
           <!-- 项目列表 -->
           <template slot="projectName" slot-scope="{data,row}">
             <div v-if="row.projectName" class="no-line-feed ">{{row.projectName}}</div>
@@ -99,7 +99,7 @@ export default {
         { label: '项目列表', prop: 'projectName', width: "222px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true },
         { label: '合同编码', prop: 'projectCode', width: "123px", uid: v4() },
         { label: '省市', prop: 'provinceName', width: "102px", uid: v4() },
-        { label: '项目承接类型', prop: 'isinvestproject', width: "102px", uid: v4() },
+        { label: '项目承接类型', prop: 'isinvestproject', minWidth: "102px", uid: v4() },
         { label: '工程基础大类', prop: 'projectType1', width: "98px", uid: v4() },
         { label: '工程类别明细', prop: 'projectType', width: "98px", uid: v4() },
         { label: '项目负责人姓名', prop: 'projectLeader', width: "110px", uid: v4() },

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue

+<template>
+  <div class="project-detail-container">
+    <div class="project-detail-inner">
+      <div class="project-header-container">
+        <!-- 项目名称 logo -->
+        <div class="prject-icon-and-title">
+          <img src="@/assets/images/financing/head_icon.png" alt="">
+          <div class="prject-title">{{projectDetailInfo.finProjectName ? projectDetailInfo.finProjectName : "-"}}</div>
+        </div>
+        <!-- 项目承接单位 -->
+        <div class="project-undertaking-unit-container">
+          <span class="project-undertaking-unit-title">项目承接单位：</span>
+          <span class="project-undertaking-unit">{{projectDetailInfo.contractOrgName ? projectDetailInfo.contractOrgName : "-"}}</span>
+        </div>
+      </div>
+
+      <!-- tab切换部分 -->
+      <div class="project-consulting-agency">
+        <!-- tab切换栏 -->
+        <dsk-tab-toggle v-model="currentList" :tabs="toggleTabs"></dsk-tab-toggle>
+
+        <!-- tab切换容器 -->
+        <div class="project-consulting-agency-inner">
+          <!-- 工程基本信息 -->
+          <basic-engineering-information v-if="currentList === 'project'" :projectDetailInfo="projectDetailInfo"></basic-engineering-information>
+          <!-- 咨询机构结算信息 -->
+        </div>