朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 4bd59e5e70815fa435cd2d3ba2f26362d57ee2be 1 个父辈 c463d532

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

内嵌 并排对比
正在显示 1 个修改的文件 包含 62 行增加 和 69 行删除
@@ -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="carrier" label-width="70px"> 15 <el-form-item label="承运人" prop="carrier" label-width="70px">
16 <el-input v-model="queryConfigure.carrier" style="width:120px"></el-input> 16 <el-input v-model="queryConfigure.carrier" 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,28 +36,19 @@ @@ -36,28 +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="carrier" 40 prop="carrier"
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="aircraftcode" 48 prop="aircraftcode"
53 label="航空注册器编号"> 49 label="航空注册器编号">
54 </el-table-column> 50 </el-table-column>
55 <el-table-column 51 <el-table-column
56 - prop="aircrafttype"  
57 - label="航空器备案类型"  
58 - show-overflow-tooltip>  
59 - </el-table-column>  
60 - <el-table-column  
61 prop="originstation" 52 prop="originstation"
62 label="航班起始站"> 53 label="航班起始站">
63 </el-table-column> 54 </el-table-column>
@@ -66,12 +57,37 @@ @@ -66,12 +57,37 @@
66 label="航班目的站"> 57 label="航班目的站">
67 </el-table-column> 58 </el-table-column>
68 <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="aircrafttype"
  72 + label="航空器备案类型"
  73 + show-overflow-tooltip>
  74 + </el-table-column>-->
  75 +
  76 + <!--<el-table-column
69 prop="configstarttime" 77 prop="configstarttime"
70 label="配置生效时间"> 78 label="配置生效时间">
71 </el-table-column> 79 </el-table-column>
72 <el-table-column 80 <el-table-column
73 prop="configendtime" 81 prop="configendtime"
74 label="配置生效生效到期日"> 82 label="配置生效生效到期日">
  83 + </el-table-column>-->
  84 + <el-table-column
  85 + prop="entrytime"
  86 + label="入境时间">
  87 + </el-table-column>
  88 + <el-table-column
  89 + prop="departuretime"
  90 + label="出境时间">
75 </el-table-column> 91 </el-table-column>
76 <el-table-column 92 <el-table-column
77 label="配置状态"> 93 label="配置状态">
@@ -80,14 +96,8 @@ @@ -80,14 +96,8 @@
80 <span v-if="scope.row.configstatus ==='1'">生效</span> 96 <span v-if="scope.row.configstatus ==='1'">生效</span>
81 </template> 97 </template>
82 </el-table-column> 98 </el-table-column>
83 - <el-table-column  
84 - label="配置类型">  
85 - <template slot-scope="scope">  
86 - <span v-if="scope.row.type ==='2'">入境</span>  
87 - <span v-if="scope.row.type ==='1'">出境</span>  
88 - </template>  
89 - </el-table-column>  
90 - <el-table-column 99 +
  100 + <!--<el-table-column
91 prop="userid" 101 prop="userid"
92 label="创建人"> 102 label="创建人">
93 </el-table-column> 103 </el-table-column>
@@ -98,16 +108,9 @@ @@ -98,16 +108,9 @@
98 <el-table-column 108 <el-table-column
99 prop="updatedate" 109 prop="updatedate"
100 label="配置更新时间"> 110 label="配置更新时间">
101 - </el-table-column>  
102 - <el-table-column  
103 - prop="entrytime"  
104 - label="入境时间">  
105 - </el-table-column>  
106 - <el-table-column  
107 - prop="departuretime"  
108 - label="出境时间">  
109 - </el-table-column>  
110 - <el-table-column 111 + </el-table-column>-->
  112 +
  113 + <!--<el-table-column
111 prop="stayid" 114 prop="stayid"
112 label="停机位"> 115 label="停机位">
113 </el-table-column> 116 </el-table-column>
@@ -122,12 +125,12 @@ @@ -122,12 +125,12 @@
122 <el-table-column 125 <el-table-column
123 prop="remark" 126 prop="remark"
124 label="配置规则备注"> 127 label="配置规则备注">
125 - </el-table-column> 128 + </el-table-column>-->
126 <el-table-column 129 <el-table-column
127 fixed="right" 130 fixed="right"
128 prop="" 131 prop=""
129 - label="报文操作"  
130 - width="280"> 132 + label="信息操作"
  133 + width="180">
131 <template slot-scope="scope"> 134 <template slot-scope="scope">
132 <el-button 135 <el-button
133 size="mini" 136 size="mini"
@@ -187,8 +190,10 @@ @@ -187,8 +190,10 @@
187 <el-row> 190 <el-row>
188 <el-col :span="6"> 191 <el-col :span="6">
189 <el-form-item label="航空器备案类型" prop="aircrafttype" label-width="140px"> 192 <el-form-item label="航空器备案类型" prop="aircrafttype" label-width="140px">
190 - <el-input v-model="configure_editForm.aircrafttype"  
191 - ></el-input> 193 + <el-select v-model="configure_editForm.aircrafttype" placeholder="请选择">
  194 + <el-option label="通用航空器" value="1"></el-option>
  195 + <el-option label="航线航空器" value="2"></el-option>
  196 + </el-select>
