Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

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

@@ -144,7 +144,8 @@ export default {
     // 跳转到企业详情
     viewEnterprise(row) {
       if (!row.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
-      this.$tab.openPage(row.advisoryBodyName ? row.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBodyCid)}`);
+      // this.$tab.openPage(row.advisoryBodyName ? row.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBodyCid)}`);
+      this.$tab.openPage(`${row.advisoryBodyName}合作明细`, `/enterprise/${encodeStr(row.advisoryBodyCid)}?path=consultingAgencyCooperation&companyName=${replaceDomTags(row.advisoryBodyName)}`);
     },
     // 创建最终查询条件
     mergeCondition() {

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

@@ -76,16 +76,16 @@ export default {
         { label: '创建时间', prop: 'loadTime', width: "172" },
       ],
       formData: [
-        {
-          type: 7, fieldName: 'projectProvince', value: '', placeholder: '项目省市', uid: this.getUid(), options: [], props: {
-            multiple: true,
-            value: "value",
-            label: "value",
-            // checkStrictly: true
-          }
-        },
-        { type: 1, fieldName: 'isinvestproject', value: '', placeholder: '项目承接类型', options: [], uid: this.getUid() },
-        { type: 1, fieldName: 'projectType2', value: '', placeholder: '工程类别明细', options: [], uid: this.getUid() },
+        // {
+        //   type: 7, fieldName: 'projectProvince', value: '', placeholder: '项目省市', uid: this.getUid(), options: [], props: {
+        //     multiple: true,
+        //     value: "value",
+        //     label: "value",
+        //     // checkStrictly: true
+        //   }
+        // },
+        // { type: 1, fieldName: 'isinvestproject', value: '', placeholder: '项目承接类型', options: [], uid: this.getUid() },
+        // { type: 1, fieldName: 'projectType2', value: '', placeholder: '工程类别明细', options: [], uid: this.getUid() },
         { type: 3, fieldName: 'projectName', value: '', placeholder: '请输入', uid: this.getUid() },
       ],
       //列表
@@ -213,20 +213,20 @@ export default {
         const areaSearchList = this.$refs["searchFormNew"].$refs["cascader"][0].getCheckedNodes();
         let province=[]
         let city=[]
-        if(params.projectProvince){
-          for (let i=0; i<params.projectProvince.length; i++){
-            province.push(params.projectProvince[i][1])
-            city.push(params.projectProvince[i][2])
-          }
-        }
-        province=province.filter((item, index, self) => self.indexOf(item) === index);
-        if(province){
-          params.province=province
-        }
-        if(city){
-          params.city=city
-        }
-        delete params.projectProvince
+        // if(params.projectProvince){
+        //   for (let i=0; i<params.projectProvince.length; i++){
+        //     province.push(params.projectProvince[i][1])
+        //     city.push(params.projectProvince[i][2])
+        //   }
+        // }
+        // province=province.filter((item, index, self) => self.indexOf(item) === index);
+        // if(province){
+        //   params.province=province
+        // }
+        // if(city){
+        //   params.city=city
+        // }
+        // delete params.projectProvince
         this.handleQuery(params)
 
       } catch (error) {