朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 bab1096ac618f0c8c7c34a4bcbe8dd533bb8846e 1 个父辈 24d865bd

各界面航班日期新增快捷选择功能

内嵌 并排对比
正在显示 13 个修改的文件 包含 369 行增加 和 53 行删除
... ... @@ -42,7 +42,7 @@
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width: 100%"
>
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -154,28 +154,31 @@
export default {
data(){
return{
// pickerOptions: {
// shortcuts: [{
// text: '今天',
// onClick(picker) {
// picker.$emit('pick', new Date());
// }
// }, {
// text: '昨天',
// onClick(picker) {
// const date = new Date();
// date.setTime(date.getTime() - 3600 * 1000 * 24);
// picker.$emit('pick', date);
// }
// }, {
// text: '一周前',
// onClick(picker) {
// const date = new Date();
// date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
// picker.$emit('pick', date);
// }
// }]
// },
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
arrival:{
aircraftNo:undefined,
flightNo:undefined,
... ...
... ... @@ -40,10 +40,12 @@
<el-date-picker
v-model="bill.flightDate"
type="date"
align="left"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width: 100%"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -402,6 +404,31 @@ background-color: white;
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
hidden:['a2','a3','a4','a5'],
bill:{
uuid:undefined,
... ...
... ... @@ -40,7 +40,8 @@
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -57,7 +58,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
<el-form-item label="离港时间" prop="departuredatetime" label-width="130px">
<el-date-picker
v-model="confirmatory.departuredatetime"
type="datetime"
... ... @@ -69,7 +70,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="抵港时间" prop="arrivaldatetime" label-width="130px">
<el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
<el-date-picker
v-model="confirmatory.arrivaldatetime"
type="datetime"
... ... @@ -136,6 +137,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
confirmatory:{
aircraftNo:undefined,
flightNo:undefined,
... ...
... ... @@ -38,7 +38,8 @@
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -122,6 +123,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
declare:{
aircraftNo:undefined,
flightNo:undefined,
... ...
... ... @@ -38,7 +38,8 @@
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -134,6 +135,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
departure:{
aircraftNo:undefined,
flightNo:undefined,
... ...
... ... @@ -9,7 +9,7 @@
<!-- 搜索区域-->
<el-row>
<el-form :inline="true" :model="queryForm" class="demo-form-inline">
<el-col :span="7">
<el-col :span="6">
<el-form-item label="航空器注册编号">
<el-input v-model="queryForm.aircraftno" size="small" style="width: 140px" placeholder="请输入" />
</el-form-item>
... ... @@ -27,7 +27,8 @@
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:140px"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -259,6 +260,31 @@
name: "dynamics" ,
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryForm: {
aircraftno: '',
flightno: '',
... ...
... ... @@ -35,7 +35,8 @@
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -169,6 +170,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
flight:{
customcode:'4604',
flightNo:undefined,
... ...
... ... @@ -10,19 +10,20 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-col :span="7" >
<el-form-item label="航班号：" prop="flightNo" label-width="70px">
<el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="7" >
<el-form-item label="航班日期:" prop="flightDate" label-width="90px">
<el-form-item label="航班日期:" prop="flightDate" label-width="80px">
<el-date-picker
v-model="queryArrival.flightDate"
type="date"
value-format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -180,6 +181,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryArrival:{
flightNo:undefined,
flightDate:undefined,
... ...
... ... @@ -32,7 +32,8 @@
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
placeholder="选择日期" style="width: 180px">
placeholder="选择日期" style="width: 180px"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -275,6 +276,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryBill:{
flightNo:undefined,
aircraftNo:undefined,
... ...
... ... @@ -10,19 +10,20 @@
<el-row>
<el-form :label-position="labelPosition" :model="queryConfirmatory" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-col :span="7" >
<el-form-item label="航班号：" prop="flightNo" label-width="70px">
<el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="航班日期:" prop="flightDate" label-width="90px">
<el-col :span="7" >
<el-form-item label="航班日期:" prop="flightDate" label-width="80px">
<el-date-picker
v-model="queryConfirmatory.flightDate"
type="date"
value-format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -157,6 +158,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryConfirmatory:{
flightNo:undefined,
flightDate:undefined,
... ...
... ... @@ -15,20 +15,21 @@
<!-- <el-input v-model="queryDeclare.awcd" style="width:190px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-col :span="7" >
<el-form-item label="航班号：" prop="flightNo" label-width="70px">
<el-input v-model="queryDeclare.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="航班日期:" prop="flightDate" label-width="90px">
<el-col :span="7" >
<el-form-item label="航班日期:" prop="flightDate" label-width="80px">
<el-date-picker
v-model="queryDeclare.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -164,6 +165,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryDeclare:{
// awcd:undefined,
flightNo:undefined,
... ...
... ... @@ -15,20 +15,21 @@
<!-- <el-input v-model="queryDeparture.awcd" style="width:190px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-col :span="7" >
<el-form-item label="航班号：" prop="flightNo" label-width="70px">
<el-input v-model="queryDeparture.flightNo" style="width:190px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="航班日期:" prop="flightDate" label-width="90px">
<el-col :span="7" >
<el-form-item label="航班日期:" prop="flightDate" label-width="80px">
<el-date-picker
v-model="queryDeparture.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -183,6 +184,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryDeparture:{
flightNo:undefined,
flightDate:undefined,
... ...
... ... @@ -29,7 +29,8 @@
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:190px"
placeholder="选择日期">
placeholder="选择日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -175,6 +176,31 @@
export default {
data(){
return{
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
shortcuts: [{
text: '今天',
onClick(picker) {
picker.$emit('pick', new Date());
}
}, {
text: '昨天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}, {
text: '明天',
onClick(picker) {
const date = new Date();
date.setTime(date.getTime() + 3600 * 1000 * 24);
picker.$emit('pick', date);
}
}]
},
queryFlightplan:{
flightNo:'',
flightDate:'',
... ...