TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into template-refactor

Browse Source
This commit is contained in:
Jay_Makwana
2020-12-22 13:15:55 +05:30
parent 422bf74600 d003e61d41
commit 1b46bddf56
13 changed files with 228 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/assets/js/components/base/BaseDatePicker.vue
View File

@ -18,8 +18,6 @@
import { mapGetters } from 'vuex'
import SwDatePicker from '@bytefury/spacewind/src/components/SwDatePicker'
import moment from 'moment'
const fromMomentDate = (date, format = 'YYYY-MM-DD') =>
moment(new Date(date), format)
export default {
components: {
@ -78,9 +76,11 @@ export default {
watch: {
value(val) {
if (val && !this.enableTime) {
this.date = fromMomentDate(val, 'YYYY-MM-DD').format('YYYY-MM-DD')
this.date = moment(new Date(val), 'YYYY-MM-DD').format('YYYY-MM-DD')
} else {
this.date = fromMomentDate(val, 'YYYY-MM-DD').format('YYYY-MM-DD H:m:s')
this.date = moment(new Date(val), 'YYYY-MM-DD').format(
'YYYY-MM-DD H:m:s'
)
}
},
enableTime(val) {
@ -118,11 +118,13 @@ export default {
)
}
if (this.value && !this.enableTime) {
this.date = fromMomentDate(this.value, 'YYYY-MM-DD').format('YYYY-MM-DD')
this.date = moment(new Date(this.value), 'YYYY-MM-DD').format(
'YYYY-MM-DD'
)
return true
}
if (this.value) {
this.date = fromMomentDate(this.value, 'YYYY-MM-DD').format(
this.date = moment(new Date(this.value), 'YYYY-MM-DD').format(
'YYYY-MM-DD HH:mm:SS'
)
}
@ -130,7 +132,6 @@ export default {
methods: {
onDateChange(date) {
this.$emit('input', date)
this.$emit('change', date)
},
},
}