src/pages/Monitor/MonitorClients.vue

@@ -7,11 +7,12 @@ import { toDateFormat } from 'src/filters/date.js';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
-
+import { dateRange } from 'src/filters';
 const { t } = useI18n();
 
-const from = ref(Date.vnNew());
+const dates = dateRange(Date.vnNew());
-const to = ref(Date.vnNew());
+const from = ref(dates[0]);
+const to = ref(dates[1]);
 
 const filter = computed(() => {
     const obj = {};

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -8,6 +8,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import FetchData from 'src/components/FetchData.vue';
+import { dateRange } from 'src/filters';
 
 defineProps({ dataKey: { type: String, required: true } });
 const { t } = useI18n();
@@ -15,11 +16,7 @@ const warehouses = ref();
 const groupedStates = ref();
 
 const handleScopeDays = (params, days, callback) => {
-    const from = Date.vnNew();
+    const [from, to] = dateRange(Date.vnNew());
-    from.setHours(0, 0, 0, 0);
-    const to = Date.vnNew();
-    to.setHours(23, 59, 59, 999);
-
     if (!days) {
         Object.assign(params, { from, to, scopeDays: 1 });
     } else {

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -25,17 +25,8 @@ const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
-const from = computed(() => {
+const [from, to] = dateRange(Date.vnNew());
-    const date = Date.vnNew();
+
-    date.setHours(0, 0, 0, 0);
-    return date;
-});
-const to = computed(() => {
-    const date = Date.vnNew();
-    date.setDate(date.getDate() + 1);
-    date.setHours(23, 59, 59, 999);
-    return date;
-});
 function exprBuilder(param, value) {
     switch (param) {
         case 'stateFk':
@@ -377,7 +368,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <QTd class="no-padding" style="max-width: 50px">
+            <QTd class="no-padding" style="max-width: 60px">
                 <QIcon
                     v-if="row.isTaxDataChecked === 0"
                     name="vn:no036"
@@ -442,13 +433,13 @@ const openTab = (id) =>
             </QTd>
         </template>
         <template #column-clientFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <QTd class="no-padding" @click.stop.prevent :title="row.nickname">
                 <span class="link">{{ row.nickname }}</span>
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </QTd>
         </template>
         <template #column-salesPersonFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <QTd class="no-padding" @click.stop.prevent :title="row.userName">
                 <span class="link">{{ row.userName }}</span>
                 <WorkerDescriptorProxy :id="row.salesPersonFk" />
             </QTd>
@@ -489,7 +480,7 @@ const openTab = (id) =>
             </QTd>
         </template>
         <template #column-zoneFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <QTd class="no-padding" @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
             </QTd>