合并鼎诚919

This commit is contained in:
邓晓坤
2019-09-19 18:04:30 +08:00
parent 1c4edae07f
commit d5ca72a7fc
73 changed files with 3805 additions and 2281 deletions

View File

@@ -19,6 +19,7 @@
<script>
import { Field, Popup, DatetimePicker } from 'vant'
import utils from '../../assets/js/business-common'
import beforeDate from '../../assets/js/utils/getBeforeDate.js'
export default {
name: 'FieldDatePicter',
props: {
@@ -61,11 +62,15 @@ export default {
flag: {
type: Boolean,
default: false
},
readonly: {
type: Boolean,
default: false
}
},
data() {
return {
currentDate: new Date(),
currentDate: beforeDate.getBeforeYear(30), //当前时间的30年前
showDataPicker: false,
data: '', //时间插件绑定的值
date: '', //field显示的值
@@ -133,6 +138,9 @@ export default {
this.$emit('cancel', '')
},
DatePickerShow(flag) {
if (this.readonly) {
return
}
this.showDataPicker = flag
this.$emit('showUp', flag)
}
@@ -142,7 +150,7 @@ export default {
<style lang="scss" scoped>
.date-picter:not(:last-child)::after {
position: absolute;
z-index: 99;
// z-index: 99;
box-sizing: border-box;
content: ' ';
pointer-events: none;