zhuliu 7 月之前
父节点
当前提交
d3359ede27

+ 3 - 2
src/views/components/import/conditionImport/internal_search/searchResult_internal.vue

@@ -485,11 +485,12 @@ export default {
       val.forEach((item,index)=>{
         var value = ''
         if(item.op == '≡'){
-          value = item.value.map(value=>`"${value.search}"`).join(" OR ")
+          value = item.value.map(value=>`IET@ "${value.search}"`).join(" OR ")
         }else if(item.op == '='){
           value = item.value.map(value=>value.search).join(" OR ")
         }
-        str = str + `${item.field.search} ${item.op} (${value})`
+        // str = str + `${item.field.search} ${item.op} (${value})`
+        str = str + `${item.field.search} = (${value})`
         if(index > 0 && index < val.length){
           str = str + ' AND '
         }

+ 11 - 10
src/views/report/components/patentList/components/searchPatent-备份.vue

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

+ 3 - 2
src/views/report/components/patentList/components/searchPatent.vue

@@ -280,11 +280,12 @@ export default {
           }
           var value = ''
           if(item.op == '≡'){
-            value = item.value.map(value=>`"${value.search}"`).join(" OR ")
+            value = item.value.map(value=>`IET@ "${value.search}"`).join(" OR ")
           }else if(item.op == '='){
             value = item.value.map(value=>value.search).join(" OR ")
           }
-            this.searchStr += `${front}${item.field.search} ${item.op} (${value})`
+            // this.searchStr += `${front}${item.field.search} ${item.op} (${value})`
+            this.searchStr += `${front}${item.field.search} = (${value})`
           
         }else{
           let a = {