소스 검색

专利详情左侧专利清单未带条件

zhuliu 1 년 전
부모
커밋
76d2543fa0

+ 3 - 1
src/views/product/components/commodity/commodity.vue

@@ -166,7 +166,9 @@ export default {
     // 点击专利号进行跳转
     handleClick(row, location) {
       var searchOption = {
-        searchOption: this.searchStr
+        searchQuery: this.searchStr,
+        orderDTOList: this.sort,
+        moreConditions:true
       }
       var search = {
         searchOption: searchOption,

+ 6 - 1
src/views/project/patentCollection/index.vue

@@ -368,7 +368,12 @@ export default {
     // 点击专利号进行跳转
     handleClick(row, location) {
       var search = {
-        searchOption: this.searchOption,
+        searchOption: {
+          searchQuery: this.searchStr || '',
+          customFields: this.customFields,
+          orderDTOList: this.sort,
+          moreConditions:true
+        },
         location: location,
       }
       this.$s.setSession('search', search)

+ 14 - 2
src/views/project/patentDetails/components/menu.vue

@@ -337,15 +337,27 @@ export default {
         // this.queryParams.current = parseInt((this.currentLocation-1) / this.queryParams.size) + 1
         api = 'QueryPatent'
       }
-      let params = {
+      var params = {}
+      var params1 = {
         ...this.queryParams,//分页信息
         projectId: this.projectId,
         productId:this.productId,
         from:this.productId?'product':null,
         taskId:this.taskId,
-        searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
+        // searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
         // orderDTOList: this.sort,//排序信息
       }
+      if(this.searchOption.moreConditions){
+        params = {
+          ...params1,
+          ...this.searchOption
+        }
+      }else{
+        params = {
+          ...params1,
+          searchQuery: this.$commonJS.objectToString(this.searchOption)
+        }
+      }
       this.loading = true
       this.$api[api](params).then(res => {
         if (res.code == 200) {

+ 2 - 2
src/views/project/patentDetails/components/patentMessage/PatentFamily.vue

@@ -107,8 +107,8 @@ export default {
         type: this.type,//同族类型
       }
       this.$api.selectKinByPatentNo(params).then(response => {
-        if(response.data){
-            this.tableData2 = response.data
+        if(response.data.data){
+            this.tableData2 = response.data.data
           }else{
             this.tableData2 = []
           }

+ 6 - 1
src/views/report/components/patentList/components/index.vue

@@ -187,7 +187,12 @@ export default {
     // 处理任务
     handleClick(row, location) {
       var search = {
-        searchOption: this.searchStr,
+        searchOption: {
+          searchQuery: this.searchStr || '',//检索条件
+          customFields: this.customFields || [],
+          orderDTOList: this.sort,//排序信息
+          moreConditions:true
+        },
         location: location
       }
       this.$s.setSession('search', search)