192 </el-form-item> 197 </el-form-item>
193 </el-col> 198 </el-col>
194 <el-col :span="6"> 199 <el-col :span="6">
@@ -203,27 +208,27 @@ @@ -203,27 +208,27 @@
203 maxLength='3'></el-input> 208 maxLength='3'></el-input>
204 </el-form-item> 209 </el-form-item>
205 </el-col> 210 </el-col>
206 - <el-col :span="6"> 211 + <!--<el-col :span="6">
207 <el-form-item label="配置生效时间" prop="configstarttime" label-width="130px"> 212 <el-form-item label="配置生效时间" prop="configstarttime" label-width="130px">
208 <el-date-picker 213 <el-date-picker
209 v-model="configure_editForm.configstarttime" 214 v-model="configure_editForm.configstarttime"
210 type="datetime" 215 type="datetime"
211 placeholder="选择日期时间" 216 placeholder="选择日期时间"
212 - value-format="yyyyMMddhhmmss"  
213 - format="yyyyMMddhhmmss" 217 + value-format="yyyy-MM-dd HH:mm:ss"
  218 + format="yyyy-MM-dd HH:mm:ss"
214 style="width: 100%" 219 style="width: 100%"
215 :picker-options="pickerOptions"> 220 :picker-options="pickerOptions">
216 </el-date-picker> 221 </el-date-picker>
217 </el-form-item> 222 </el-form-item>
218 - </el-col> 223 + </el-col>-->
219 <el-col :span="6"> 224 <el-col :span="6">
220 <el-form-item label="配置生效到期日" prop="configendtime" label-width="140px"> 225 <el-form-item label="配置生效到期日" prop="configendtime" label-width="140px">
221 <el-date-picker 226 <el-date-picker
222 v-model="configure_editForm.configendtime" 227 v-model="configure_editForm.configendtime"
223 type="datetime" 228 type="datetime"
224 placeholder="选择日期时间" 229 placeholder="选择日期时间"
225 - value-format="yyyyMMddhhmmss"  
226 - format="yyyyMMddhhmmss" 230 + value-format="yyyy-MM-dd HH:mm:ss"
  231 + format="yyyy-MM-dd HH:mm:ss"
227 style="width: 100%" 232 style="width: 100%"
228 :picker-options="pickerOptions"> 233 :picker-options="pickerOptions">
229 </el-date-picker> 234 </el-date-picker>
@@ -247,12 +252,12 @@ @@ -247,12 +252,12 @@
247 </el-select> 252 </el-select>
248 </el-form-item> 253 </el-form-item>
249 </el-col> 254 </el-col>
250 - <el-col :span="6"> 255 + <!--<el-col :span="6">
251 <el-form-item label="创建人" prop="userid" label-width="130px"> 256 <el-form-item label="创建人" prop="userid" label-width="130px">
252 <el-input v-model="configure_editForm.userid"></el-input> 257 <el-input v-model="configure_editForm.userid"></el-input>
253 </el-form-item> 258 </el-form-item>
254 - </el-col>  
255 - <el-col :span="6"> 259 + </el-col>-->
  260 + <!--<el-col :span="6">
256 <el-form-item label="创建时间" prop="creatdate" label-width="130px"> 261 <el-form-item label="创建时间" prop="creatdate" label-width="130px">
257 <el-date-picker 262 <el-date-picker
258 v-model="configure_editForm.creatdate" 263 v-model="configure_editForm.creatdate"
@@ -277,15 +282,15 @@ @@ -277,15 +282,15 @@
277 :picker-options="pickerOptions"> 282 :picker-options="pickerOptions">
278 </el-date-picker> 283 </el-date-picker>
279 </el-form-item> 284 </el-form-item>
280 - </el-col> 285 + </el-col>-->
281 <el-col :span="6"> 286 <el-col :span="6">
282 <el-form-item label="入境时间" prop="entrytime" label-width="130px"> 287 <el-form-item label="入境时间" prop="entrytime" label-width="130px">
283 <el-date-picker 288 <el-date-picker
284 v-model="configure_editForm.entrytime" 289 v-model="configure_editForm.entrytime"
285 type="datetime" 290 type="datetime"
286 placeholder="选择日期时间" 291 placeholder="选择日期时间"
287 - value-format="yyyyMMddhhmmss"  
288 - format="yyyyMMddhhmmss" 292 + value-format="yyyy-MM-dd HH:mm:ss"
  293 + format="yyyy-MM-dd HH:mm:ss"
