|
@@ -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) {
|