修改

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

@@ -4,6 +4,7 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
         <el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
+        <el-breadcrumb-item v-if="cooDetail"><el-link :underline="false" @click="cooperateList">合作情况</el-link></el-breadcrumb-item>
 <!--        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>-->
         <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
       </el-breadcrumb>
@@ -18,7 +19,7 @@
 <script>
 export default {
   name: 'Header',
-  props: ['companyId', 'companyInfo', 'fromPath', 'fromName'],
+  props: ['companyId', 'companyInfo', 'fromPath', 'fromName', 'cooDetail'],
   data() {
     return {
     }
@@ -26,6 +27,10 @@ export default {
   created() {
   },
   methods: {
+    // 跳转到企业详情合作情况
+    cooperateList(){
+      this.$emit('close-detail')
+    },
   }
 }
 </script>

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

@@ -146,7 +146,7 @@ export default {
   components: {
     Detail
   },
-  props: ['customerIds','companyInfo'],
+  props: ['customerIds','companyInfo','cooDetail'],
   data() {
     return {
       ifEmpty:false,
@@ -222,6 +222,11 @@ export default {
       isDetailId: false,
     }
   },
+  watch:{
+    cooDetail(newVal, oldVal){
+      this.isDetailId = newVal
+    }
+  },
   created() {
     this.list()
     this.customerInfos()
@@ -301,10 +306,6 @@ export default {
       if (value.length>=2){
         let param = {
           projectName:value,
-          // page:{
-          //   limit:20,
-          //   page:1
-          // }
         }
         queryProject(JSON.stringify(param)).then(result=>{
           if(result.code != 200)
@@ -361,6 +362,7 @@ export default {
     clickDetail(id){
       this.detailId = id
       this.isDetailId = true
+      this.$emit('detail')
     },
     //关闭详情
     closeDetail(){
@@ -369,7 +371,7 @@ export default {
     },
     // 转科学计算
     numbers(v){
-      return new Number(v);
+      return Number(v);
     }
 
   }

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

@@ -96,7 +96,7 @@ export default {
         {label: '公司/机关', prop: 'position', width: '268'},
         {label: '职位', prop: 'workUnit', width: '110'},
         {label: '联系方式', prop: 'contactInformation', width: '105'},
-        {label: '内部维护人', prop: 'updateBy', width: '88'},
+        {label: '内部维护人', prop: 'updateBy', width: '100'},
         {label: '备注', prop: 'remark'},
       ],
       addRorm: {

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

 <template>
   <div class="app-container part-container">
-    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" v-if="companyId" />
+    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
     <div class="flex-box part-main">
       <div class="part-left">
         <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
@@ -46,7 +46,7 @@
             <!-- 招标偏好 -->
             <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" />
             <!-- 合作情况 -->
-            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" />
+            <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail" @detail="cooperateDetail" />
             <!-- 决策链条 -->
             <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 跟进记录 -->
@@ -149,13 +149,19 @@ export default {
       },
       partBoxHeight: null,
       fromPath: '',
-      fromName: ''
+      fromName: '',
+      cooDetail: false
     }
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
       vm.fromPath = from.path
       vm.fromName = from.meta.title
+      if(from.name == 'CustomList'){
+        if (to.query.path){
+          vm.currentPath.pathName = to.query.path
+        }
+      }
     })
   },
   created() {
@@ -173,14 +179,6 @@ export default {
   mounted() {
   },
   activated(){
-    if (this.$route.query.path) { // 获取跳转对应板块
-      this.currentPath.pathName = this.$route.query.path
-    }else{
-      this.currentPath.pathName = 'overview'
-    }
-    if (this.$route.query.customerId) { // 判断是否显示
-      this.customerId = this.$route.query.customerId
-    }
   },
   methods: {
     showPartPage(e){
@@ -208,6 +206,12 @@ export default {
       erd.listenTo(partBox, element => {
         _this.partBoxHeight = partBox.offsetHeight
       })
+    },
+    cooperateDetail(){
+      this.cooDetail = true
+    },
+    closeDetail(){
+      this.cooDetail = false
     }
   }
 }

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

@@ -4,9 +4,10 @@
       <template v-if="!detailId">
         <span>项目管理</span>
         <span class="on" @click="tolist"> / 商机列表</span>
+        <span> / 项目详情</span>
       </template>
-      <span class="on" v-else @click="cooperateList">合作情况</span>
-      <span> / 项目详情</span>
+<!--      <span class="on" v-else @click="cooperateList">合作情况</span>-->
+<!--      <span> / 项目详情</span>-->
     </div>
     <div class="app-container" v-if="ProjectData">
       <el-card class="box-card noborder pad16 overflows">