ba857685 by 杨炀

no message

1 parent 7a6d28ad
...@@ -50,13 +50,17 @@ ...@@ -50,13 +50,17 @@
50 <!-- {{language==0?'填写的人数需是乘坐同一航班/车次':'The number of people to be filled in must be on the same flight/train'}}--> 50 <!-- {{language==0?'填写的人数需是乘坐同一航班/车次':'The number of people to be filled in must be on the same flight/train'}}-->
51 51
52 <!-- </div>--> 52 <!-- </div>-->
53 <el-form-item :label="language==0?'抵达日期':'Flight/Train Arrival Date'" prop="pickUpBo.arrivalDate" 53 <el-form-item :label="language==0?'抵达日期':'Flight/Train Arrival Date'"
54 prop="pickUpBo.arrivalDate"
54 required> 55 required>
56 <div style="padding: 1px">
55 <el-date-picker 57 <el-date-picker
58 :disabled-date="disabledDateRZ" default-value="'2024-07'"
56 v-model="form.pickUpBo.arrivalDate" format="YYYY-MM-DD" 59 v-model="form.pickUpBo.arrivalDate" format="YYYY-MM-DD"
57 placeholder="YYYY-MM-DD" 60 placeholder="YYYY-MM-DD"
58 style="width: 100%;" type="date" value-format="YYYY-MM-DD" 61 style="width: 100%;" type="date" value-format="YYYY-MM-DD"
59 /> 62 />
63 </div>
60 </el-form-item> 64 </el-form-item>
61 <el-form-item :label="language==0?'抵达时间':'Flight/Train Arrival Time'" prop="pickUpBo.arrivaTime" 65 <el-form-item :label="language==0?'抵达时间':'Flight/Train Arrival Time'" prop="pickUpBo.arrivaTime"
62 required> 66 required>
...@@ -127,12 +131,16 @@ ...@@ -127,12 +131,16 @@
127 131
128 <!-- </div>--> 132 <!-- </div>-->
129 <el-form-item :label="language==0?'离开日期':'Departure Date from Hotel'" prop="downOffBo.arrivalDate" 133 <el-form-item :label="language==0?'离开日期':'Departure Date from Hotel'" prop="downOffBo.arrivalDate"
130 required> 134 required >
131 <el-date-picker 135 <div style="padding: 1px">
132 v-model="form.downOffBo.arrivalDate" format="YYYY-MM-DD" 136 <el-date-picker
133 placeholder="YYYY-MM-DD" 137 v-model="form.downOffBo.arrivalDate" format="YYYY-MM-DD"
134 style="width: 100%;" type="date" value-format="YYYY-MM-DD" 138 placeholder="YYYY-MM-DD" :disabled-date="disabledDateDP"
135 /> 139 default-value="'2024-07'"
140 style="width: 100%;" type="date" value-format="YYYY-MM-DD"
141 />
142 </div>
143
136 </el-form-item> 144 </el-form-item>
137 <el-form-item :label="language==0?'离开时间':'Departure Time from Hotel'" prop="downOffBo.arrivaTime" required> 145 <el-form-item :label="language==0?'离开时间':'Departure Time from Hotel'" prop="downOffBo.arrivaTime" required>
138 <!-- <el-date-picker--> 146 <!-- <el-date-picker-->
...@@ -193,7 +201,7 @@ ...@@ -193,7 +201,7 @@
193 import {useStorage} from "@vueuse/core/index"; 201 import {useStorage} from "@vueuse/core/index";
194 import {getCurrentInstance, watch, ref} from "vue"; 202 import {getCurrentInstance, watch, ref} from "vue";
195 import {nextTick} from "@vue/runtime-core"; 203 import {nextTick} from "@vue/runtime-core";
196 import {ElMessage, ElMessageBox} from "element-plus"; 204 import {dayjs, ElMessage, ElMessageBox} from "element-plus";
197 import {addInvitation, countryList} from "@/apiPc/match"; 205 import {addInvitation, countryList} from "@/apiPc/match";
198 import ImageUpload from "@/components/ImageUpload"; 206 import ImageUpload from "@/components/ImageUpload";
199 import {masterClassList, getByCard, submitMasterApply, getMasterApply, delByCard,addPickup} from "@/apiPc/common"; 207 import {masterClassList, getByCard, submitMasterApply, getMasterApply, delByCard,addPickup} from "@/apiPc/common";
...@@ -446,7 +454,34 @@ function getCountryList() { ...@@ -446,7 +454,34 @@ function getCountryList() {
446 countrys.value = res.data 454 countrys.value = res.data
447 }) 455 })
448 } 456 }
449 457 // function initdateRZ() {
458 // const today = dayjs().format('YYYY-MM-DD')
459 // form.value.pickUpBo.arrivalDate ='2024-07'
460 // }
461 // function initdateDP() {
462 // const today = dayjs().format('YYYY-MM-DD')
463 // form.value.downOffBo.arrivalDate ='2024-07'
464 // }
465 function disabledDateRZ(date) {
466 // 16-20
467 //判读今天大与2024-07-16
468 const today = dayjs().format('YYYY-MM-DD')
469 if ('2024-07-16' < today) {
470 return !((date.getTime() >= dayjs(today).valueOf()) && (date.getTime() <= dayjs('2024-07-20').valueOf()))
471 } else {
472 return !((date.getTime() >= dayjs('2024-07-16').valueOf()) && (date.getTime() <= dayjs('2024-07-20').valueOf()))
473 }
474 }
475 function disabledDateDP(date) {
476 // 18-22
477 //判读今天大与2024-07-18
478 const today = dayjs().format('YYYY-MM-DD')
479 if ('2024-07-18' < today) {
480 return !((date.getTime() >= dayjs(today).valueOf()) && (date.getTime() <= dayjs('2024-07-22').valueOf()))
481 } else {
482 return !((date.getTime() >= dayjs('2024-07-18').valueOf()) && (date.getTime() <= dayjs('2024-07-22').valueOf()))
483 }
484 }
450 </script> 485 </script>
451 486
452 <style scoped> 487 <style scoped>
......
...@@ -454,7 +454,6 @@ const init = () => { ...@@ -454,7 +454,6 @@ const init = () => {
454 }) 454 })
455 } 455 }
456 const carouselChange = (e) => { 456 const carouselChange = (e) => {
457 console.log(e.name)
458 matchData.value = maList.value[e] 457 matchData.value = maList.value[e]
459 } 458 }
460 const goDetail = (n) => { 459 const goDetail = (n) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!