朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 73eb140303696d6141c7a8b24844110ef9ac658a 1 个父辈 4bd59e5e

预报确报配置优化，修复BUG

内嵌 并排对比
正在显示 1 个修改的文件 包含 52 行增加 和 63 行删除
@@ -11,19 +11,19 @@ @@ -11,19 +11,19 @@
11 <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight" 11 <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
12 label-width="130px" class="demo-ruleForm"> 12 label-width="130px" class="demo-ruleForm">
13 <el-row> 13 <el-row>
14 - <el-col :span="5" style="margin-right: 70px"> 14 + <el-col :span="5">
15 <el-form-item label="承运人" prop="awcd" label-width="70px"> 15 <el-form-item label="承运人" prop="awcd" label-width="70px">
16 <el-input v-model="queryConfigure.awcd" style="width:120px"></el-input> 16 <el-input v-model="queryConfigure.awcd" style="width:120px"></el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 - <el-col :span="5" style="margin-right: 70px"> 19 + <el-col :span="5">
20 <el-form-item label="航班号" prop="flightNo" label-width="70px"> 20 <el-form-item label="航班号" prop="flightNo" label-width="70px">
21 <el-input v-model="queryConfigure.flightNo" style="width:120px"></el-input> 21 <el-input v-model="queryConfigure.flightNo" style="width:120px"></el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="8" > 24 <el-col :span="8" >
25 - <el-button type="primary" icon="el-icon-search" @click="submitForm()">查询</el-button>  
26 - <el-button type="success" icon="el-icon-edit" @click="addForm()">新增</el-button> 25 + <el-button type="primary" @click="submitForm()">查询</el-button>
  26 + <el-button type="success" @click="addForm()">新增</el-button>
27 27
28 </el-col> 28 </el-col>
29 </el-row> 29 </el-row>
@@ -36,32 +36,19 @@ @@ -36,32 +36,19 @@
36 :data="tableData" 36 :data="tableData"
37 border 37 border
38 v-loading="tableloading" style="margin-bottom: 20px;margin-top: 20px"> 38 v-loading="tableloading" style="margin-bottom: 20px;margin-top: 20px">
39 - <el-table-column 39 + <!--<el-table-column
40 prop="awcd" 40 prop="awcd"
41 label="承运人"> 41 label="承运人">
42 - </el-table-column> 42 + </el-table-column>-->
43 <el-table-column 43 <el-table-column
44 prop="flightNo" 44 prop="flightNo"
45 label="航班号"> 45 label="航班号">
46 </el-table-column> 46 </el-table-column>
47 <el-table-column 47 <el-table-column
48 - prop="customscode"  
49 - label="申报关区">  
50 - </el-table-column>  
51 - <el-table-column  
52 prop="aircraftNo" 48 prop="aircraftNo"
53 label="航空注册器编号"> 49 label="航空注册器编号">
54 </el-table-column> 50 </el-table-column>
55 <el-table-column 51 <el-table-column
56 - prop="transportflag"  
57 - label="航空器备案类型"  
58 - show-overflow-tooltip>  
59 - </el-table-column>  
60 - <el-table-column  
61 - prop="aircraftstand"  
62 - label="停机位">  
63 - </el-table-column>  
64 - <el-table-column  
65 prop="departurePort" 52 prop="departurePort"
66 label="航班起始站"> 53 label="航班起始站">
67 </el-table-column> 54 </el-table-column>
@@ -70,16 +57,37 @@ @@ -70,16 +57,37 @@
70 label="航班目的站"> 57 label="航班目的站">
71 </el-table-column> 58 </el-table-column>
72 <el-table-column 59 <el-table-column
  60 + prop="customscode"
  61 + label="申报关区">
  62 + </el-table-column>
  63 + <el-table-column
  64 + label="配置类型">
  65 + <template slot-scope="scope">
  66 + <span v-if="scope.row.type ==='2'">入境</span>
  67 + <span v-if="scope.row.type ==='1'">出境</span>
  68 + </template>
  69 + </el-table-column>
  70 + <!--<el-table-column
  71 + prop="transportflag"
  72 + label="航空器备案类型"
  73 + show-overflow-tooltip>
  74 + </el-table-column>-->
  75 + <!--<el-table-column
  76 + prop="aircraftstand"
  77 + label="停机位">
  78 + </el-table-column>-->
  79 + <el-table-column
73 prop="departuredatetime" 80 prop="departuredatetime"
74 label="预计出境时间"> 81 label="预计出境时间">
75 </el-table-column> 82 </el-table-column>
76 <el-table-column 83 <el-table-column
77 prop="arrivaldatetime" 84 prop="arrivaldatetime"
78 label="预计入境时间"> 85 label="预计入境时间">
79 - </el-table-column><el-table-column 86 + </el-table-column>
  87 + <!--<el-table-column
