Commit 408ca7e0 authored by yun's avatar yun

完成

parent b278f315
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"mt-video-player": "^1.0.30", "mt-video-player": "^1.0.30",
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"swiper": "^4.5.0", "swiper": "^4.5.0",
"vant": "^2.2.11", "vant": "^2.0.6",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-cropper": "^0.4.9", "vue-cropper": "^0.4.9",
"vue-ls": "^3.2.1", "vue-ls": "^3.2.1",
......
...@@ -336,6 +336,7 @@ ...@@ -336,6 +336,7 @@
:formatter="formatter" :formatter="formatter"
@confirm="dateConfirmClick" @confirm="dateConfirmClick"
@cancel="datePopupIsShow = false,touchmoveFlag='0'" @cancel="datePopupIsShow = false,touchmoveFlag='0'"
v-if="datePopupIsShow"
/> />
</van-action-sheet> </van-action-sheet>
<!--<popup <!--<popup
...@@ -1301,11 +1302,9 @@ export default { ...@@ -1301,11 +1302,9 @@ export default {
// 点击 日期 时间 input // 点击 日期 时间 input
// 点击时间input 出现日期窗口 事件 // 点击时间input 出现日期窗口 事件
DateClick(type) { DateClick(type) {
console.log('真的上去了。2.11')
this.type = type this.type = type
this.minDate = new Date(1990, 1, 1) this.minDate = new Date(1990, 1, 1)
this.maxDate = new Date(2099, 1, 1) this.maxDate = new Date(2099, 1, 1)
console.log(new Date(), 'JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ')
this.currentDate = new Date() this.currentDate = new Date()
// 判断是否有回显时间 // 判断是否有回显时间
if (this.formData[type] !== '') { if (this.formData[type] !== '') {
...@@ -1337,9 +1336,7 @@ export default { ...@@ -1337,9 +1336,7 @@ export default {
case 'applyOverDate': case 'applyOverDate':
if (that.formData.applyStartDate !== '') { if (that.formData.applyStartDate !== '') {
that.minDate = new Date(applyStartDate.getTime() + (1000 * 60)) that.minDate = new Date(applyStartDate.getTime() + (1000 * 60))
that.currentDate = that.minDate // that.currentDate = that.minDate
console.log(that.minDate, 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk')
console.log(that.currentDate, 'kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk')
} }
// 判断报名结束时间不得大于培训结束时间 // 判断报名结束时间不得大于培训结束时间
if (that.formData.trainOverDate !== '') { if (that.formData.trainOverDate !== '') {
...@@ -1354,7 +1351,7 @@ export default { ...@@ -1354,7 +1351,7 @@ export default {
// 培训的开始字段要大于报名的开始字段 // 培训的开始字段要大于报名的开始字段
if (that.formData.applyStartDate !== '') { if (that.formData.applyStartDate !== '') {
that.minDate = new Date(applyStartDate.getTime() + (1000 * 60)) that.minDate = new Date(applyStartDate.getTime() + (1000 * 60))
that.currentDate = that.minDate // that.currentDate = that.minDate
} }
if (that.formData.trainOverDate !== '' && that.formData.applyStartDate !== '') { if (that.formData.trainOverDate !== '' && that.formData.applyStartDate !== '') {
that.minDate = trainOverDate.getTime() > applyStartDate.getTime() ? new Date(applyStartDate.getTime() + (1000 * 60)) : new Date(trainOverDate.getTime() + (1000 * 60)) that.minDate = trainOverDate.getTime() > applyStartDate.getTime() ? new Date(applyStartDate.getTime() + (1000 * 60)) : new Date(trainOverDate.getTime() + (1000 * 60))
...@@ -1364,16 +1361,16 @@ export default { ...@@ -1364,16 +1361,16 @@ export default {
case 'trainOverDate': case 'trainOverDate':
if (that.formData.trainStartDate !== '') { if (that.formData.trainStartDate !== '') {
that.minDate = new Date(trainStartDate.getTime() + (1000 * 60)) that.minDate = new Date(trainStartDate.getTime() + (1000 * 60))
that.currentDate = that.minDate // that.currentDate = that.minDate
} }
// 培训的结束字段要大于报名的结束字段 // 培训的结束字段要大于报名的结束字段
if (that.formData.applyOverDate !== '') { if (that.formData.applyOverDate !== '') {
that.minDate = new Date(applyOverDate.getTime() + (1000 * 60)) that.minDate = new Date(applyOverDate.getTime() + (1000 * 60))
that.currentDate = that.minDate // that.currentDate = that.minDate
} }
if (that.formData.trainStartDate !== '' && that.formData.applyOverDate !== '') { if (that.formData.trainStartDate !== '' && that.formData.applyOverDate !== '') {
that.minDate = trainStartDate.getTime() > applyOverDate.getTime() ? new Date(trainStartDate.getTime() + (1000 * 60)) : new Date(applyOverDate.getTime() + (1000 * 60)) that.minDate = trainStartDate.getTime() > applyOverDate.getTime() ? new Date(trainStartDate.getTime() + (1000 * 60)) : new Date(applyOverDate.getTime() + (1000 * 60))
that.currentDate = that.minDate // that.currentDate = that.minDate
} }
break break
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment