|
@@ -348,9 +348,11 @@ export default {
|
|
let count = 0
|
|
let count = 0
|
|
// console.log(this.searchStorageText)
|
|
// console.log(this.searchStorageText)
|
|
this.searchStorageText.forEach((item, index) => {
|
|
this.searchStorageText.forEach((item, index) => {
|
|
|
|
+ var iet = ''
|
|
var sign = '='
|
|
var sign = '='
|
|
if(item.dele == 'patentCheck' && item.groupBy == 'company'){
|
|
if(item.dele == 'patentCheck' && item.groupBy == 'company'){
|
|
sign = '≡'
|
|
sign = '≡'
|
|
|
|
+ iet = 'IET@ '
|
|
}
|
|
}
|
|
if (item.group == 'nos') {
|
|
if (item.group == 'nos') {
|
|
if (count == 0) {
|
|
if (count == 0) {
|
|
@@ -359,7 +361,7 @@ export default {
|
|
var value = ''
|
|
var value = ''
|
|
item.inputValue.forEach((i,index)=>{
|
|
item.inputValue.forEach((i,index)=>{
|
|
if(/\s/.test(i)){
|
|
if(/\s/.test(i)){
|
|
- value += `"${i}"`
|
|
|
|
|
|
+ value += `${iet}"${i}"`
|
|
}else{
|
|
}else{
|
|
value += i
|
|
value += i
|
|
}
|
|
}
|
|
@@ -368,14 +370,14 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
if(value){
|
|
if(value){
|
|
- this.searchStr = `${item.value} ${sign} (${value})`
|
|
|
|
|
|
+ // this.searchStr = `${item.value} ${sign} (${value})`
|
|
|
|
+ this.searchStr = `${item.value} = (${value})`
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
if(item.inputValue){
|
|
if(item.inputValue){
|
|
- // var values = this.$commonJS.AddQuotationMarks(item.inputValue)
|
|
|
|
- // this.searchStr = `${item.value} ${sign} (${values.join('')})`
|
|
|
|
- this.searchStr = `${item.value} ${sign} (${item.inputValue})`
|
|
|
|
|
|
+ // this.searchStr = `${item.value} ${sign} (${item.inputValue})`
|
|
|
|
+ this.searchStr = `${item.value} = (${iet}${item.inputValue})`
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -386,7 +388,7 @@ export default {
|
|
var value = ''
|
|
var value = ''
|
|
item.inputValue.forEach((i,index)=>{
|
|
item.inputValue.forEach((i,index)=>{
|
|
if(/\s/.test(i)){
|
|
if(/\s/.test(i)){
|
|
- value += `"${i}"`
|
|
|
|
|
|
+ value += `${iet}"${i}"`
|
|
}else{
|
|
}else{
|
|
value += i
|
|
value += i
|
|
}
|
|
}
|
|
@@ -395,14 +397,13 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
if(value){
|
|
if(value){
|
|
- this.searchStr += ` AND ${item.value} ${sign} (${value})`
|
|
|
|
|
|
+ // this.searchStr += ` AND ${item.value} ${sign} (${value})`
|
|
|
|
+ this.searchStr += ` AND ${item.value} = (${value})`
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
if(item.inputValue){
|
|
if(item.inputValue){
|
|
- // var values = this.$commonJS.AddQuotationMarks(item.inputValue)
|
|
|
|
- // this.searchStr += ` AND ${item.value} ${sign} (${values.join('')})`
|
|
|
|
- this.searchStr += ` AND ${item.value} ${sign} (${item.inputValue})`
|
|
|
|
|
|
+ this.searchStr += ` AND ${item.value} = (${iet}${item.inputValue})`
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|