80 prop="validtime" 88 prop="validtime"
81 label="配置生效到期日"> 89 label="配置生效到期日">
82 - </el-table-column> 90 + </el-table-column>-->
83 <el-table-column 91 <el-table-column
84 label="配置状态"> 92 label="配置状态">
85 <template slot-scope="scope"> 93 <template slot-scope="scope">
@@ -87,14 +95,8 @@ @@ -87,14 +95,8 @@
87 <span v-if="scope.row.status ==='1'">生效</span> 95 <span v-if="scope.row.status ==='1'">生效</span>
88 </template> 96 </template>
89 </el-table-column> 97 </el-table-column>
90 - <el-table-column  
91 - label="配置类型">  
92 - <template slot-scope="scope">  
93 - <span v-if="scope.row.type ==='2'">入境</span>  
94 - <span v-if="scope.row.type ==='1'">出境</span>  
95 - </template>  
96 - </el-table-column>  
97 - <el-table-column 98 +
  99 + <!--<el-table-column
98 prop="userid" 100 prop="userid"
99 label="创建人"> 101 label="创建人">
100 </el-table-column> 102 </el-table-column>
@@ -109,12 +111,12 @@ @@ -109,12 +111,12 @@
109 <el-table-column 111 <el-table-column
110 prop="meno" 112 prop="meno"
111 label="备注"> 113 label="备注">
112 - </el-table-column> 114 + </el-table-column>-->
113 <el-table-column 115 <el-table-column
114 fixed="right" 116 fixed="right"
115 prop="" 117 prop=""
116 - label="报文操作"  
117 - width="280"> 118 + label="信息操作"
  119 + width="180">
118 <template slot-scope="scope"> 120 <template slot-scope="scope">
119 <el-button 121 <el-button
120 size="mini" 122 size="mini"
@@ -174,9 +176,12 @@ @@ -174,9 +176,12 @@
174 <el-row> 176 <el-row>
175 <el-col :span="6"> 177 <el-col :span="6">
176 <el-form-item label="航空器备案类型" prop="transportflag" label-width="140px"> 178 <el-form-item label="航空器备案类型" prop="transportflag" label-width="140px">
177 - <el-input v-model="configure_addForm.transportflag"  
178 - ></el-input> 179 + <el-select v-model="configure_addForm.transportflag" placeholder="请选择">
  180 + <el-option label="通用航空器" value="1"></el-option>
  181 + <el-option label="航线航空器" value="2"></el-option>
  182 + </el-select>
179 </el-form-item> 183 </el-form-item>
  184 +
180 </el-col> 185 </el-col>
181 <el-col :span="6"> 186 <el-col :span="6">
182 <el-form-item label="停机位" prop="aircraftstand" label-width="120px"> 187 <el-form-item label="停机位" prop="aircraftstand" label-width="120px">
@@ -201,8 +206,8 @@ @@ -201,8 +206,8 @@
201 v-model="configure_addForm.departuredatetime" 206 v-model="configure_addForm.departuredatetime"
202 type="datetime" 207 type="datetime"
203 placeholder="选择日期时间" 208 placeholder="选择日期时间"
204 - value-format="yyyyMMddhhmmss"  
205 - format="yyyyMMddhhmmss" 209 + value-format="yyyy-MM-dd HH:mm:ss"
  210 + format="yyyy-MM-dd HH:mm:ss"
206 style="width:100%"> 211 style="width:100%">
207 </el-date-picker> 212 </el-date-picker>
208 </el-form-item> 213 </el-form-item>
@@ -213,8 +218,8 @@ @@ -213,8 +218,8 @@
213 v-model="configure_addForm.arrivaldatetime" 218 v-model="configure_addForm.arrivaldatetime"
214 type="datetime" 219 type="datetime"
215 placeholder="选择日期时间" 220 placeholder="选择日期时间"
216 - value-format="yyyyMMddhhmmss"  
217 - format="yyyyMMddhhmmss" 221 + value-format="yyyy-MM-dd HH:mm:ss"
  222 + format="yyyy-MM-dd HH:mm:ss"
218 style="width:100%"> 223 style="width:100%">
219 </el-date-picker> 224 </el-date-picker>
220 </el-form-item> 225 </el-form-item>
@@ -225,18 +230,18 @@ @@ -225,18 +230,18 @@
225 v-model="configure_addForm.validtime" 230 v-model="configure_addForm.validtime"
226 type="datetime" 231 type="datetime"
227 placeholder="选择日期时间" 232 placeholder="选择日期时间"
228 - value-format="yyyyMMddhhmmss"  
229 - format="yyyyMMddhhmmss" 233 + value-format="yyyy-MM-dd HH:mm:ss"
  234 + format="yyyy-MM-dd HH:mm:ss"
