Merge branch 'blueBranch' into allTestUrgent

src/components/normal-basic-layout/details/modules/followTable/index.vue

@@ -32,13 +32,15 @@
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'"
           prop="type"
           :label="$t(`跟进类型`)"
-          min-width="80">
+          min-width="80"
+          key="type-column">
       </el-table-column>
       <el-table-column
           prop="contacts"
           v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail'"
           :label="$t(`跟进对象`)"
-          min-width="69">
+          min-width="69"
+          key="contacts-column">
         <template slot-scope="scope">
           <div v-for="item in scope.row.contacts" :key="item.index">
             <span v-if="item.rowindex === scope.row.contacts.length" class="span-style">
@@ -54,6 +56,7 @@
           prop="content"
           :label="$t(`跟进内容`)"
           min-width="500"
+          key="content-column"
           >
         <template slot-scope="scope">
           <div v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/funnelProjectDetail')">

src/views/mediaStatistics/modules/drawerDetail.vue

@@ -31,11 +31,15 @@ export default {
   methods:{
     onShow () {
       this.drawer = true
-
+      console.log(this.data,'输出data销售漏斗')
+      console.log(this.data[this.idName],'输出id33333')
       let  query = {id:this.data[this.idName],rowindex:this.data.rowindex,listqueryid:this.listqueryid}
 
       console.log(query,'query数据222')
+
       this.$router.push({path:this.detailPath.path,query:Object.assign({},query,this.detailPath.param)})
+
+
       // this.$router.push({path:'/funnelProjectDetail',query:{id:this.data[key],rowindex:this.data.rowindex}})
 
     }