朱兆平 / vue_cli · 提交

转到一个项目

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

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

内嵌 并排对比
正在显示 13 个修改的文件 包含 369 行增加 和 53 行删除
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 value-format="yyyyMMdd" 42 value-format="yyyyMMdd"
43 format="yyyyMMdd" 43 format="yyyyMMdd"
44 style="width: 100%" 44 style="width: 100%"
45 - > 45 + :picker-options="pickerOptions">
46 </el-date-picker> 46 </el-date-picker>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
@@ -154,28 +154,31 @@ @@ -154,28 +154,31 @@
154 export default { 154 export default {
155 data(){ 155 data(){
156 return{ 156 return{
157 - // pickerOptions: {  
158 - // shortcuts: [{  
159 - // text: '今天',  
160 - // onClick(picker) {  
161 - // picker.$emit('pick', new Date());  
162 - // }  
163 - // }, {  
164 - // text: '昨天',  
165 - // onClick(picker) {  
166 - // const date = new Date();  
167 - // date.setTime(date.getTime() - 3600 * 1000 * 24);  
168 - // picker.$emit('pick', date);  
169 - // }  
170 - // }, {  
171 - // text: '一周前',  
172 - // onClick(picker) {  
173 - // const date = new Date();  
174 - // date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);  
175 - // picker.$emit('pick', date);  
176 - // }  
177 - // }]  
178 - // }, 157 + pickerOptions: {
  158 + disabledDate(time) {
  159 + return time.getTime() > Date.now();
  160 + },
  161 + shortcuts: [{
  162 + text: '今天',
  163 + onClick(picker) {
  164 + picker.$emit('pick', new Date());
  165 + }
  166 + }, {
  167 + text: '昨天',
  168 + onClick(picker) {
  169 + const date = new Date();
  170 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  171 + picker.$emit('pick', date);
  172 + }
  173 + }, {
  174 + text: '明天',
  175 + onClick(picker) {
  176 + const date = new Date();
  177 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  178 + picker.$emit('pick', date);
  179 + }
  180 + }]
  181 + },
179 arrival:{ 182 arrival:{
180 aircraftNo:undefined, 183 aircraftNo:undefined,
181 flightNo:undefined, 184 flightNo:undefined,
@@ -40,10 +40,12 @@ @@ -40,10 +40,12 @@
40 <el-date-picker 40 <el-date-picker
41 v-model="bill.flightDate" 41 v-model="bill.flightDate"
42 type="date" 42 type="date"
  43 + align="left"
43 value-format="yyyyMMdd" 44 value-format="yyyyMMdd"
44 format="yyyyMMdd" 45 format="yyyyMMdd"
45 style="width: 100%" 46 style="width: 100%"
46 - placeholder="选择日期"> 47 + placeholder="选择日期"
  48 + :picker-options="pickerOptions">
47 </el-date-picker> 49 </el-date-picker>
48 </el-form-item> 50 </el-form-item>
49 </el-col> 51 </el-col>
@@ -402,6 +404,31 @@ background-color: white; @@ -402,6 +404,31 @@ background-color: white;
402 export default { 404 export default {
403 data(){ 405 data(){
404 return{ 406 return{
  407 + pickerOptions: {
  408 + disabledDate(time) {
  409 + return time.getTime() > Date.now();
  410 + },
  411 + shortcuts: [{
  412 + text: '今天',
  413 + onClick(picker) {
  414 + picker.$emit('pick', new Date());
  415 + }
  416 + }, {
  417 + text: '昨天',
  418 + onClick(picker) {
  419 + const date = new Date();
  420 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  421 + picker.$emit('pick', date);
  422 + }
  423 + }, {
  424 + text: '明天',
  425 + onClick(picker) {
  426 + const date = new Date();
  427 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  428 + picker.$emit('pick', date);
  429 + }
  430 + }]
  431 + },
405 hidden:['a2','a3','a4','a5'], 432 hidden:['a2','a3','a4','a5'],
406 bill:{ 433 bill:{
407 uuid:undefined, 434 uuid:undefined,
@@ -40,7 +40,8 @@ @@ -40,7 +40,8 @@
40 value-format="yyyyMMdd" 40 value-format="yyyyMMdd"
41 format="yyyyMMdd" 41 format="yyyyMMdd"
42 style="width:100%" 42 style="width:100%"
43 - placeholder="选择日期"> 43 + placeholder="选择日期"
  44 + :picker-options="pickerOptions">
44 </el-date-picker> 45 </el-date-picker>
45 </el-form-item> 46 </el-form-item>
46 </el-col> 47 </el-col>
@@ -57,7 +58,7 @@ @@ -57,7 +58,7 @@
57 </el-form-item> 58 </el-form-item>
58 </el-col> 59 </el-col>
59 <el-col :span="6"> 60 <el-col :span="6">
60 - <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> 61 + <el-form-item label="离港时间" prop="departuredatetime" label-width="130px">
61 <el-date-picker 62 <el-date-picker
62 v-model="confirmatory.departuredatetime" 63 v-model="confirmatory.departuredatetime"
63 type="datetime" 64 type="datetime"
@@ -69,7 +70,7 @@ @@ -69,7 +70,7 @@
69 </el-form-item> 70 </el-form-item>
70 </el-col> 71 </el-col>
71 <el-col :span="6"> 72 <el-col :span="6">
72 - <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="130px"> 73 + <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
73 <el-date-picker 74 <el-date-picker
74 v-model="confirmatory.arrivaldatetime" 75 v-model="confirmatory.arrivaldatetime"
75 type="datetime" 76 type="datetime"
@@ -136,6 +137,31 @@ @@ -136,6 +137,31 @@
136 export default { 137 export default {
137 data(){ 138 data(){
138 return{ 139 return{
  140 + pickerOptions: {
  141 + disabledDate(time) {
  142 + return time.getTime() > Date.now();
  143 + },
  144 + shortcuts: [{
  145 + text: '今天',
  146 + onClick(picker) {
  147 + picker.$emit('pick', new Date());
  148 + }
  149 + }, {
  150 + text: '昨天',
  151 + onClick(picker) {
  152 + const date = new Date();
  153 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  154 + picker.$emit('pick', date);
  155 + }
  156 + }, {
  157 + text: '明天',
  158 + onClick(picker) {
  159 + const date = new Date();
  160 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  161 + picker.$emit('pick', date);
  162 + }
  163 + }]
  164 + },
139 confirmatory:{ 165 confirmatory:{
140 aircraftNo:undefined, 166 aircraftNo:undefined,
141 flightNo:undefined, 167 flightNo:undefined,
@@ -38,7 +38,8 @@ @@ -38,7 +38,8 @@
38 value-format="yyyyMMdd" 38 value-format="yyyyMMdd"
39 format="yyyyMMdd" 39 format="yyyyMMdd"
40 style="width:100%" 40 style="width:100%"
41 - placeholder="选择日期"> 41 + placeholder="选择日期"
  42 + :picker-options="pickerOptions">
42 </el-date-picker> 43 </el-date-picker>
43 </el-form-item> 44 </el-form-item>
44 </el-col> 45 </el-col>
@@ -122,6 +123,31 @@ @@ -122,6 +123,31 @@
122 export default { 123 export default {
123 data(){ 124 data(){
124 return{ 125 return{
  126 + pickerOptions: {
  127 + disabledDate(time) {
  128 + return time.getTime() > Date.now();
  129 + },
  130 + shortcuts: [{
  131 + text: '今天',
  132 + onClick(picker) {
  133 + picker.$emit('pick', new Date());
  134 + }
  135 + }, {
  136 + text: '昨天',
  137 + onClick(picker) {
  138 + const date = new Date();
  139 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  140 + picker.$emit('pick', date);
  141 + }
  142 + }, {
  143 + text: '明天',
  144 + onClick(picker) {
  145 + const date = new Date();
  146 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  147 + picker.$emit('pick', date);
  148 + }
  149 + }]
  150 + },
125 declare:{ 151 declare:{
126 aircraftNo:undefined, 152 aircraftNo:undefined,
127 flightNo:undefined, 153 flightNo:undefined,
@@ -38,7 +38,8 @@ @@ -38,7 +38,8 @@
38 value-format="yyyyMMdd" 38 value-format="yyyyMMdd"
39 format="yyyyMMdd" 39 format="yyyyMMdd"
40 style="width:100%" 40 style="width:100%"
41 - placeholder="选择日期"> 41 + placeholder="选择日期"
  42 + :picker-options="pickerOptions">
42 </el-date-picker> 43 </el-date-picker>
43 </el-form-item> 44 </el-form-item>
44 </el-col> 45 </el-col>
@@ -134,6 +135,31 @@ @@ -134,6 +135,31 @@
134 export default { 135 export default {
135 data(){ 136 data(){
136 return{ 137 return{
  138 + pickerOptions: {
  139 + disabledDate(time) {
  140 + return time.getTime() > Date.now();
  141 + },
  142 + shortcuts: [{
  143 + text: '今天',
  144 + onClick(picker) {
  145 + picker.$emit('pick', new Date());
  146 + }
  147 + }, {
  148 + text: '昨天',
  149 + onClick(picker) {
  150 + const date = new Date();
  151 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  152 + picker.$emit('pick', date);
  153 + }
  154 + }, {
  155 + text: '明天',
  156 + onClick(picker) {
  157 + const date = new Date();
  158 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  159 + picker.$emit('pick', date);
  160 + }
  161 + }]
  162 + },
137 departure:{ 163 departure:{
138 aircraftNo:undefined, 164 aircraftNo:undefined,
139 flightNo:undefined, 165 flightNo:undefined,
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <!-- 搜索区域--> 9 <!-- 搜索区域-->
10 <el-row> 10 <el-row>
11 <el-form :inline="true" :model="queryForm" class="demo-form-inline"> 11 <el-form :inline="true" :model="queryForm" class="demo-form-inline">
12 - <el-col :span="7"> 12 + <el-col :span="6">
13 <el-form-item label="航空器注册编号"> 13 <el-form-item label="航空器注册编号">
14 <el-input v-model="queryForm.aircraftno" size="small" style="width: 140px" placeholder="请输入" /> 14 <el-input v-model="queryForm.aircraftno" size="small" style="width: 140px" placeholder="请输入" />
15 </el-form-item> 15 </el-form-item>
@@ -27,7 +27,8 @@ @@ -27,7 +27,8 @@
27 value-format="yyyyMMdd" 27 value-format="yyyyMMdd"
28 format="yyyyMMdd" 28 format="yyyyMMdd"
29 style="width:140px" 29 style="width:140px"
30 - placeholder="选择日期"> 30 + placeholder="选择日期"
  31 + :picker-options="pickerOptions">
31 </el-date-picker> 32 </el-date-picker>
32 </el-form-item> 33 </el-form-item>
33 </el-col> 34 </el-col>
@@ -259,6 +260,31 @@ @@ -259,6 +260,31 @@
259 name: "dynamics" , 260 name: "dynamics" ,
260 data() { 261 data() {
261 return { 262 return {
  263 + pickerOptions: {
  264 + disabledDate(time) {
  265 + return time.getTime() > Date.now();
  266 + },
  267 + shortcuts: [{
  268 + text: '今天',
  269 + onClick(picker) {
  270 + picker.$emit('pick', new Date());
  271 + }
  272 + }, {
  273 + text: '昨天',
  274 + onClick(picker) {
  275 + const date = new Date();
  276 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  277 + picker.$emit('pick', date);
  278 + }
  279 + }, {
  280 + text: '明天',
  281 + onClick(picker) {
  282 + const date = new Date();
  283 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  284 + picker.$emit('pick', date);
  285 + }
  286 + }]
  287 + },
262 queryForm: { 288 queryForm: {
263 aircraftno: '', 289 aircraftno: '',
264 flightno: '', 290 flightno: '',
@@ -35,7 +35,8 @@ @@ -35,7 +35,8 @@
35 value-format="yyyyMMdd" 35 value-format="yyyyMMdd"
36 format="yyyyMMdd" 36 format="yyyyMMdd"
37 style="width:100%" 37 style="width:100%"
38 - placeholder="选择日期"> 38 + placeholder="选择日期"
  39 + :picker-options="pickerOptions">
39 </el-date-picker> 40 </el-date-picker>
40 </el-form-item> 41 </el-form-item>
41 </el-col> 42 </el-col>
@@ -169,6 +170,31 @@ @@ -169,6 +170,31 @@
169 export default { 170 export default {
170 data(){ 171 data(){
171 return{ 172 return{
  173 + pickerOptions: {
  174 + disabledDate(time) {
  175 + return time.getTime() > Date.now();
  176 + },
  177 + shortcuts: [{
  178 + text: '今天',
  179 + onClick(picker) {
  180 + picker.$emit('pick', new Date());
  181 + }
  182 + }, {
  183 + text: '昨天',
  184 + onClick(picker) {
  185 + const date = new Date();
  186 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  187 + picker.$emit('pick', date);
  188 + }
  189 + }, {
  190 + text: '明天',
  191 + onClick(picker) {
  192 + const date = new Date();
  193 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  194 + picker.$emit('pick', date);
  195 + }
  196 + }]
  197 + },
172 flight:{ 198 flight:{
173 customcode:'4604', 199 customcode:'4604',
174 flightNo:undefined, 200 flightNo:undefined,
@@ -10,19 +10,20 @@ @@ -10,19 +10,20 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="6" >  
14 - <el-form-item label="航班号：" prop="flightNo" label-width="80px"> 13 + <el-col :span="7" >
  14 + <el-form-item label="航班号：" prop="flightNo" label-width="70px">
15 <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input> 15 <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 <el-col :span="7" > 18 <el-col :span="7" >
19 - <el-form-item label="航班日期:" prop="flightDate" label-width="90px"> 19 + <el-form-item label="航班日期:" prop="flightDate" label-width="80px">
20 <el-date-picker 20 <el-date-picker
21 v-model="queryArrival.flightDate" 21 v-model="queryArrival.flightDate"
22 type="date" 22 type="date"
23 value-format="yyyyMMdd" 23 value-format="yyyyMMdd"
24 style="width:190px" 24 style="width:190px"
25 - placeholder="选择日期"> 25 + placeholder="选择日期"
  26 + :picker-options="pickerOptions">
26 </el-date-picker> 27 </el-date-picker>
27 </el-form-item> 28 </el-form-item>
28 </el-col> 29 </el-col>
@@ -180,6 +181,31 @@ @@ -180,6 +181,31 @@
180 export default { 181 export default {
181 data(){ 182 data(){
182 return{ 183 return{
  184 + pickerOptions: {
  185 + disabledDate(time) {
  186 + return time.getTime() > Date.now();
  187 + },
  188 + shortcuts: [{
  189 + text: '今天',
  190 + onClick(picker) {
  191 + picker.$emit('pick', new Date());
  192 + }
  193 + }, {
  194 + text: '昨天',
  195 + onClick(picker) {
  196 + const date = new Date();
  197 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  198 + picker.$emit('pick', date);
  199 + }
  200 + }, {
  201 + text: '明天',
  202 + onClick(picker) {
  203 + const date = new Date();
  204 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  205 + picker.$emit('pick', date);
  206 + }
  207 + }]
  208 + },
183 queryArrival:{ 209 queryArrival:{
184 flightNo:undefined, 210 flightNo:undefined,
185 flightDate:undefined, 211 flightDate:undefined,
@@ -32,7 +32,8 @@ @@ -32,7 +32,8 @@
32 type="date" 32 type="date"
33 value-format="yyyyMMdd" 33 value-format="yyyyMMdd"
34 format="yyyyMMdd" 34 format="yyyyMMdd"
35 - placeholder="选择日期" style="width: 180px"> 35 + placeholder="选择日期" style="width: 180px"
  36 + :picker-options="pickerOptions">
36 </el-date-picker> 37 </el-date-picker>
37 </el-form-item> 38 </el-form-item>
38 </el-col> 39 </el-col>
@@ -275,6 +276,31 @@ @@ -275,6 +276,31 @@
275 export default { 276 export default {
276 data(){ 277 data(){
277 return{ 278 return{
  279 + pickerOptions: {
  280 + disabledDate(time) {
  281 + return time.getTime() > Date.now();
  282 + },
  283 + shortcuts: [{
  284 + text: '今天',
  285 + onClick(picker) {
  286 + picker.$emit('pick', new Date());
  287 + }
  288 + }, {
  289 + text: '昨天',
  290 + onClick(picker) {
  291 + const date = new Date();
  292 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  293 + picker.$emit('pick', date);
  294 + }
  295 + }, {
  296 + text: '明天',
  297 + onClick(picker) {
  298 + const date = new Date();
  299 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  300 + picker.$emit('pick', date);
  301 + }
  302 + }]
  303 + },
278 queryBill:{ 304 queryBill:{
279 flightNo:undefined, 305 flightNo:undefined,
280 aircraftNo:undefined, 306 aircraftNo:undefined,
@@ -10,19 +10,20 @@ @@ -10,19 +10,20 @@
10 <el-row> 10 <el-row>
11 <el-form :label-position="labelPosition" :model="queryConfirmatory" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="queryConfirmatory" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 - <el-col :span="6" >  
14 - <el-form-item label="航班号：" prop="flightNo" label-width="80px"> 13 + <el-col :span="7" >
  14 + <el-form-item label="航班号：" prop="flightNo" label-width="70px">
15 <el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input> 15 <el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input>
16 </el-form-item> 16 </el-form-item>
17 </el-col> 17 </el-col>
18 - <el-col :span="6" >  
19 - <el-form-item label="航班日期:" prop="flightDate" label-width="90px"> 18 + <el-col :span="7" >
  19 + <el-form-item label="航班日期:" prop="flightDate" label-width="80px">
20 <el-date-picker 20 <el-date-picker
21 v-model="queryConfirmatory.flightDate" 21 v-model="queryConfirmatory.flightDate"
22 type="date" 22 type="date"
23 value-format="yyyyMMdd" 23 value-format="yyyyMMdd"
24 style="width:190px" 24 style="width:190px"
25 - placeholder="选择日期"> 25 + placeholder="选择日期"
  26 + :picker-options="pickerOptions">
26 </el-date-picker> 27 </el-date-picker>
27 </el-form-item> 28 </el-form-item>
28 </el-col> 29 </el-col>
@@ -157,6 +158,31 @@ @@ -157,6 +158,31 @@
157 export default { 158 export default {
158 data(){ 159 data(){
159 return{ 160 return{
  161 + pickerOptions: {
  162 + disabledDate(time) {
  163 + return time.getTime() > Date.now();
  164 + },
  165 + shortcuts: [{
  166 + text: '今天',
  167 + onClick(picker) {
  168 + picker.$emit('pick', new Date());
  169 + }
  170 + }, {
  171 + text: '昨天',
  172 + onClick(picker) {
  173 + const date = new Date();
  174 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  175 + picker.$emit('pick', date);
  176 + }
  177 + }, {
  178 + text: '明天',
  179 + onClick(picker) {
  180 + const date = new Date();
  181 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  182 + picker.$emit('pick', date);
  183 + }
  184 + }]
  185 + },
160 queryConfirmatory:{ 186 queryConfirmatory:{
161 flightNo:undefined, 187 flightNo:undefined,
162 flightDate:undefined, 188 flightDate:undefined,
@@ -15,20 +15,21 @@ @@ -15,20 +15,21 @@
15 <!-- <el-input v-model="queryDeclare.awcd" style="width:190px"></el-input>--> 15 <!-- <el-input v-model="queryDeclare.awcd" style="width:190px"></el-input>-->
16 <!-- </el-form-item>--> 16 <!-- </el-form-item>-->
17 <!-- </el-col>--> 17 <!-- </el-col>-->
18 - <el-col :span="6" >  
19 - <el-form-item label="航班号：" prop="flightNo" label-width="80px"> 18 + <el-col :span="7" >
  19 + <el-form-item label="航班号：" prop="flightNo" label-width="70px">
20 <el-input v-model="queryDeclare.flightNo" style="width:190px"></el-input> 20 <el-input v-model="queryDeclare.flightNo" style="width:190px"></el-input>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
23 - <el-col :span="6" >  
24 - <el-form-item label="航班日期:" prop="flightDate" label-width="90px"> 23 + <el-col :span="7" >
  24 + <el-form-item label="航班日期:" prop="flightDate" label-width="80px">
25 <el-date-picker 25 <el-date-picker
26 v-model="queryDeclare.flightDate" 26 v-model="queryDeclare.flightDate"
27 type="date" 27 type="date"
28 value-format="yyyyMMdd" 28 value-format="yyyyMMdd"
29 format="yyyyMMdd" 29 format="yyyyMMdd"
30 style="width:190px" 30 style="width:190px"
31 - placeholder="选择日期"> 31 + placeholder="选择日期"
  32 + :picker-options="pickerOptions">
32 </el-date-picker> 33 </el-date-picker>
33 </el-form-item> 34 </el-form-item>
34 </el-col> 35 </el-col>
@@ -164,6 +165,31 @@ @@ -164,6 +165,31 @@
164 export default { 165 export default {
165 data(){ 166 data(){
166 return{ 167 return{
  168 + pickerOptions: {
  169 + disabledDate(time) {
  170 + return time.getTime() > Date.now();
  171 + },
  172 + shortcuts: [{
  173 + text: '今天',
  174 + onClick(picker) {
  175 + picker.$emit('pick', new Date());
  176 + }
  177 + }, {
  178 + text: '昨天',
  179 + onClick(picker) {
  180 + const date = new Date();
  181 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  182 + picker.$emit('pick', date);
  183 + }
  184 + }, {
  185 + text: '明天',
  186 + onClick(picker) {
  187 + const date = new Date();
  188 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  189 + picker.$emit('pick', date);
  190 + }
  191 + }]
  192 + },
167 queryDeclare:{ 193 queryDeclare:{
168 // awcd:undefined, 194 // awcd:undefined,
169 flightNo:undefined, 195 flightNo:undefined,
@@ -15,20 +15,21 @@ @@ -15,20 +15,21 @@
15 <!-- <el-input v-model="queryDeparture.awcd" style="width:190px"></el-input>--> 15 <!-- <el-input v-model="queryDeparture.awcd" style="width:190px"></el-input>-->
16 <!-- </el-form-item>--> 16 <!-- </el-form-item>-->
17 <!-- </el-col>--> 17 <!-- </el-col>-->
18 - <el-col :span="6" >  
19 - <el-form-item label="航班号：" prop="flightNo" label-width="80px"> 18 + <el-col :span="7" >
  19 + <el-form-item label="航班号：" prop="flightNo" label-width="70px">
20 <el-input v-model="queryDeparture.flightNo" style="width:190px"></el-input> 20 <el-input v-model="queryDeparture.flightNo" style="width:190px"></el-input>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
23 - <el-col :span="6" >  
24 - <el-form-item label="航班日期:" prop="flightDate" label-width="90px"> 23 + <el-col :span="7" >
  24 + <el-form-item label="航班日期:" prop="flightDate" label-width="80px">
25 <el-date-picker 25 <el-date-picker
26 v-model="queryDeparture.flightDate" 26 v-model="queryDeparture.flightDate"
27 type="date" 27 type="date"
28 value-format="yyyyMMdd" 28 value-format="yyyyMMdd"
29 format="yyyyMMdd" 29 format="yyyyMMdd"
30 style="width:190px" 30 style="width:190px"
31 - placeholder="选择日期"> 31 + placeholder="选择日期"
  32 + :picker-options="pickerOptions">
32 </el-date-picker> 33 </el-date-picker>
33 </el-form-item> 34 </el-form-item>
34 </el-col> 35 </el-col>
@@ -183,6 +184,31 @@ @@ -183,6 +184,31 @@
183 export default { 184 export default {
184 data(){ 185 data(){
185 return{ 186 return{
  187 + pickerOptions: {
  188 + disabledDate(time) {
  189 + return time.getTime() > Date.now();
  190 + },
  191 + shortcuts: [{
  192 + text: '今天',
  193 + onClick(picker) {
  194 + picker.$emit('pick', new Date());
  195 + }
  196 + }, {
  197 + text: '昨天',
  198 + onClick(picker) {
  199 + const date = new Date();
  200 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  201 + picker.$emit('pick', date);
  202 + }
  203 + }, {
  204 + text: '明天',
  205 + onClick(picker) {
  206 + const date = new Date();
  207 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  208 + picker.$emit('pick', date);
  209 + }
  210 + }]
  211 + },
186 queryDeparture:{ 212 queryDeparture:{
187 flightNo:undefined, 213 flightNo:undefined,
188 flightDate:undefined, 214 flightDate:undefined,
@@ -29,7 +29,8 @@ @@ -29,7 +29,8 @@
29 format="yyyyMMdd" 29 format="yyyyMMdd"
30 value-format="yyyyMMdd" 30 value-format="yyyyMMdd"
31 style="width:190px" 31 style="width:190px"
32 - placeholder="选择日期"> 32 + placeholder="选择日期"
  33 + :picker-options="pickerOptions">
33 </el-date-picker> 34 </el-date-picker>
34 </el-form-item> 35 </el-form-item>
35 </el-col> 36 </el-col>
@@ -175,6 +176,31 @@ @@ -175,6 +176,31 @@
175 export default { 176 export default {
176 data(){ 177 data(){
177 return{ 178 return{
  179 + pickerOptions: {
  180 + disabledDate(time) {
  181 + return time.getTime() > Date.now();
  182 + },
  183 + shortcuts: [{
  184 + text: '今天',
  185 + onClick(picker) {
  186 + picker.$emit('pick', new Date());
  187 + }
  188 + }, {
  189 + text: '昨天',
  190 + onClick(picker) {
  191 + const date = new Date();
  192 + date.setTime(date.getTime() - 3600 * 1000 * 24);
  193 + picker.$emit('pick', date);
  194 + }
  195 + }, {
  196 + text: '明天',
  197 + onClick(picker) {
  198 + const date = new Date();
  199 + date.setTime(date.getTime() + 3600 * 1000 * 24);
  200 + picker.$emit('pick', date);
  201 + }
  202 + }]
  203 + },
178 queryFlightplan:{ 204 queryFlightplan:{
179 flightNo:'', 205 flightNo:'',
180 flightDate:'', 206 flightDate:'',