fix

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

@@ -1284,7 +1284,7 @@
   padding-left: 16px;
 }
 .el-tooltip__popper.is-dark {
-  opacity: 0.5;
+  // opacity: 0.5;
   //background: rgba(0, 0, 0, 0.5);
   //.el-tooltip__popper[x-placement^=top] .popper__arrow {
   //  border-top-color:rgba(0, 0, 0, 0.5);

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

@@ -78,9 +78,8 @@
       </template>
       <div v-else class="flex-box">
         <span class="flex-box ability-total" v-if="isTotal">共有{{ total }}条</span>
-        <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']"
-          v-if="isExcel && title ==='集团业绩'|| title ==='集团招标' " @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
-        <span class="flex-box ability-excel" v-else-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        <span class="flex-box ability-excel" v-hasPermi="['combine:info:export:win:bid','combine:info:export:bid']" @click="clickEXCEL"
+          v-if="isExcel"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
   </div>
@@ -306,7 +305,14 @@ export default {
       this.$emit('handle-search', this.comFormData);
     },
     clickEXCEL() {
+      if (["集团业绩", "集团招标", "供应商合作记录"].includes(this.title)) {
         this.$emit('handle-excel');
+      } else {
+        this.$message({
+          message: '功能正在开发中',
+          type: 'warning'
+        });
+      }
     },
     clickFocus(e) {
       document.getElementById(e).classList.toggle('span-ba');

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

@@ -93,6 +93,7 @@ export default {
       cooperationRecordDialog: false,
       dialogQueryParams: {
         companyId: "",
+        combineId: "",
         pageNum: 1,
         pageSize: 10,
         companyType: 2,
@@ -242,6 +243,7 @@ export default {
     },
     viewProject(row) {
       this.dialogQueryParams.companyId = row.companyId;
+      this.dialogQueryParams.combineId = row.counterpartCompanyId;
       this.cooperationRecordDialog = true;
     },
     async dialogHandleQurey(params) {
@@ -356,7 +358,7 @@ export default {
 
   ::v-deep .cooperation-record-dialog-container {
     .cooperation-record-dialog {
-      height: 60%;
+      height: 75%;
       position: absolute;
       left: 50%;
       top: 50%;

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

@@ -144,6 +144,7 @@ export default {
       cooperationRecordDialog: false,
       dialogQueryParams: {
         companyId: "",
+        memberId : "",
         pageNum: 1,
         pageSize: 10,
         companyType: 3,
@@ -300,13 +301,14 @@ export default {
     },
     viewProject(row) {
       this.dialogQueryParams.companyId = row.companyId;
+      this.dialogQueryParams.memberId = row.combineId;
       this.cooperationRecordDialog = true;
     },
     async dialogHandleQurey(params) {
       try {
         let data = params ? params : this.dialogQueryParams;
         this.dialogIsSkeleton = true;
-        const res = currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(data) : await getCooperativeOwnerUnitsDetailApi(data);
+        const res = this.currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(data) : await getCooperativeOwnerUnitsDetailApi(data);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
         const count = await getCooperativeOwnerUnitsCountAmountApi(data);
@@ -344,7 +346,7 @@ export default {
       this.dialogQueryParams.sort = sort;
       try {
         let data = this.dialogQueryParams;
-        const res = currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(data) : await getCooperativeOwnerUnitsDetailApi(data);
+        const res = this.currentList == "cooperativeMember" ? await getCooperativeGroupMemberApi(data) : await getCooperativeOwnerUnitsDetailApi(data);
         this.dialogTableData = res.rows ? res.rows : [];
         this.dialogtableDataTotal = res.total ? res.total : 0;
         const count = await getCooperativeOwnerUnitsCountAmountApi(data);
@@ -418,7 +420,7 @@ export default {
 
   ::v-deep .cooperation-record-dialog-container {
     .cooperation-record-dialog {
-      height: 60%;
+      height: 75%;
       position: absolute;
       left: 50%;
       top: 50%;

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

@@ -93,6 +93,7 @@ export default {
       cooperationRecordDialog: false,
       dialogQueryParams: {
         companyId: "",
+        combineId: "",
         pageNum: 1,
         pageSize: 10,
         companyType: 1,
@@ -242,6 +243,7 @@ export default {
     },
     viewProject(row) {
       this.dialogQueryParams.companyId = row.companyId;
+      this.dialogQueryParams.combineId = row.companyId;
       this.cooperationRecordDialog = true;
     },
     async dialogHandleQurey(params) {
@@ -356,7 +358,7 @@ export default {
 
   ::v-deep .cooperation-record-dialog-container {
     .cooperation-record-dialog {
-      height: 60%;
+      height: 75%;
       position: absolute;
       left: 50%;
       top: 50%;