修改

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

@@ -35,8 +35,8 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input v-model="form.value" :placeholder="form.placeholder"></el-input>
-                <span @click="changeSelect">搜索</span>
+                <el-input @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <span :id="'focus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
             <!-- 多选 -->
@@ -155,6 +155,9 @@ export default {
         message: '功能正在开发中',
         type: 'warning'
       });
+    },
+    clickFocus(e){
+      document.getElementById(e).classList.toggle('span-ba')
     }
   }
 }
@@ -214,13 +217,18 @@ export default {
           border-left: 0;
           cursor: pointer;
         }
+        .span-ba{
+          color: #ffffff;
+          background: #0081FF;
+          border: 1px solid #0081FF;
+        }
         ::v-deep .el-input{
           flex: 1;
         }
         ::v-deep .el-input__inner {
           border-right: 0;
           border-radius: 2px 0 2px 0;
-          width: 259px;
+          width: 180px;
         }
       }
       .fromTime{

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

 <template>
-  <div class="cooperate">
+  <div>
 
+    <template v-if="!isDetailId">
+      <div class="cooperate">
         <template v-if="ifEmpty">
           <head-form
             :form-data="formData"
@@ -29,9 +31,6 @@
               <span class="link-type" @click="clickDetail(scope.row.id)">
                 {{ scope.row.projectName }}
               </span>
-<!--          <router-link :to="'' + scope.row.dictId" class="link-type">-->
-<!--            <span>{{ scope.row.dictType }}</span>-->
-<!--          </router-link>-->
             </template>
           </tables>
 
@@ -118,8 +117,12 @@
             </div>
           </div>
         </el-drawer>
+      </div>
+    </template>
 
-<!--      <Detail :detailId="detailId" v-if="isDetailId" />-->
+    <div v-else class="cooperate-detail">
+      <Detail :detailId="detailId" @close-detail="closeDetail" />
+    </div>
 
   </div>
 </template>
@@ -360,7 +363,13 @@ export default {
     clickDetail(id){
       this.detailId = id
       this.isDetailId = true
+    },
+    //关闭详情
+    closeDetail(){
+      this.isDetailId = false
+      this.detailId = ''
     }
+
   }
 }
 </script>
@@ -511,4 +520,10 @@ export default {
   }
 }
 
+::v-deep .cooperate-detail{
+  .miantitle, .app-container{
+    margin: 12px 0;
+  }
+}
+
 </style>

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

