Merge branch 'dev' into 8604-FixTicketFuture

src/components/VnTable/VnTable.vue

@@ -534,6 +534,9 @@ function formatColumnValue(col, row, dashIfEmpty) {
     }
 }
 const checkbox = ref(null);
+function cardClick(_, row) {
+    if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
+}
 </script>
 <template>
     <QDrawer
@@ -769,18 +772,13 @@ const checkbox = ref(null);
                 </template>
                 <template #item="{ row, colsMap }">
                     <component
-                        :is="$props.redirect ? 'router-link' : 'span'"
-                        :to="`/${$props.redirect}/` + row.id"
+                        v-bind:is="'div'"
+                        @click="(event) => cardClick(event, row)"
                     >
                         <QCard
                             bordered
                             flat
                             class="row no-wrap justify-between cursor-pointer q-pa-sm"
-                            @click="
-                                (_, row) => {
-                                    $props.rowClick && $props.rowClick(row);
-                                }
-                            "
                             style="height: 100%"
                         >
                             <QCardSection

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -61,6 +61,7 @@ function exprBuilder(param, value) {
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':
+            return { 't.zoneFk': value };
         case 'department':
             return { 'd.name': value };
         case 'totalWithVat':