merge

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

@@ -39,7 +39,19 @@ export const getCooperativeOwnerUnitsOptionsApi = (data) => request({
  * @returns 
  */
 export const getCooperativeOwnerUnitsCountAmountApi = (data) => request({
-  url: "/consultancy/pageSelect",
+  url: "/consultancy/statistics",
+  method: "post",
+  data
+});
+
+
+/**
+ * 常合作集团详情 合作成员列表
+ * @param {*} data 
+ * @returns 
+ */
+export const getCooperativeGroupMemberApi = (data) => request({
+  url: "/consultancy/combinePage",
   method: "post",
   data
 });
\ No newline at end of file

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

@@ -39,7 +39,7 @@
         v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
         <!-- 咨询机构名称 -->
         <template slot="advisoryBodyName" slot-scope="{data,row}">
-          <div v-if="row.advisoryBodyName" class="no-line-feed ">{{row.advisoryBodyName}}</div>
+          <div v-if="row.advisoryBodyName" class="no-line-feed" @click="viewEnterprise(row)">{{row.advisoryBodyName}}</div>
           <span v-else>-</span>
         </template>
         <!-- 合作项目数量 -->
@@ -70,6 +70,7 @@ import Skeleton from "@/components/Skeleton";
 import { getConsultingOrgEenterpriseListWithSearchApi } from "@/api/consultingOrgManagement";
 import { queryConditionFiltering } from "@/utils";
 import { v4 } from 'uuid';
+import { encodeStr } from "@/assets/js/common";
 export default {
   name: "cooperationDeskAccountEnterprise",
   components: {
@@ -140,6 +141,10 @@ export default {
       if (!row.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
       this.$tab.openPage(`${row.advisoryBodyName}合作明细`, `/consultingOrgManagement/detailsOfCooperation/${row.advisoryBodyCid}`);
     },
+    // 跳转到企业详情
+    viewEnterprise(row) {
+      this.$tab.openPage(row.advisoryBodyName ? row.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBodyCid)}`);
+    },
     // 创建最终查询条件
     mergeCondition() {
       const _queryParams = JSON.parse(JSON.stringify(this.queryParams));

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -89,7 +89,8 @@
         </template> -->
         <!-- 咨询机构名称 -->
         <template slot="advisoryBodyName" slot-scope="{data,row}">
-          <div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName" class="no-line-feed">{{row.advisoryBody.advisoryBodyName}}</div>
+          <div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName" class="no-line-feed" @click="viewEnterprise(row)">
+            {{row.advisoryBody.advisoryBodyName}}</div>
           <span v-else>-</span>
         </template>
       </table-list-com>
@@ -105,6 +106,7 @@ import Skeleton from "@/components/Skeleton";
 import { getConsultingOrgProjectListWithSearchApi } from "@/api/consultingOrgManagement";
 import { queryConditionFiltering } from "@/utils";
 import { v4 } from 'uuid';
+import { encodeStr } from "@/assets/js/common.js";
 export default {
   name: "cooperationDeskAccountProject",
   components: {
@@ -319,6 +321,10 @@ export default {
     // 查看项目详情
     viewProjectDetail(row) {
       this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail/${row.advisoryBody?.advisoryBodyCid}?projectKey=${row.projectKey}`);
+    },
+    // 跳转到企业详情
+    viewEnterprise(row) {
+      this.$tab.openPage(row.advisoryBody.advisoryBodyName ? row.advisoryBody.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBody.advisoryBodyCid)}`);
     }
   },
 }

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -333,8 +333,8 @@ export default {
     getFinancial(id) {
       financial({ cid: String(id) }).then(res => {
         if ((res.code == 200 && !res.data) || !res.data?.totalAssets) {
-          this.$set(this.sideRoute[0], "disabled", true);
-          this.$set(this.sideRoute[1], "disabled", true);
+          // 禁用商务信息
+          this.$set(this.findNodeIndex(this.sideRoute, "business"), "disabled", true);
           this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute));
         }
       });

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit.vue

@@ -6,9 +6,9 @@
     <tables v-if="!isSkeleton" :indexFixed="true" :tableData="tableData" :forData="forData" :tableDataTotal="tableDataTotal"
       :queryParams="queryParams" @handle-current-change="handleCurrentChange" @sort-change="sortChange">
       <!-- 业主名称 -->
-      <template slot="companyName" slot-scope="scope">
-        <span v-if="scope.row.companyName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)"
-          v-html="scope.row.companyName">{{scope.row.companyName}}</span>
+      <template slot="counterpartCompanyName" slot-scope="scope">
+        <span v-if="scope.row.counterpartCompanyName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)"
+          v-html="scope.row.counterpartCompanyName">{{scope.row.counterpartCompanyName}}</span>
         <span v-else>-</span>
       </template>
       <!-- 合作项目数量 -->
@@ -71,7 +71,7 @@ export default {
       },
       selectOptions: {},
       forData: [
-        { label: '施工单位名称', prop: 'companyName', width: '295', slot: true, showOverflowTooltip: true },
+        { label: '施工单位名称', prop: 'counterpartCompanyName', width: '295', slot: true, showOverflowTooltip: true },
         { label: '合作项目数量', prop: 'count', minWidth: '190', align: "right", slot: true, sortable: "custom" },
         { label: '最近一次合作时间', prop: 'time', minWidth: '214', sortable: "custom" },
         { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
@@ -118,6 +118,7 @@ export default {
       dialogIsSkeleton: true,
       dialogtableDataTotal: 0,
       dialogTableData: [],
+      statisticsData: {},
     };
   },
   //可访问data属性
@@ -250,6 +251,10 @@ export default {
         const res = await getCooperativeOwnerUnitsDetailApi(data);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
+        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        if (count.code == 200 && count.data) {
+          this.statisticsData = count.data;
+        }
       } catch (error) {
         console.log(error);
       } finally {
@@ -284,14 +289,19 @@ export default {
         const res = await getCooperativeOwnerUnitsDetailApi(data);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
+        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        if (count.code == 200 && count.data) {
+          this.statisticsData = count.data;
+        }
       } catch (error) {
         console.log(error);
       }
     },
     dialogCurrentChange(page) {
       this.dialogQueryParams.pageNum = page;
-      const params = this.createQueryCondition(this.dialogQueryParams);
-      this.dialogHandleQurey(params);
+      const params = this.createQueryCondition(this.dialogFormData);
+      const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.dialogQueryParams }));
+      this.dialogHandleQurey(searchParams);
     },
     async dialogOPen() {
       await this.setOptions();
@@ -346,7 +356,7 @@ export default {
 
   ::v-deep .cooperation-record-dialog-container {
     .cooperation-record-dialog {
-      height: 85%;
+      height: 60%;
       position: absolute;
       left: 50%;
       top: 50%;

dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue

@@ -118,6 +118,7 @@ export default {
       dialogIsSkeleton: true,
       dialogtableDataTotal: 0,
       dialogTableData: [],
+      statisticsData: {}
     };
   },
   //可访问data属性
@@ -250,6 +251,10 @@ export default {
         const res = await getCooperativeOwnerUnitsDetailApi(data);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
+        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        if (count.code == 200 && count.data) {
+          this.statisticsData = count.data;
+        }
       } catch (error) {
         console.log(error);
       } finally {
@@ -284,14 +289,19 @@ export default {
         const res = await getCooperativeOwnerUnitsDetailApi(data);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
+        const count = await getCooperativeOwnerUnitsCountAmountApi(data);
+        if (count.code == 200 && count.data) {
+          this.statisticsData = count.data;
+        }
       } catch (error) {
         console.log(error);
       }
     },
     dialogCurrentChange(page) {
       this.dialogQueryParams.pageNum = page;
-      const params = this.createQueryCondition(this.dialogQueryParams);
-      this.dialogHandleQurey(params);
+      const params = this.createQueryCondition(this.dialogFormData);
+      const searchParams = JSON.parse(JSON.stringify({ ...params, ...this.dialogQueryParams }));
+      this.dialogHandleQurey(searchParams);
     },
     async dialogOPen() {
       await this.setOptions();
@@ -346,7 +356,7 @@ export default {
 
   ::v-deep .cooperation-record-dialog-container {
     .cooperation-record-dialog {
-      height: 85%;
+      height: 60%;
       position: absolute;
       left: 50%;
       top: 50%;

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -38,6 +38,8 @@
             <!-- 2、常合作施工单位 -->
             <cooperative-construction-unit v-if="currentPath.pathName=='cooperativeConstructionUnit'"
               :company-id="companyId"></cooperative-construction-unit>
+            <!-- 3、常合作集团 -->
+            <cooperative-group v-if="currentPath.pathName=='cooperativeGroup'" :company-id="companyId"></cooperative-group>
             <!-- 投诚分析 -->
             <RegionalEconomies v-if="currentPath.pathName=='regionalEconomies'" :company-id="companyId" :companyInfo="companyInfo" />
             <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" :company-id="companyId" />
@@ -115,6 +117,7 @@ import Hiscontract from "./dealings/hiscontract";  //业务往来-历史发包
 import Bidrecords from "./dealings/bidrecords";  //业务往来-开标记录
 import CooperativeOwnerUnits from "@/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits"; //咨询业务往来 常合作业主单位
 import CooperativeConstructionUnit from "@/views/detail/party-a/consultingTransaction/cooperativeConstructionUnit"; //咨询业务往来 常合作施工单位
+import CooperativeGroup from "@/views/detail/party-a/consultingTransaction/cooperativeGroup"; //咨询业务往来 常合作集团
 import LandAcquisition from "./urbanLnvestment/landAcquisition"; //投诚分析-城投拿地
 import RegionalEconomies from "./urbanLnvestment/regionalEconomies"; //投诚分析-区域经济
 import SameRegion from "./urbanLnvestment/sameRegion"; //投诚分析-同地区城投
@@ -185,7 +188,8 @@ export default {
     ConsultingAgencyCooperation,
     AccessCondition,
     CooperationRecord,
-    CooperativeConstructionUnit
+    CooperativeConstructionUnit,
+    CooperativeGroup
   },
   data() {
     return {
@@ -286,7 +290,7 @@ export default {
         this.companyId = data;
         await this.$nextTick();
         this.listenSider();
-        // await this.getStatistic();
+        await this.getStatistic();
         await this.handleQuery();
         await this.association(this.$route.query.customerId);
         this.$refs.sidebar.getFinancial(data);