1

src/views/tablePage/index.vue

@@ -278,7 +278,7 @@ export default {
           let obj = {}
           if (event == 1) {
             obj.value = data[i]
-          } else if (event == 2) {
+          } else {
             obj.value = data[i]
             obj.filter = {}
             if (Array.isArray(key)) {
@@ -300,9 +300,11 @@ export default {
                 delete obj.value[key]
               }
             }
-          } else {
-            obj = data[i]
           }
+          //  else {
+          //   obj = data[i]
+          //   obj.filter[key] = data[i][key]
+          // }
           datas.push(obj)
         }
       } else {
@@ -310,15 +312,16 @@ export default {
         obj.filter = {}
         if (event == 1) {
           obj.value = data
-        } else if (event == 2) {
+        } else {
           obj.value = data
           obj.filter[key] = obj.value[key]
           if (obj.value[key]) {
             delete obj.value[key]
           }
-        } else {
-          obj = data
         }
+        // else {
+        //   obj = data
+        // }
         datas.push(obj)
       }
       return datas
@@ -392,6 +395,14 @@ export default {
     //高级查询-确定-数据
     getAdvancedQueryData (dataRules) {
       console.log(dataRules)
+      const arr = [...dataRules]
+      if (arr && arr.length) {
+        arr.forEach(item => {
+          item.value = item.value.replace(/\s*/g, "")
+        })
+      }
+      this.defaultfilter = arr
+      this.queryTableData()
     },
     //高级查询-收藏
     queryCollect (refName) {