230 style="width: 100%" 235 style="width: 100%"
231 :picker-options="pickerOptions"> 236 :picker-options="pickerOptions">
232 </el-date-picker> 237 </el-date-picker>
233 </el-form-item> 238 </el-form-item>
234 </el-col> 239 </el-col>
235 - <el-col :span="6"> 240 + <!--<el-col :span="6">
236 <el-form-item label="创建人" prop="userid" label-width="120px"> 241 <el-form-item label="创建人" prop="userid" label-width="120px">
237 <el-input v-model="configure_addForm.userid"></el-input> 242 <el-input v-model="configure_addForm.userid"></el-input>
238 </el-form-item> 243 </el-form-item>
239 - </el-col> 244 + </el-col>-->
240 245
241 <el-col :span="6"> 246 <el-col :span="6">
242 <el-form-item label="配置类型" prop="type" label-width="120px"> 247 <el-form-item label="配置类型" prop="type" label-width="120px">
@@ -256,7 +261,7 @@ @@ -256,7 +261,7 @@
256 </el-select> 261 </el-select>
257 </el-form-item> 262 </el-form-item>
258 </el-col> 263 </el-col>
259 - <el-col :span="6"> 264 + <!--<el-col :span="6">
260 <el-form-item label="创建时间" prop="creatdate" label-width="120px"> 265 <el-form-item label="创建时间" prop="creatdate" label-width="120px">
261 <el-date-picker 266 <el-date-picker
262 v-model="configure_addForm.creatdate" 267 v-model="configure_addForm.creatdate"
@@ -281,9 +286,7 @@ @@ -281,9 +286,7 @@
281 :picker-options="pickerOptions"> 286 :picker-options="pickerOptions">
282 </el-date-picker> 287 </el-date-picker>
283 </el-form-item> 288 </el-form-item>
284 - </el-col>  
285 - </el-row>  
286 - <el-row> 289 + </el-col>-->
287 <el-col :span="12"> 290 <el-col :span="12">
288 <el-form-item label="星期日期" prop="schedule.options" label-width="120px"> 291 <el-form-item label="星期日期" prop="schedule.options" label-width="120px">
289 <el-select v-model="configure_addForm.schedule.options" multiple placeholder="请选择(可多选)" style="width: 100%"> 292 <el-select v-model="configure_addForm.schedule.options" multiple placeholder="请选择(可多选)" style="width: 100%">
@@ -296,11 +299,6 @@ @@ -296,11 +299,6 @@
296 </el-select> 299 </el-select>
297 </el-form-item> 300 </el-form-item>
298 </el-col> 301 </el-col>
299 - <el-col :span="12">  
300 - <el-form-item label="备注" prop="meno" label-width="120px">  
301 - <el-input v-model="configure_addForm.meno"></el-input>  
302 - </el-form-item>  
303 - </el-col>  
304 </el-row> 302 </el-row>
305 303
306 </el-form> 304 </el-form>
@@ -377,15 +375,15 @@ @@ -377,15 +375,15 @@
377 flightNo:'', 375 flightNo:'',
378 customscode:'', 376 customscode:'',
379 aircraftNo:'', 377 aircraftNo:'',
380 - transportflag:'', 378 + transportflag:'1',
381 aircraftstand:'', 379 aircraftstand:'',
382 departurePort:'', 380 departurePort:'',
383 arrivalPort:'', 381 arrivalPort:'',
384 departuredatetime:'', 382 departuredatetime:'',
385 arrivaldatetime:'', 383 arrivaldatetime:'',
386 validtime:'', 384 validtime:'',
387 - status:'',  
388 - type:'', 385 + status:'1',
  386 + type:'2',
389 userid:'', 387 userid:'',
390 creatdate:'', 388 creatdate:'',
391 updatedate:'', 389 updatedate:'',
@@ -454,21 +452,12 @@ @@ -454,21 +452,12 @@
454 validtime: [ 452 validtime: [
455 { required: true, message: '请输入', trigger: 'change' } 453 { required: true, message: '请输入', trigger: 'change' }
456 ], 454 ],
457 - userid: [  
458 - { required: true, message: '请输入', trigger: 'change' }  
459 - ],  
460 type: [ 455 type: [
461 { required: true, message: '请输入', trigger: 'change' } 456 { required: true, message: '请输入', trigger: 'change' }
462 ], 457 ],
463 status: [ 458 status: [
464 { required: true, message: '请输入', trigger: 'change' } 459 { required: true, message: '请输入', trigger: 'change' }
465 ], 460 ],
466 - creatdate: [  
467 - { required: true, message: '请输入', trigger: 'change' }  
468 - ],  
469 - updatedate: [  
470 - { required: true, message: '请输入', trigger: 'change' }  
471 - ],  
472 'schedule.options': [ 461 'schedule.options': [
473 { required: true, message: '请输入', trigger: 'change' } 462 { required: true, message: '请输入', trigger: 'change' }
474 ], 463 ],