Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/project/patentCollection/components/mixins/index.js

@@ -32,10 +32,7 @@ export const projectData = {
     refresh:{
       default:false
     },
-    //仅展示
-    onlyReveal:{
-      default:false
-    } ,
+
     patentNoList:{
       type: Array,
       default: () => {
@@ -55,17 +52,7 @@ export const projectData = {
   methods: {
     // 点击专利号
     handleClick(row,key){
-      if(this.onlyReveal){
-        return 
-      }
-      this.$router.push(
-        {
-          path:'patentDetails/'+row.patentNo,
-          query:{
-            projectId:this.projectId
-          }
-        }
-      )
+      this.$emit('clickPatentNo',row)
     },
     changeSelect(patent){
       const index1 = this.patentNoList.indexOf(patent.patentNo)

src/views/project/patentCollection/index.vue

@@ -97,7 +97,7 @@
         <el-main v-loading="loading">
           <div class="height_100">
             <component ref="patentViewList" :is="viewSelected" @download="handleDownload" @change-read="handleChangeRead"
-              :projectId="projectId" :selected.sync="queryParams.selected" :patentNoList.sync="patentNoList"
+              :projectId="projectId" :patentNoList.sync="patentNoList" @clickPatentNo="handleClick"
               :column="customList" @index-setting="handleIndexSetting" @on-sort="handleSort" :queryParams="queryParams"
               :tableData="tableData" :refresh='refresh'></component>
           </div>
@@ -260,6 +260,16 @@ export default {
     this.getList()
   },
   methods: {
+    handleClick(row){
+      this.$router.push(
+        {
+          path:'/patentDetails/'+row.patentNo,
+          query:{
+            projectId:this.projectId
+          }
+        }
+      )
+    },
     //获取table栏位及分组字段、检索字段
     async getColumn() {
       let params = ['patent']