Merge branch 'dev' into 8004-liliumStyleRemake

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -26,6 +26,7 @@ const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const DepartmentOpts = ref([]);
+const PayMethodOpts = ref([]);
 const ItemPackingTypeOpts = ref([]);
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
@@ -223,7 +224,16 @@ const columns = computed(() => [
         label: t('salesTicketsTable.payMethod'),
         name: 'payMethod',
         align: 'left',
-        columnFilter: false,
+        columnFilter: {
+            component: 'select',
+            url: 'PayMethods',
+            attrs: {
+                options: PayMethodOpts.value,
+                optionValue: 'id',
+                optionLabel: 'name',
+                dense: true,
+            },
+        },
     },
     {
         label: t('salesTicketsTable.total'),
@@ -244,11 +254,8 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'Departments',
             attrs: {
                 options: DepartmentOpts.value,
-                optionValue: 'name',
-                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -364,6 +371,15 @@ const openTab = (id) =>
         auto-load
         @on-fetch="(data) => (DepartmentOpts = data)"
     />
+    <FetchData
+        url="PayMethods"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (PayMethodOpts = data)"
+    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>
@@ -383,7 +399,7 @@ const openTab = (id) =>
         auto-load
         :row-click="({ id }) => openTab(id)"
         :disable-option="{ card: true }"
-        :user-params="{ from, to, scopeDays: 0, packing }"
+        :user-params="{ from, to, scopeDays: 0 }"
     >
         <template #top-left>
             <QBtn