合并发明人检索式修改

src/views/project/patentCollection/components/drawer/merge.vue

@@ -433,6 +433,7 @@ export default {
           params[item.value] = item.searchValue.label
         }
       })
+
       // 返回条件对象
       this.searchOption = this.$commonJS.ArrayToArray(val)
       // 调用查询接口
@@ -443,11 +444,55 @@ export default {
       this.queryParams.pageNum = val;
       this.getList();
     },
+ 
+    //生成字符串
+    getString(data){
+      var str = ''
+      data.forEach(item => {
+        var value = ''
+        if (Array.isArray(item.value)) {
+          value = '('
+          item.value.forEach((i,index)=>{
+            if(/\s/.test(i)){
+              value += `"${i}"`
+            }else{
+              value += i
+            }
+            if(index!= item.value.length- 1){
+              value += ' OR '
+            }
+          })
+          value += ')'
+        } else {
+          if (item.value) {
+            var values = this.AddQuotationMarks(item.value)
+            value = values.join('')
+          } else {
+            return
+          }
+        }
+        var str2 = ''
+        if(item.key == 'name'){
+          if(this.mergeType == 2){
+            str2 = 'MIN=' + value
+          }else{
+            str2 = '(MAT=' + value + 'OR MRH=' + value +')'
+          }
+        }
+        
+        if (str) {
+          str = str + ' AND ' + str2
+        } else {
+          str = str + str2
+        }
+
+      })
+    },
     // 获取发明人或者申请人、权利人数据，包括已合并的数据
     getList() {
       let params = {
         ...this.queryParams,//分页信息
-        searchQuery: this.$commonJS.objectToString(this.searchOption || {}),//检索条件
+        searchQuery: this.getString(this.searchOption || []),//检索条件
         projectId: this.projectId,//项目id
         type: this.mergeType,
       }