diff --git a/src/views/airtransport/queryForConfigure.vue b/src/views/airtransport/queryForConfigure.vue
index 5a17985..99254ac 100644
--- a/src/views/airtransport/queryForConfigure.vue
+++ b/src/views/airtransport/queryForConfigure.vue
@@ -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="awcd" label-width="70px">
<el-input v-model="queryConfigure.awcd" 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,32 +36,19 @@
:data="tableData"
border
v-loading="tableloading" style="margin-bottom: 20px;margin-top: 20px">
- <el-table-column
+ <!--<el-table-column
prop="awcd"
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="aircraftNo"
label="航空注册器编号">
</el-table-column>
<el-table-column
- prop="transportflag"
- label="航空器备案类型"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="aircraftstand"
- label="停机位">
- </el-table-column>
- <el-table-column
prop="departurePort"
label="航班起始站">
</el-table-column>
@@ -70,16 +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="transportflag"
+ label="航空器备案类型"
+ show-overflow-tooltip>
+ </el-table-column>-->
+ <!--<el-table-column
+ prop="aircraftstand"
+ label="停机位">
+ </el-table-column>-->
+ <el-table-column
prop="departuredatetime"
label="预计出境时间">
</el-table-column>
<el-table-column
prop="arrivaldatetime"
label="预计入境时间">
- </el-table-column><el-table-column
+ </el-table-column>
+ <!--<el-table-column
prop="validtime"
label="配置生效到期日">
- </el-table-column>
+ </el-table-column>-->
<el-table-column
label="配置状态">
<template slot-scope="scope">
@@ -87,14 +95,8 @@
<span v-if="scope.row.status ==='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>
@@ -109,12 +111,12 @@
<el-table-column
prop="meno"
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"
@@ -174,9 +176,12 @@
<el-row>
<el-col :span="6">
<el-form-item label="航空器备案类型" prop="transportflag" label-width="140px">
- <el-input v-model="configure_addForm.transportflag"
- ></el-input>
+ <el-select v-model="configure_addForm.transportflag" 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">
<el-form-item label="停机位" prop="aircraftstand" label-width="120px">
@@ -201,8 +206,8 @@
v-model="configure_addForm.departuredatetime"
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>
@@ -213,8 +218,8 @@
v-model="configure_addForm.arrivaldatetime"
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>
@@ -225,18 +230,18 @@
v-model="configure_addForm.validtime"
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 :span="6">
+ <!--<el-col :span="6">
<el-form-item label="创建人" prop="userid" label-width="120px">
<el-input v-model="configure_addForm.userid"></el-input>
</el-form-item>
- </el-col>
+ </el-col>-->
<el-col :span="6">
<el-form-item label="配置类型" prop="type" label-width="120px">
@@ -256,7 +261,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!--<el-col :span="6">
<el-form-item label="创建时间" prop="creatdate" label-width="120px">
<el-date-picker
v-model="configure_addForm.creatdate"
@@ -281,9 +286,7 @@
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
+ </el-col>-->
<el-col :span="12">
<el-form-item label="星期日期" prop="schedule.options" label-width="120px">
<el-select v-model="configure_addForm.schedule.options" multiple placeholder="请选择(可多选)" style="width: 100%">
@@ -296,11 +299,6 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="备注" prop="meno" label-width="120px">
- <el-input v-model="configure_addForm.meno"></el-input>
- </el-form-item>
- </el-col>
</el-row>
</el-form>
@@ -377,15 +375,15 @@
flightNo:'',
customscode:'',
aircraftNo:'',
- transportflag:'',
+ transportflag:'1',
aircraftstand:'',
departurePort:'',
arrivalPort:'',
departuredatetime:'',
arrivaldatetime:'',
validtime:'',
- status:'',
- type:'',
+ status:'1',
+ type:'2',
userid:'',
creatdate:'',
updatedate:'',
@@ -454,21 +452,12 @@
validtime: [
{ required: true, message: '请输入', trigger: 'change' }
],
- userid: [
- { required: true, message: '请输入', trigger: 'change' }
- ],
type: [
{ required: true, message: '请输入', trigger: 'change' }
],
status: [
{ required: true, message: '请输入', trigger: 'change' }
],
- creatdate: [
- { required: true, message: '请输入', trigger: 'change' }
- ],
- updatedate: [
- { required: true, message: '请输入', trigger: 'change' }
- ],
'schedule.options': [
{ required: true, message: '请输入', trigger: 'change' }
],