Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/components/SimpleTable/index.vue

@@ -302,7 +302,9 @@ export default {
     setTableFilters() {
       this.tableDataFilters = {}
       this.filteredTableCols.forEach(col => {
-        this.tableDataFilters[col.columnName] = []
+        if (col.needFilters) {
+          this.tableDataFilters[col.columnName] = []
+        }
         if (col.needGroup) {
           this.tableGroups.push(col.columnName)
         }

src/views/advancedQuery/views/advancedNew.vue

@@ -756,16 +756,18 @@ export default {
         }
       }
     },
-    tableFormatter(row, column, cellValue) {
-      switch (column.property) {
-        case 'departureTime':
-          return (cellValue ?? '').replace('T', ' ')
-        case 'deleted':
-          return cellValue === 'DEL' ? cellValue : ''
-        case 'activated':
-          return cellValue === 1 ? '激活' : '未激活'
-        default:
-          return cellValue ?? ''
+    tableFormatter() {
+      return function (row, column, cellValue) {
+        switch (column.property) {
+          case 'departureTime':
+            return (cellValue ?? '').replace('T', ' ')
+          case 'deleted':
+            return cellValue === 'DEL' ? cellValue : ''
+          case 'activated':
+            return cellValue === 1 ? '激活' : '未激活'
+          default:
+            return cellValue ?? ''
+        }
       }
     },
     // 清除查询