|
@@ -264,6 +264,7 @@ export default {
|
|
|
filedKind: item.filedKind,
|
|
|
type: item.type,
|
|
|
group: item.filedKind == -1 ? 'nos' : 'customField',
|
|
|
+ groupBy:item.groupBy,
|
|
|
dele: 'patentCheck',
|
|
|
}
|
|
|
)
|
|
@@ -293,7 +294,12 @@ export default {
|
|
|
getSearchStorage() {
|
|
|
let customFields = []
|
|
|
let count = 0
|
|
|
+ console.log(this.searchStorageText)
|
|
|
this.searchStorageText.forEach((item, index) => {
|
|
|
+ var sign = '='
|
|
|
+ if(item.dele == 'patentCheck' && item.groupBy == 'company'){
|
|
|
+ sign = '≡'
|
|
|
+ }
|
|
|
if (item.group == 'nos') {
|
|
|
if (count == 0) {
|
|
|
count++
|
|
@@ -309,10 +315,10 @@ export default {
|
|
|
value += ' OR '
|
|
|
}
|
|
|
})
|
|
|
- this.searchStr = `${item.value} = (${value})`
|
|
|
+ this.searchStr = `${item.value} ${sign} (${value})`
|
|
|
} else {
|
|
|
var values = this.$commonJS.AddQuotationMarks(item.inputValue)
|
|
|
- this.searchStr = `${item.value} = (${values.join('')})`
|
|
|
+ this.searchStr = `${item.value} ${sign} (${values.join('')})`
|
|
|
}
|
|
|
|
|
|
} else {
|
|
@@ -329,10 +335,10 @@ export default {
|
|
|
value += ' OR '
|
|
|
}
|
|
|
})
|
|
|
- this.searchStr += ` AND ${item.value} = (${value})`
|
|
|
+ this.searchStr += ` AND ${item.value} ${sign} (${value})`
|
|
|
} else {
|
|
|
var values = this.$commonJS.AddQuotationMarks(item.inputValue)
|
|
|
- this.searchStr += ` AND ${item.value} = (${values.join('')})`
|
|
|
+ this.searchStr += ` AND ${item.value} ${sign} (${values.join('')})`
|
|
|
}
|
|
|
}
|
|
|
} else {
|