作者 xudada

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

... ... @@ -11,19 +11,19 @@
<el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-row>
<el-col :span="5" style="margin-right: 70px">
<el-col :span="5">
<el-form-item label="承运人" prop="carrier" label-width="70px">
<el-input v-model="queryConfigure.carrier" style="width:120px"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" style="margin-right: 70px">
<el-col :span="5">
<el-form-item label="航班号" prop="flightno" label-width="70px">
<el-input v-model="queryConfigure.flightno" style="width:120px"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-button type="primary" icon="el-icon-search" @click="submitForm()">查询</el-button>
<el-button type="success" icon="el-icon-edit" @click="addForm()">新增</el-button>
<el-button type="primary" @click="submitForm()">查询</el-button>
<el-button type="success" @click="addForm()">新增</el-button>
</el-col>
</el-row>
... ... @@ -36,28 +36,19 @@
:data="tableData"
border
v-loading="tableloading" style="margin-bottom: 20px;margin-top: 20px">
<el-table-column
<!--<el-table-column
prop="carrier"
label="承运人">
</el-table-column>
</el-table-column>-->
<el-table-column
prop="flightno"
label="航班号">
</el-table-column>
<el-table-column
prop="customscode"
label="申报关区">
</el-table-column>
<el-table-column
prop="aircraftcode"
label="航空注册器编号">
</el-table-column>
<el-table-column
prop="aircrafttype"
label="航空器备案类型"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="originstation"
label="航班起始站">
</el-table-column>
... ... @@ -66,12 +57,37 @@
label="航班目的站">
</el-table-column>
<el-table-column
prop="customscode"
label="申报关区">
</el-table-column>
<el-table-column
label="配置类型">
<template slot-scope="scope">
<span v-if="scope.row.type ==='2'">入境</span>
<span v-if="scope.row.type ==='1'">出境</span>
</template>
</el-table-column>
<!--<el-table-column
prop="aircrafttype"
label="航空器备案类型"
show-overflow-tooltip>
</el-table-column>-->
<!--<el-table-column
prop="configstarttime"
label="配置生效时间">
</el-table-column>
<el-table-column
prop="configendtime"
label="配置生效生效到期日">
</el-table-column>-->
<el-table-column
prop="entrytime"
label="入境时间">
</el-table-column>
<el-table-column
prop="departuretime"
label="出境时间">
</el-table-column>
<el-table-column
label="配置状态">
... ... @@ -80,14 +96,8 @@
<span v-if="scope.row.configstatus ==='1'">生效</span>
</template>
</el-table-column>
<el-table-column
label="配置类型">
<template slot-scope="scope">
<span v-if="scope.row.type ==='2'">入境</span>
<span v-if="scope.row.type ==='1'">出境</span>
</template>
</el-table-column>
<el-table-column
<!--<el-table-column
prop="userid"
label="创建人">
</el-table-column>
... ... @@ -98,16 +108,9 @@
<el-table-column
prop="updatedate"
label="配置更新时间">
</el-table-column>
<el-table-column
prop="entrytime"
label="入境时间">
</el-table-column>
<el-table-column
prop="departuretime"
label="出境时间">
</el-table-column>
<el-table-column
</el-table-column>-->
<!--<el-table-column
prop="stayid"
label="停机位">
</el-table-column>
... ... @@ -122,12 +125,12 @@
<el-table-column
prop="remark"
label="配置规则备注">
</el-table-column>
</el-table-column>-->
<el-table-column
fixed="right"
prop=""
label="报文操作"
width="280">
label="信息操作"
width="180">
<template slot-scope="scope">
<el-button
size="mini"
... ... @@ -187,8 +190,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="航空器备案类型" prop="aircrafttype" label-width="140px">
<el-input v-model="configure_editForm.aircrafttype"
></el-input>
<el-select v-model="configure_editForm.aircrafttype" placeholder="请选择">
<el-option label="通用航空器" value="1"></el-option>
<el-option label="航线航空器" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
... ... @@ -203,27 +208,27 @@
maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!--<el-col :span="6">
<el-form-item label="配置生效时间" prop="configstarttime" label-width="130px">
<el-date-picker
v-model="configure_editForm.configstarttime"
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddhhmmss"
format="yyyyMMddhhmmss"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
style="width: 100%"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="6">
<el-form-item label="配置生效到期日" prop="configendtime" label-width="140px">
<el-date-picker
v-model="configure_editForm.configendtime"
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddhhmmss"
format="yyyyMMddhhmmss"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
style="width: 100%"
:picker-options="pickerOptions">
</el-date-picker>
... ... @@ -247,12 +252,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<!--<el-col :span="6">
<el-form-item label="创建人" prop="userid" label-width="130px">
<el-input v-model="configure_editForm.userid"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>-->
<!--<el-col :span="6">
<el-form-item label="创建时间" prop="creatdate" label-width="130px">
<el-date-picker
v-model="configure_editForm.creatdate"
... ... @@ -277,15 +282,15 @@
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="6">
<el-form-item label="入境时间" prop="entrytime" label-width="130px">
<el-date-picker
v-model="configure_editForm.entrytime"
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddhhmmss"
format="yyyyMMddhhmmss"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
style="width:100%">
</el-date-picker>
</el-form-item>
... ... @@ -296,8 +301,8 @@
v-model="configure_editForm.departuretime"
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddhhmmss"
format="yyyyMMddhhmmss"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
style="width:100%">
</el-date-picker>
</el-form-item>
... ... @@ -308,7 +313,7 @@
<el-input v-model="configure_editForm.stayid"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!--<el-col :span="6">
<el-form-item label="定时任务配置时间规则" prop="crontask" label-width="130px">
<el-input v-model="configure_editForm.crontask"></el-input>
</el-form-item>
... ... @@ -322,7 +327,7 @@
<el-form-item label="配置规则备注" prop="remark" label-width="130px">
<el-input v-model="configure_editForm.remark"></el-input>
</el-form-item>
</el-col>
</el-col>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="configure_dialog.addDialog = false" size="small">取 消</el-button>
... ... @@ -396,13 +401,13 @@
flightno: '',
customscode: '',
aircraftcode: '',
aircrafttype: '',
aircrafttype: '1',
originstation: '',
destinationstation: '',
configstarttime: '',
configendtime: '',
configstatus: '',
type: '',
configstatus: '1',
type: '2',
userid: '',
creatdate: '',
updatedate: '',
... ... @@ -421,9 +426,6 @@
flightno: [
{ required: true, message: '请输入', trigger: 'change' }
],
configstarttime: [
{ required: true, message: '请输入', trigger: 'change' }
],
configendtime: [
{ required: true, message: '请输入', trigger: 'change' }
],
... ... @@ -433,12 +435,6 @@
type: [
{ required: true, message: '请输入', trigger: 'change' }
],
creatdate: [
{ required: true, message: '请输入', trigger: 'change' }
],
updatedate: [
{ required: true, message: '请输入', trigger: 'change' }
],
entrytime: [
{ required: true, message: '请输入', trigger: 'change' }
],
... ... @@ -460,9 +456,6 @@
destinationstation: [
{ required: true, message: '请输入', trigger: 'change' }
],
userid: [
{ required: true, message: '请输入', trigger: 'change' }
],
stayid: [
{ required: true, message: '请输入', trigger: 'change' }
],
... ...