289 style="width:100%"> 294 style="width:100%">
290 </el-date-picker> 295 </el-date-picker>
291 </el-form-item> 296 </el-form-item>
@@ -296,8 +301,8 @@ @@ -296,8 +301,8 @@
296 v-model="configure_editForm.departuretime" 301 v-model="configure_editForm.departuretime"
297 type="datetime" 302 type="datetime"
298 placeholder="选择日期时间" 303 placeholder="选择日期时间"
299 - value-format="yyyyMMddhhmmss"  
300 - format="yyyyMMddhhmmss" 304 + value-format="yyyy-MM-dd HH:mm:ss"
  305 + format="yyyy-MM-dd HH:mm:ss"
301 style="width:100%"> 306 style="width:100%">
302 </el-date-picker> 307 </el-date-picker>
303 </el-form-item> 308 </el-form-item>
@@ -308,7 +313,7 @@ @@ -308,7 +313,7 @@
308 <el-input v-model="configure_editForm.stayid"></el-input> 313 <el-input v-model="configure_editForm.stayid"></el-input>
309 </el-form-item> 314 </el-form-item>
310 </el-col> 315 </el-col>
311 - <el-col :span="6"> 316 + <!--<el-col :span="6">
312 <el-form-item label="定时任务配置时间规则" prop="crontask" label-width="130px"> 317 <el-form-item label="定时任务配置时间规则" prop="crontask" label-width="130px">
313 <el-input v-model="configure_editForm.crontask"></el-input> 318 <el-input v-model="configure_editForm.crontask"></el-input>
314 </el-form-item> 319 </el-form-item>
@@ -322,7 +327,7 @@ @@ -322,7 +327,7 @@
322 <el-form-item label="配置规则备注" prop="remark" label-width="130px"> 327 <el-form-item label="配置规则备注" prop="remark" label-width="130px">
323 <el-input v-model="configure_editForm.remark"></el-input> 328 <el-input v-model="configure_editForm.remark"></el-input>
324 </el-form-item> 329 </el-form-item>
325 - </el-col> 330 + </el-col>-->
326 </el-form> 331 </el-form>
327 <div slot="footer" class="dialog-footer"> 332 <div slot="footer" class="dialog-footer">
328 <el-button @click="configure_dialog.addDialog = false" size="small">取 消</el-button> 333 <el-button @click="configure_dialog.addDialog = false" size="small">取 消</el-button>
@@ -396,13 +401,13 @@ @@ -396,13 +401,13 @@
396 flightno: '', 401 flightno: '',
397 customscode: '', 402 customscode: '',
398 aircraftcode: '', 403 aircraftcode: '',
399 - aircrafttype: '', 404 + aircrafttype: '1',
400 originstation: '', 405 originstation: '',
401 destinationstation: '', 406 destinationstation: '',
402 configstarttime: '', 407 configstarttime: '',
403 configendtime: '', 408 configendtime: '',
404 - configstatus: '',  
405 - type: '', 409 + configstatus: '1',
  410 + type: '2',
406 userid: '', 411 userid: '',
407 creatdate: '', 412 creatdate: '',
408 updatedate: '', 413 updatedate: '',
@@ -421,9 +426,6 @@ @@ -421,9 +426,6 @@
421 flightno: [ 426 flightno: [
422 { required: true, message: '请输入', trigger: 'change' } 427 { required: true, message: '请输入', trigger: 'change' }
423 ], 428 ],
424 - configstarttime: [  
425 - { required: true, message: '请输入', trigger: 'change' }  
426 - ],  
427 configendtime: [ 429 configendtime: [
428 { required: true, message: '请输入', trigger: 'change' } 430 { required: true, message: '请输入', trigger: 'change' }
429 ], 431 ],
@@ -433,12 +435,6 @@ @@ -433,12 +435,6 @@
433 type: [ 435 type: [
434 { required: true, message: '请输入', trigger: 'change' } 436 { required: true, message: '请输入', trigger: 'change' }
435 ], 437 ],
436 - creatdate: [  
437 - { required: true, message: '请输入', trigger: 'change' }  
438 - ],  
439 - updatedate: [  
440 - { required: true, message: '请输入', trigger: 'change' }  
441 - ],  
442 entrytime: [ 438 entrytime: [
443 { required: true, message: '请输入', trigger: 'change' } 439 { required: true, message: '请输入', trigger: 'change' }
444 ], 440 ],
@@ -460,9 +456,6 @@ @@ -460,9 +456,6 @@
460 destinationstation: [ 456 destinationstation: [
461 { required: true, message: '请输入', trigger: 'change' } 457 { required: true, message: '请输入', trigger: 'change' }
462 ], 458 ],
463 - userid: [  
464 - { required: true, message: '请输入', trigger: 'change' }  
465 - ],  
466 stayid: [ 459 stayid: [
467 { required: true, message: '请输入', trigger: 'change' } 460 { required: true, message: '请输入', trigger: 'change' }
468 ], 461 ],