Merge branch 'datepicker-fix' into 'master'

datepicker for order

See merge request CIEFWorldwideSdnBhd/izyim!8
This commit is contained in:
omair saleh
2019-03-19 10:56:34 +00:00
2 changed files with 16 additions and 29 deletions
@@ -1,30 +1,20 @@
<template>
<input type="text" class="form-control" v-datepicker :value="value" v-on:changeDate="updateDate($event)">
<input type="text" class="form-control" :value="value">
</template>
<script>
export default {
directives: {
datepicker: {
inserted (el,) {
let vm = this;
$(el).datepicker({
autoclose: true,
format: 'dd/mm/yyyy',
todayBtn: true,
todayHighlight: true
}).on('changeDate',function(e){
this.updateDate(event.target.value)
})
}
}
mounted: function() {
let vm = this;
$(this.$el).datepicker({
autoclose: true,
format: 'dd-mm-yyyy',
todayBtn: true,
todayHighlight: true
}).on('changeDate',function(event){
vm.$emit('updateDate', event.target.value)
})
},
props: ['value'],
methods: {
updateDate(value){
alert(value);
}
}
props: ['value']
}
</script>
@@ -27,8 +27,7 @@
<div class="form-group form-group-default input-group" style=" overflow: visible; ">
<div class="form-input-group">
<label>Date Received</label>
<date-picker-component name="receive_date" v-on:updateDate="setDate($event, 'receiveNote.receive_date')"></date-picker-component>
<!--<input class="form-control block datepicker" v-model="receiveNote.receive_date">-->
<date-picker-component name="receive_date" v-on:updateDate="setReceiveNote($event, 'receiveNote.receive_date')"></date-picker-component>
</div>
</div>
<div class="row">
@@ -92,11 +91,9 @@
},
methods: {
setDate(date, field){
if (field === 'receiveNote.receive_date') {
$(this.$el).find('.receiveForm').valid();
this.receiveNote.receive_date = date;
}
setReceiveNote(date){
$(this.$el).find('.receiveForm').valid();
this.receiveNote.receive_date = date;
},
createReceiveNote() {