高级搜索修改

src/components/SimpleTable/index.vue

@@ -187,49 +187,56 @@ export default {
     headerCellClassName: {
       handler(func) {
         if (func) {
-          this.headerCellClass = func.bind(this)
+          this.headerCellClass = func().bind(this)
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     rowClassName: {
       handler(func) {
         if (func) {
-          this.rowClass = func.bind(this)
+          this.rowClass = func().bind(this)
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     cellClassName: {
       handler(func) {
         if (func) {
-          this.cellClass = func.bind(this)
+          this.cellClass = func().bind(this)
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     spanMethod: {
       handler(func) {
         if (func) {
-          this.tableSpanMethod = func.bind(this)
+          this.tableSpanMethod = func().bind(this)
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     summaryMethod: {
       handler(func) {
         if (func) {
-          this.tableSummaryMethod = func.bind(this)
+          this.tableSummaryMethod = func().bind(this)
         }
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     formatter: {
       handler(func) {
         if (func) {
-          this.tableFormatter = func
+          this.tableFormatter = func().bind(this)
         }
-      }
+      },
+      deep: true,
+      immediate: true
     }
   },
   updated() {

src/views/advancedQuery/views/advancedNew.vue

@@ -84,7 +84,7 @@
             <el-button
               type="primary"
               size="small"
-              @click="advancedQueryHandler"
+              @click="advancedQueryHandler(false)"
             >查询</el-button>
           </div>
           <el-form
@@ -613,7 +613,7 @@ export default {
     async getColumnSet(columnSet) {
       const reflect = {}
       columnSet.forEach(async column => {
-        if (!this.columnSet[column.columnName]) {
+        if (column.needSearch && !this.columnSet[column.columnName]) {
           this.columnSet[column.columnName] = column
           if ((column.listqueryTemplateID ?? '') !== '' && !this.columnSet[column.columnName].options) {
             if (reflect[column.listqueryTemplateID]) {
@@ -652,41 +652,47 @@ export default {
       this.tableData = []
     },
     // 给表头单元格加上 ascending 或 descending 使用 element 自带的排序箭头变色
-    headerCellClass({ row, column, rowIndex, columnIndex }) {
-      const classes = []
-      const rule = this.tableDataSortRules[column.property]
-      if (rule) {
-        classes.push(rule)
+    headerCellClass() {
+      return function ({ row, column, rowIndex, columnIndex }) {
+        const classes = []
+        const rule = this.tableDataSortRules[column.property]
+        if (rule) {
+          classes.push(rule)
+        }
+        return classes.join(' ')
       }
-      return classes.join(' ')
     },
-    rowClass({ row, rowIndex }) {
-      const classes = []
-      if (row.deleted === 'DEL') {
-        classes.push('bgl-deleted')
+    rowClass() {
+      return function ({ row, rowIndex }) {
+        const classes = []
+        if (row.deleted === 'DEL') {
+          classes.push('bgl-deleted')
+        }
+        return classes.join(' ')
       }
-      return classes.join(' ')
     },
-    cellClass({ row, column, rowIndex, columnIndex }) {
-      const classes = []
-      if (
-        ['flightNO', 'bagSN', 'U_Device_ID', 'preFlightNO', 'transferFlightNO'].includes(column.property) &&
-        row[column.property] &&
-        row[column.property] !== 'FBULK'
-      ) {
-        classes.push('cell-click')
+    cellClass() {
+      return function ({ row, column, rowIndex, columnIndex }) {
+        const classes = []
         if (
-          this.clickedCells.some(
-            cell =>
-              cell.pageName === 'advance' &&
-              Object.entries(cell.row).every(([key, value]) => row[key] === value) &&
-              cell.columnProp === column.property
-          )
+          ['flightNO', 'bagSN', 'U_Device_ID', 'preFlightNO', 'transferFlightNO'].includes(column.property) &&
+          row[column.property] &&
+          row[column.property] !== 'FBULK'
         ) {
-          classes.push('cell-clicked')
+          classes.push('cell-click')
+          if (
+            this.clickedCells.some(
+              cell =>
+                cell.pageName === 'advance' &&
+                Object.entries(cell.row).every(([key, value]) => row[key] === value) &&
+                cell.columnProp === column.property
+            )
+          ) {
+            classes.push('cell-clicked')
+          }
         }
+        return classes.join(' ')
       }
-      return classes.join(' ')
     },
     cellClickHandler(row, column, cell, event) {
       if (
@@ -774,7 +780,6 @@ export default {
       }
     },
     getSearchData(val) {
-      // this.$message.info('开发中')
       this.clearForm()
       if (!val) {
         this.$message.error('请先输入完整查询信息')
@@ -809,7 +814,7 @@ export default {
         // 纯数字且位数等于10则为行李牌号
         this.paramsForm.params.push({
           leftBrackets: '',
-          paramKey: 'bagNo',
+          paramKey: 'bagSN',
           comparisonOperator: '=',
           paramValue: val,
           rightBrackets: '',

src/views/systemSettings/views/queryTemplate/queryTemplatePreview.vue

@@ -459,7 +459,7 @@ export default {
       this.paramsTableCols[1].options = []
       const reflect = {}
       columnSet.forEach(async column => {
-        if (!this.columnSet[column.columnName]) {
+        if (column.needSearch && !this.columnSet[column.columnName]) {
           this.columnSet[column.columnName] = column
           if ((column.listqueryTemplateID ?? '') !== '' && !this.columnSet[column.columnName].options) {
             if (reflect[column.listqueryTemplateID]) {