deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправки текста

Browse Source
This commit is contained in:
Book Pauk
2022-11-01 00:09:00 +07:00
parent 55984769ea
commit 810920beed
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/components/Search/Search.vue
View File

@@ -995,9 +995,9 @@ class Search {
if (utils.isManualDate(date)) { if (utils.isManualDate(date)) {
const [from, to] = date.split(',') const [from, to] = date.split(',')
if (from) if (from)
result.push(`<div style="display: inline-block; width: 15px; text-align: right;">от</div> ${utils.sqlDateFormat(from)}`); result.push(`<div style="display: inline-block; width: 15px; text-align: right;">с</div> ${utils.sqlDateFormat(from)}`);
if (to) if (to)
result.push(`<div style="display: inline-block; width: 15px; text-align: right;">до</div> ${utils.sqlDateFormat(to)}`); result.push(`<div style="display: inline-block; width: 15px; text-align: right;">по</div> ${utils.sqlDateFormat(to)}`);
} }
return result.join('<br>'); return result.join('<br>');

8
client/components/Search/SelectDateDialog/SelectDateDialog.vue
View File

@@ -10,7 +10,9 @@
<div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="width: 240px; padding: 0px 10px 10px 10px;"> <div ref="box" class="column q-mt-xs overflow-auto no-wrap" style="width: 240px; padding: 0px 10px 10px 10px;">
<div class="row items-center"> <div class="row items-center">
<span class="q-mr-sm">От:</span> <div class="row justify-end q-mr-sm" style="width: 15px">
С:
</div>
<q-btn icon="la la-calendar" color="secondary" :label="labelFrom" dense no-caps style="width: 150px;"> <q-btn icon="la la-calendar" color="secondary" :label="labelFrom" dense no-caps style="width: 150px;">
<q-popup-proxy cover transition-show="scale" transition-hide="scale"> <q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-date v-model="from" mask="YYYY-MM-DD"> <q-date v-model="from" mask="YYYY-MM-DD">
@@ -26,7 +28,9 @@
<div class="q-my-sm" /> <div class="q-my-sm" />
<div class="row items-center"> <div class="row items-center">
<span class="q-mr-sm">До:</span> <div class="row justify-end q-mr-sm" style="width: 15px">
По:
</div>
<q-btn icon="la la-calendar" color="secondary" :label="labelTo" dense no-caps style="width: 150px;"> <q-btn icon="la la-calendar" color="secondary" :label="labelTo" dense no-caps style="width: 150px;">
<q-popup-proxy cover transition-show="scale" transition-hide="scale"> <q-popup-proxy cover transition-show="scale" transition-hide="scale">
<q-date v-model="to" mask="YYYY-MM-DD"> <q-date v-model="to" mask="YYYY-MM-DD">