@@ -72,7 +72,7 @@ export default {
         },
         {
           prop: 'gdpGrowth',
-          label: 'GDP增速',
+          label: 'GDP增速（%）',
         },
         {
           prop: 'gdpPerCapita',
@@ -128,7 +128,7 @@ export default {
         },
         {
           prop: 'gbrGrowth',
-          label: '一般公共预算收入增速',
+          label: '一般公共预算收入增速（%）',
         },
         {
           prop: 'taxIncome',
@@ -192,23 +192,23 @@ export default {
         },
         {
           prop: 'fiscalSelfSufficiencyRate',
-          label: '财政自给率',
+          label: '财政自给率（%）',
         },
         {
           prop: 'govDebtToGdpRate',
-          label: '负债率',
+          label: '负债率（%）',
         },
         {
           prop: 'govDebtToGdpRateWild',
-          label: '负债率-宽口径',
+          label: '负债率-宽口径（%）',
         },
         {
           prop: 'govDebtRate',
-          label: '债务率',
+          label: '债务率（%）',
         },
         {
           prop: 'govDebtRateWild',
-          label: '债务率-宽口径',
+          label: '债务率-宽口径（%）',
         },
       ],
       tableLoading: true

dsk-operate-ui/src/views/project/projectList/component/gjjl.vue

@@ -129,6 +129,10 @@
         default: ""
       },
       datas:[],//数据源
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
     },
     name: 'gjjl',
     data(){
@@ -152,7 +156,7 @@
         recordlist:[],//列表数据源
         isdel:false,
         delID:'',//删除记录的ID
-        projectId:parseInt(this.$route.query.id),//项目详情id
+        projectId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id
       }
     },
     computed: {

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -70,19 +70,25 @@
 
   export default {
     name: 'gjjl',
+    props: {
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
+    },
     data(){
       return{
         isEdit:false,
         value:'',
         status:0,
         queryParam:{
-          businessId:parseInt(this.$route.query.id),//项目详情id
+          businessId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id
           target:'',
           task:'',
           finishTime:'',
         },
         searchPram:{
-          businessId:parseInt(this.$route.query.id),
+          businessId:this.detailId ? this.detailId : parseInt(this.$route.query.id),
           pageSize:10,
           pageNum:1,
           state:null,

dsk-operate-ui/src/views/project/projectList/component/jsnr.vue

@@ -203,10 +203,16 @@
   import {getJSNR,editXMNR} from '@/api/project/project'
   export default {
     name: 'jsnr',
+    props: {
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
+    },
     data(){
       return{
         nowedit:-1,//当前正在编辑的文本
-        id:parseInt(this.$route.query.id),
+        id:this.detailId ? this.detailId : parseInt(this.$route.query.id),
         investmentAmount: '',//总投资额
         amountSource: '',//资金来源
         buildProperty: '',//建设性质

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -113,6 +113,12 @@
   import {getLXR,editLXR,addLXR} from '@/api/project/project'
   export default {
     name: 'lxr',
+    props: {
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
+    },
     data(){
       return{
         dialogVisible:false,
@@ -125,9 +131,9 @@
         searchParam:{
           pageNum:1,
           pageSize:20,
-          businessId:this.$route.query.id
+          businessId:this.detailId ? this.detailId : this.$route.query.id
         },
-        id:this.$route.query.id,
+        id:this.detailId ? this.detailId : this.$route.query.id,
         total:0,
         projectname:this.$route.query.projectname,
         queryParam:[],

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -139,6 +139,12 @@
   import {getDictType} from '@/api/main'
   export default {
     name: 'xgqy',
+    props: {
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
+    },
     data(){
       return{
         types:1,
@@ -175,7 +181,7 @@
         companytype:[],
         companyrole:[],
         queryParam:{
-          businessId:this.$route.query.id,
+          businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyId:'',
           companyName:'',
           companyRole:'',
@@ -186,7 +192,7 @@
         searchParam:{
           pageSize:20,
           pageNum:1,
-          businessId:this.$route.query.id,
+          businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyType:"",
           companyName:'',
         },
@@ -259,7 +265,7 @@
       opennew(){
         this.dialogVisible = true
         this.queryParam={
-          businessId:this.$route.query.id,
+          businessId:this.detailId ? this.detailId : this.$route.query.id,
           companyId:'',
           companyName:'',
           companyRole:'',

dsk-operate-ui/src/views/project/projectList/component/xmsl.vue

@@ -175,6 +175,10 @@
     name: 'xmsl',
     props:{
       datas:'',
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
     },
     data(){
       return{
@@ -183,7 +187,7 @@
         tipsvalue:"",//标签填写内容
         xmjd:'待添加',
         projectStage:[],//项目阶段
-        id: this.$route.query.id,
+        id: this.detailId ? this.detailId : this.$route.query.id,
         xmsldata:this.datas,
       }
     },

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -116,6 +116,12 @@
   import { getZLWD ,delZLWD} from "@/api/project/project";
   export default {
     name: 'zlwd',
+    props: {
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
+    },
     data(){
       return{
         isupload:false,
@@ -125,12 +131,12 @@
         fileList: [],
         headers: {
           Authorization: "Bearer " + getToken(),
-          filePath:this.$route.query.id,
+          filePath:this.detailId ? this.detailId : this.$route.query.id,
         },
         param:{
           pageNum:1,
           pagesize:20,
-          filePath:this.$route.query.id,
+          filePath:this.detailId ? this.detailId : this.$route.query.id,
         },
         fileDatas:[],
         filename:'',
@@ -142,9 +148,9 @@
     },
     methods:{
       getall(){
-        this.param.filePath = this.$route.query.id
+        this.param.filePath = this.detailId ? this.detailId : this.$route.query.id
         this.filename=''
-        this.headers.filePath = this.$route.query.id
+        this.headers.filePath = this.detailId ? this.detailId : this.$route.query.id
         this.handleCurrentChange(1)
       },
       getList(){
@@ -163,7 +169,7 @@
       getFile(row){
         if(row.type == 'file'){
           this.filename = row.name
-          this.headers.filePath = this.$route.query.id+'\\'+row.name
+          this.headers.filePath = this.detailId ? this.detailId : this.$route.query.id+'\\'+row.name
           this.param.filePath = row.filePath
 
           this.handleCurrentChange(1)

dsk-operate-ui/src/views/project/projectList/detail.vue

 <template>
   <div>
     <div class="miantitle">
+      <template v-if="!detailId">
         <span>项目管理</span>
         <span> / 商机列表</span>
+      </template>
+      <span v-else @click="cooperateList">合作情况</span>
       <span> / 项目详情</span>
     </div>
     <div class="app-container" v-if="ProjectData">
@@ -105,19 +108,19 @@
         </div>
       </el-card>
       <!--项目概览-->
-      <xmsl v-if="thistag == 'xmsl'" :datas="ProjectData"></xmsl>
+      <xmsl v-if="thistag == 'xmsl'" :datas="ProjectData" :detailId="detailId"></xmsl>
       <!--建设内容-->
-      <jsnr v-if="thistag == 'jsnr'"></jsnr>
+      <jsnr v-if="thistag == 'jsnr'" :detailId="detailId"></jsnr>
       <!--联系人-->
-      <lxr v-if="thistag == 'lxr'"></lxr>
+      <lxr v-if="thistag == 'lxr'" :detailId="detailId"></lxr>
       <!--跟进记录-->
-      <gjjl v-if="thistag == 'gjjl'" types="gjjl"></gjjl>
+      <gjjl v-if="thistag == 'gjjl'" types="gjjl" :detailId="detailId"></gjjl>
       <!--工作待办-->
-      <gzdb v-if="thistag == 'gzdb'"></gzdb>
+      <gzdb v-if="thistag == 'gzdb'" :detailId="detailId"></gzdb>
       <!--资料文档-->
-      <zlwd v-if="thistag == 'zlwd'"></zlwd>
+      <zlwd v-if="thistag == 'zlwd'" :detailId="detailId"></zlwd>
       <!--相关企业-->
-      <xgqy v-if="thistag == 'xgqy'"></xgqy>
+      <xgqy v-if="thistag == 'xgqy'" :detailId="detailId"></xgqy>
     </div>
   </div>
 </template>
@@ -138,6 +141,12 @@
   export default {
     name: 'detail',
     components: {xmsl,jsnr,lxr,gjjl,gzdb,zlwd,xgqy},
+    props: {
+      detailId: { //从企业详情跳转过来ID
+        type: Number,
+        default: 0
+      }
+    },
     data(){
       return {
         lastindex: 0,//上一个点击步骤
@@ -171,7 +180,7 @@
     },
     created(){
       this.prvinceTree()
-      this.id = this.$route.query.id
+      this.id = this.detailId ? this.detailId : this.$route.query.id
       //项目阶段
       getDictType('project_stage_type').then(result=>{
         this.projectStage = result.code == 200 ? result.data:[]
@@ -324,6 +333,11 @@
         })
         this.editXMSL(param)
       },
+
+      // 跳转到企业详情合作情况
+      cooperateList(){
+        this.$emit('close-detail')
+      }
     }
   }
 </script>