From 795270d0cccbe5b58bcc385b9437c7c67e7c123c Mon Sep 17 00:00:00 2001 From: sedmedgh Date: Tue, 8 Feb 2022 23:46:24 -0800 Subject: [PATCH] fix bugs --- src/assets/css/main.css | 10 + src/filters/filters.js | 9 +- src/main.js | 4 +- src/views/personel/Personel.vue | 3753 +++++++++++----------- src/views/proposal/Proposal.vue | 2110 ++++++------ src/views/register/Register.vue | 2323 ++++++------- src/views/register/RegisterPersonnel.vue | 2316 ++++++------- 7 files changed, 5411 insertions(+), 5114 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 73eb68f..a5881d1 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -90,3 +90,13 @@ .vpd-input-group input { border-radius: 4px 0 0 4px; } +.vs-notifications { + z-index: 2000000000 !important; +} +.ant-modal-footer .ant-btn-primary{ + margin-left: 10px; +} +.has-error .vpd-input-group{ + border: 1px solid #f5222d; + border-radius: 5px; +} \ No newline at end of file diff --git a/src/filters/filters.js b/src/filters/filters.js index 6dd2a5f..685c276 100644 --- a/src/filters/filters.js +++ b/src/filters/filters.js @@ -102,7 +102,14 @@ Vue.filter('priceUnit', (val) => { Vue.filter('jdate', (val) => { if (val) { - return moment(val).format('jYY/jMM/jDD-hh:mm:ss'); + return moment(val).format('jYYYY/jMM/jDD'); + } + return val; +}); + +Vue.filter('jtjdate', (val) => { + if (val) { + return moment(val,'jYYYY/jMM/jDD').format('jYYYY/jMM/jDD'); } return val; }); diff --git a/src/main.js b/src/main.js index 378f0c1..f41f71b 100644 --- a/src/main.js +++ b/src/main.js @@ -143,8 +143,8 @@ import VuePersianDatetimePicker from 'vue-persian-datetime-picker'; Vue.use(VuePersianDatetimePicker, { name: 'date-picker', props: { - displayFormat: 'jYYYY-jMM-jDD HH:mm:ss', - format: 'YYYY-MM-DD HH:mm:ss', + displayFormat: 'jYYYY/jMM/jDD', + format: 'YYYY/MM/DD', editable: false, inputClass: '', placeholder: 'انتخاب کنید', diff --git a/src/views/personel/Personel.vue b/src/views/personel/Personel.vue index 92c2263..c5d9828 100644 --- a/src/views/personel/Personel.vue +++ b/src/views/personel/Personel.vue @@ -1,26 +1,27 @@ diff --git a/src/views/proposal/Proposal.vue b/src/views/proposal/Proposal.vue index f386c0f..2972f85 100644 --- a/src/views/proposal/Proposal.vue +++ b/src/views/proposal/Proposal.vue @@ -1,516 +1,211 @@