diff --git a/src/common/init/sys_init.js b/src/common/init/sys_init.js
index 6971d53..cb2ca85 100644
--- a/src/common/init/sys_init.js
+++ b/src/common/init/sys_init.js
@@ -87,20 +87,20 @@ var axois_init = {
init_router: (router,axios) => {
router.beforeEach((to, from, next) => {
// NProgress.start();
- // if (to.path == '/login') {
- // sessionStorage.removeItem('user');
- // sessionStorage.removeItem('menu');
- // sessionStorage.removeItem('token');
- // }else{
- // let user = JSON.parse(sessionStorage.getItem('user'));
- // if(sessionStorage.getItem('token')){
- // axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
- // }
- //
- // if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
- // next({ path: '/login' })
- // }
- // }
+ if (to.path == '/login') {
+ sessionStorage.removeItem('user');
+ sessionStorage.removeItem('menu');
+ sessionStorage.removeItem('token');
+ }else{
+ let user = JSON.parse(sessionStorage.getItem('user'));
+ if(sessionStorage.getItem('token')){
+ axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
+ }
+
+ if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
+ next({ path: '/login' })
+ }
+ }
next()
});
}
diff --git a/src/main.js b/src/main.js
index eba9831..054d07f 100755
--- a/src/main.js
+++ b/src/main.js
@@ -33,7 +33,11 @@ Vue.prototype.socketApi = socketApi
Vue.config.productionTip = false
Mock.bootstrap();
-Vue.use(ElementUI)
+Vue.use(ElementUI,
+ {
+ // eslint-disable-next-line no-undef
+ size: 'mini'
+ })
Vue.use(VueRouter)
Vue.use(Vuex)
Vue.prototype.$axios = axios;
diff --git a/src/views/airtransport/aircraft.vue b/src/views/airtransport/aircraft.vue
index b354ec1..5382228 100644
--- a/src/views/airtransport/aircraft.vue
+++ b/src/views/airtransport/aircraft.vue
@@ -3,13 +3,18 @@
<el-main>
<el-row class="row-bg">
<el-col :span="24">
- <div class="grid-content content">通用航空器注册</div>
+ <div class="grid-content content">航空器备案申报</div>
</el-col>
</el-row>
<el-row>
<el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm">
<el-col :span="6">
- <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px">
+ <el-form-item label="海关关区" prop="airwayCode" label-width="130px">
+ <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="代理企业海关编码" prop="airwayCode" label-width="130px">
<el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
</el-form-item>
</el-col>
@@ -23,31 +28,44 @@
<el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12"></el-col>
<el-col :span="6">
<el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
<el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="航空器国籍" prop="areoNationality" label-width="130px">
+ <el-form-item label="航空器国籍/地区" prop="areoNationality" label-width="130px">
<el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input>
</el-form-item>
</el-col>
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="航空器类型" prop="areoNationality" label-width="140px">-->
+<!-- <el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
<el-col :span="6">
- <el-form-item label="证书类型" prop="credentialType" label-width="130px">
- <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input>
+ <el-form-item label="机型" prop="areoModel" label-width="140px">
+ <el-input v-model="aircraft.areoModel" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="证书编号" prop="credentialNo" label-width="130px">
- <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input>
+ <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
+ <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
-
<el-col :span="6">
- <el-form-item label="机型" prop="areoModel" label-width="130px">
- <el-input v-model="aircraft.areoModel" placeholder="请输入"></el-input>
+ <el-form-item label="航空器所有人" prop="ownerCo" label-width="130px">
+ <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="所有人证件类型" prop="credentialType" label-width="140px">
+ <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="所有人证件号码" prop="credentialNo" label-width="140px">
+ <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -55,21 +73,30 @@
<el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
- <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+ <el-col :span="24">
+ <el-form-item label="备注" prop="meno" label-width="130px">
+ <el-input v-model="aircraft.meno" placeholder="请输入" ></el-input>
</el-form-item>
</el-col>
+<!-- <el-col :sapn="6">-->
+<!-- <el-form-item label="备注" prop="meno" label-width="130px">-->
+<!-- <el-input v-model="aircraft.meno" placeholder="请输入"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+
+
+
<el-col :span="6">
- <el-form-item label="航空器所有方式" prop="useRelation" label-width="130px">
- <el-input v-model="aircraft.useRelation" placeholder="请输入"></el-input>
+ <el-form-item label="航空公司代码" prop="airwayCode" label-width="140px">
+ <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="航空器所有人代码" prop="ownerCo" label-width="140px">
- <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+ <el-form-item label="航空器所有方式" prop="useRelation" label-width="130px">
+ <el-input v-model="aircraft.useRelation" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
+
<el-col :span="6">
<el-form-item label="国际证书编号" prop="certNo" label-width="130px">
<el-input v-model="aircraft.certNo" placeholder="请输入"></el-input>
@@ -87,11 +114,7 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :sapn="24">
- <el-form-item label="备注" prop="meno" label-width="130px">
- <el-input type="textarea" v-model="aircraft.meno" :rows="4" placeholder="请输入"></el-input>
- </el-form-item>
- </el-col>
+
</el-form>
</el-row>
<el-row style="margin-left: 130px">
@@ -166,15 +189,15 @@
messageid:undefined
},
rules:{
- airwayCode: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // airwayCode: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
airwayNameEn: [
{required: true, message: '请输入', trigger: 'blur'}
],
- airwayNameCn: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // airwayNameCn: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
areoNationality: [
{required: true, message: '请输入', trigger: 'blur'}
],
@@ -196,18 +219,18 @@
passengerLimit: [
{required: true, message: '请输入', trigger: 'blur'}
],
- useRelation: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // useRelation: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
ownerCo: [
{required: true, message: '请输入', trigger: 'blur'}
],
- certNo: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
- deliverDate: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // certNo: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
+ // deliverDate: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
},
centerDialogVisible:false,
msg:undefined
@@ -240,6 +263,7 @@
if (valid) {
sendAircraft(this.aircraft).then(res=>{
let response=res.data;
+ console.log(response);
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
diff --git a/src/views/airtransport/arrival.vue b/src/views/airtransport/arrival.vue
index 53afa74..13072cd 100644
--- a/src/views/airtransport/arrival.vue
+++ b/src/views/airtransport/arrival.vue
@@ -8,65 +8,87 @@
</el-row>
<el-row>
<el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm">
- <el-col :span="8">
- <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
- <el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="航班号" prop="flightNo" label-width="120px">
- <el-input v-model="arrival.flightNo" @input="e => arrival.flightNo=inputMe(e)"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="航班日期" prop="flightDate" label-width="120px">
- <el-date-picker
- v-model="arrival.flightDate"
- type="date"
- placeholder="选择日期时间"
- value-format="yyyyMMdd"
- format="yyyyMMdd"
- style="width:275px"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="出发港" prop="departurePort" label-width="120px">
- <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)" maxLength='3'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
- <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)" maxLength='3'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
- <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
- <el-date-picker
- v-model="arrival.departuredatetime"
- type="datetime"
- placeholder="选择日期时间"
- value-format="yyyyMMddHHmmss"
- format="yyyyMMddHHmmss"
- style="width:110%">
- </el-date-picker>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">航空器信息</div>
</el-col>
- <el-col :span="6">
- <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
- <el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')"
- ></el-input>
- </el-form-item>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
+ <el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="海关关区" prop="customDistrictNo" label-width="120px">
+ <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-col :span="24">
+ <div class="grid-content content">航空器动态信息</div>
</el-col>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="航班号" prop="flightNo" label-width="130px">
+ <el-input v-model="arrival.flightNo" @input="e => arrival.flightNo=inputMe(e)"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="航班日期" prop="flightDate" label-width="120px">
+ <el-date-picker
+ v-model="arrival.flightDate"
+ type="date"
+ placeholder="选择日期时间"
+ value-format="yyyyMMdd"
+ format="yyyyMMdd"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="停机位" prop="stayid" label-width="140px">
+ <el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="出发港" prop="departurePort" label-width="120px">
+ <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)" maxLength='3'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="目的港" prop="arrivalPort" label-width="130px">
+ <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)" maxLength='3'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
+ <el-date-picker
+ v-model="arrival.departuredatetime"
+ type="datetime"
+ placeholder="选择日期时间"
+ value-format="yyyyMMddHHmmss"
+ format="yyyyMMddHHmmss"
+ style="width:100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
+ <el-date-picker
+ v-model="arrival.arrivaldatetime"
+ type="datetime"
+ placeholder="选择日期时间"
+ value-format="yyyyMMddHHmmss"
+ format="yyyyMMddHHmmss"
+ style="width:100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-col :span="6">
- <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px">
+ <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="130px">
<el-date-picker
v-model="arrival.dischargecompleteddatetime"
type="datetime"
@@ -77,20 +99,11 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
- <el-date-picker
- v-model="arrival.arrivaldatetime"
- type="datetime"
- placeholder="选择日期时间"
- value-format="yyyyMMddHHmmss"
- format="yyyyMMddHHmmss"
- style="width:115%">
- </el-date-picker>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">备注信息</div>
</el-col>
<el-col :span="24">
- <el-form-item label="备注" prop="meno" label-width="120px">
+ <el-form-item label="备注" prop="meno" label-width="130px">
<el-input v-model="arrival.meno"></el-input>
</el-form-item>
</el-col>
@@ -208,9 +221,9 @@
stayid: [
{required: true, message: '请输入', trigger: 'blur'},
],
- dischargecompleteddatetime: [
- {required: true, message: '请选择', trigger: 'blur'}
- ],
+ // dischargecompleteddatetime: [
+ // {required: true, message: '请选择', trigger: 'blur'}
+ // ],
arrivaldatetime: [
{required: true, message: '请选择', trigger: 'blur'}
],
diff --git a/src/views/airtransport/bill.vue b/src/views/airtransport/bill.vue
index 169d379..8b74a48 100644
--- a/src/views/airtransport/bill.vue
+++ b/src/views/airtransport/bill.vue
@@ -550,9 +550,9 @@ background-color: white;
name: [
{required: true, message: '请输入', trigger: 'blur'}
],
- gender: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // gender: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
certType: [
{required: true, message: '请输入', trigger: 'blur'}
],
@@ -631,7 +631,7 @@ background-color: white;
}
});
},
- btDeleStatusFormater:(status) => {
+ btDeleStatusFormater:(stastatustus) => {
if(status=='1'){
return true;
}else{
diff --git a/src/views/airtransport/confirmatory.vue b/src/views/airtransport/confirmatory.vue
index 7cf4f31..ace1fc2 100644
--- a/src/views/airtransport/confirmatory.vue
+++ b/src/views/airtransport/confirmatory.vue
@@ -8,54 +8,68 @@
</el-row>
<el-row>
<el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm">
- <el-col :span="8">
- <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
- <el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">航空器信息</div>
</el-col>
- <el-col :span="8">
- <el-form-item label="进港航班号" prop="flightNo" label-width="120px">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
+ <el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+ <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-col :span="24">
+ <div class="grid-content content">航空器动态信息</div>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="进港航班号" prop="flightNo" label-width="130px">
<el-input v-model="confirmatory.flightNo" @input="e => confirmatory.flightNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="航班日期" prop="flightDate" label-width="120px">
<el-date-picker
v-model="confirmatory.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
- style="width:275px"
+ style="width:100%"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
- <el-date-picker
- v-model="confirmatory.departuredatetime"
- type="datetime"
- placeholder="选择日期时间"
- value-format="yyyyMMddHHmmss"
- format="yyyyMMddHHmmss"
- style="width:100%">
- </el-date-picker>
+ <el-col :span="6">
+ <el-form-item label="停机位" prop="stayid" label-width="120px">
+ <el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')"
+ ></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="目的港" prop="arrivalPort" label-width="120px">
<el-input v-model="confirmatory.arrivalPort" @input="e => confirmatory.arrivalPort=inputMe(e)"
maxLength='3'></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
- <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">-->
+<!-- <el-date-picker-->
+<!-- v-model="confirmatory.departuredatetime"-->
+<!-- type="datetime"-->
+<!-- placeholder="选择日期时间"-->
+<!-- value-format="yyyyMMddHHmmss"-->
+<!-- format="yyyyMMddHHmmss"-->
+<!-- style="width:100%">-->
+<!-- </el-date-picker>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+ <el-col :span="6">
+ <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="130px">
<el-date-picker
v-model="confirmatory.arrivaldatetime"
type="datetime"
@@ -66,14 +80,11 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
- <el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')"
- ></el-input>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">备注信息</div>
</el-col>
<el-col :span="24">
- <el-form-item label="备注" prop="meno" label-width="120px">
+ <el-form-item label="备注" prop="meno" label-width="130px">
<el-input v-model="confirmatory.meno"></el-input>
</el-form-item>
</el-col>
diff --git a/src/views/airtransport/declare.vue b/src/views/airtransport/declare.vue
index ea703ff..ecec068 100644
--- a/src/views/airtransport/declare.vue
+++ b/src/views/airtransport/declare.vue
@@ -8,29 +8,47 @@
</el-row>
<el-row>
<el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm">
- <el-col :span="8">
+ <el-col :span="24">
+ <div class="grid-content content">航空器信息</div>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
<el-input v-model.trim="declare.aircraftNo" @input="e => declare.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
+ <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+ <el-input v-model="declare.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <div class="grid-content content">航空器动态信息</div>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="出港航班号" prop="flightNo" label-width="120px">
<el-input v-model="declare.flightNo" @input="e => declare.flightNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="航班日期" prop="flightDate" label-width="120px">
<el-date-picker
v-model="declare.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
- style="width:275px"
+ style="width:100%"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
+ <el-form-item label="出发港" prop="departurePort" label-width="120px">
+ <el-input v-model="declare.departurePort" @input="e => declare.departurePort=inputMe(e)"
+ maxLength='3'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
<!-- <el-input v-model="declare.departuredatetime"-->
<!-- type="date"-->
@@ -48,17 +66,8 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="出发港" prop="departurePort" label-width="120px">
- <el-input v-model="declare.departurePort" @input="e => declare.departurePort=inputMe(e)"
- maxLength='3'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
- <el-input v-model="declare.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">备注信息</div>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="meno" label-width="120px">
diff --git a/src/views/airtransport/departure.vue b/src/views/airtransport/departure.vue
index b64efea..3091751 100644
--- a/src/views/airtransport/departure.vue
+++ b/src/views/airtransport/departure.vue
@@ -8,45 +8,57 @@
</el-row>
<el-row>
<el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm">
- <el-col :span="8">
- <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
+ <el-col :span="24">
+ <div class="grid-content content">航空器信息</div>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
<el-input v-model.trim="departure.aircraftNo" @input="e => departure.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="航班号" prop="flightNo" label-width="120px">
+ <el-col :span="6">
+ <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
+ <el-input v-model="departure.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <div class="grid-content content">航空器动态信息</div>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="航班号" prop="flightNo" label-width="130px">
<el-input v-model="departure.flightNo" @input="e => departure.flightNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="航班日期" prop="flightDate" label-width="120px">
<el-date-picker
v-model="departure.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
- style="width:275px"
+ style="width:100%"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="6">
+ <el-form-item label="停机位" prop="stayid" label-width="120px">
+ <el-input v-model="departure.stayid" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="出发港" prop="departurePort" label-width="120px">
<el-input v-model="departure.departurePort" @input="e => departure.departurePort=inputMe(e)" maxLength='3'></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
+ <el-col :span="6">
+ <el-form-item label="目的港" prop="arrivalPort" label-width="130px">
<el-input v-model="departure.arrivalPort" @input="e => departure.arrivalPort=inputMe(e)" maxLength='3'></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
- <el-input v-model="departure.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="8">
+
+ <el-col :span="6">
<el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
<!-- <el-input v-model="departure.departuredatetime"-->
<!-- type="datetime"-->
@@ -65,13 +77,11 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="停靠机坪" prop="stayid" label-width="120px">
- <el-input v-model="departure.stayid" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">备注信息</div>
</el-col>
<el-col :span="24">
- <el-form-item label="备注" prop="meno" label-width="120px">
+ <el-form-item label="备注" prop="meno" label-width="130px">
<el-input v-model="departure.meno"></el-input>
</el-form-item>
</el-col>
diff --git a/src/views/airtransport/flight.vue b/src/views/airtransport/flight.vue
index 5c6ddf4..a21c1a0 100644
--- a/src/views/airtransport/flight.vue
+++ b/src/views/airtransport/flight.vue
@@ -8,59 +8,70 @@
</el-row>
<el-row>
<el-form :model="flight" :rules="rules" ref="flight" label-width="130px" class="demo-ruleForm">
+ <el-col :span="24">
+ <div class="grid-content content">申报单位</div>
+ </el-col>
<el-col :span="6">
- <el-form-item label="航班号" prop="flightNo" label-width="120px">
+ <el-form-item label="海关关区" prop="flightNo" label-width="140px">
<el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input>
</el-form-item>
- </el-col>
+ </el-col><el-col :span="24">
+ <div class="grid-content content">航班信息</div>
+ </el-col>
<el-col :span="6">
- <el-form-item label="航空公司代码" prop="airwayCode" label-width="120px">
+ <el-form-item label="运营企业海关编码" prop="airwayCode" label-width="140px">
<el-input v-model="flight.airwayCode" @input="e => flight.airwayCode=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="140px">
- <el-input v-model="flight.airwayNameCn"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px">
- <el-input v-model="flight.airwayNameEn"></el-input>
+ <el-form-item label="航班号" prop="flightNo" label-width="120px">
+ <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
-
<el-col :span="6">
- <el-form-item label="传输代理人" prop="transportAgentCode" label-width="120px">
+ <el-form-item label="航空器传输代理人代码" prop="transportAgentCode" label-width="170px">
<el-input v-model="flight.transportAgentCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="地面代理人" prop="groundAgentCode" label-width="120px">
+ <el-form-item label="航空器地面代理人代码" prop="groundAgentCode" label-width="170px">
<el-input v-model="flight.groundAgentCode"></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="航班性质" prop="flightType" label-width="130px">
- <el-select v-model="flight.flightType" placeholder="" style="display:inline">
- <el-option v-for="item in flightTypes" :key="item.value" :label="item.label"
- :value="item.value"></el-option>
- </el-select>
+ <el-col :span="12">
+ <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px">
+ <el-input v-model="flight.airwayNameEn"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="170px">
+ <el-input v-model="flight.airwayNameCn"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="运输标识" prop="linesType" label-width="130px">
+ <el-form-item label="执行任务类型" prop="linesType" label-width="140px">
<el-select v-model="flight.linesType" placeholder="" style="display:inline">
<el-option v-for="item in linesTypes" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
- <el-form-item label="共享航班号" prop="shareFlightNo" label-width="120px">
+ <el-form-item label="航班性质" prop="flightType" label-width="130px">
+ <el-select v-model="flight.flightType" placeholder="" style="display:inline">
+ <el-option v-for="item in flightTypes" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="共享航班号" prop="shareFlightNo" label-width="170px">
<el-input v-model="flight.shareFlightNo" @input="e => flight.shareFlightNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
+ <el-col :span="24">
+ <div class="grid-content content">备注信息</div>
+ </el-col>
<el-col :span="18">
<el-form-item label="备注" prop="remark" label-width="120px">
<el-input v-model="flight.remark"></el-input>
@@ -69,37 +80,19 @@
<el-col :span="24" style="margin-bottom: 20px">
<div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="selectAirline()" style="margin-left:50px">航线信息查询</el-button></div>
</el-col>
-
<el-col :span="6">
- <el-form-item label="出发港" prop="departurePort" label-width="120px">
+ <el-form-item label="出发港" prop="departurePort" label-width="140px">
<el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)"
maxLength='3' ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px">
- <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
+ <el-form-item label="目的港" prop="arrivalPort" label-width="130px">
<el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)"
maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px">
- <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="每周执行情况" prop="plan" label-width="120px">
- <el-input v-model="flight.plan"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
<el-form-item label="长期离港时间" prop="std" label-width="120px">
<el-time-picker
v-model="flight.std"
@@ -125,10 +118,8 @@
</el-time-picker>
</el-form-item>
</el-col>
- <el-col :span="12"></el-col>
-
<el-col :span="6">
- <el-form-item label="有效期起始时间" prop="effStartdate" label-width="120px">
+ <el-form-item label="有效期起始时间" prop="effStartdate" label-width="140px">
<el-date-picker
v-model="flight.effStartdate"
type="date"
@@ -140,7 +131,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="有效期结束时间" prop="effEnddate" label-width="120px">
+ <el-form-item label="有效期结束时间" prop="effEnddate" label-width="130px">
<el-date-picker
v-model="flight.effEnddate"
type="date"
@@ -151,6 +142,26 @@
</el-date-picker>
</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="每周执行情况" prop="plan" label-width="140px">
+ <el-input v-model="flight.plan"></el-input>
+ </el-form-item>
+ </el-col>
+
+
+
+ <el-col :span="6">
+ <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="140px">
+ <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="130px">
+ <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="备注" prop="remark" label-width="120px">
<el-input v-model="flight.remark"></el-input>
@@ -323,9 +334,9 @@
airwayNameEn: [
{required: true, message: '请输入', trigger: 'blur'}
],
- airwayNameCn: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // airwayNameCn: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
transportAgentCode: [
{required: true, message: '请输入', trigger: 'blur'}
],
@@ -345,15 +356,15 @@
//{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'},
{required: true, message: '请输入(三字码)', trigger: 'blur'},
],
- departureCustomNo: [
- {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
- ],
+ // departureCustomNo: [
+ // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+ // ],
arrivalPort: [
{required: true, message: '请输入(三字码)', trigger: 'blur'},
],
- arrivalCustomNo: [
- {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
- ],
+ // arrivalCustomNo: [
+ // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+ // ],
plan: [
{required: true, message: '请输入', trigger: 'blur'},
],
diff --git a/src/views/airtransport/flightplan.vue b/src/views/airtransport/flightplan.vue
index 0b37a80..c753684 100644
--- a/src/views/airtransport/flightplan.vue
+++ b/src/views/airtransport/flightplan.vue
@@ -8,84 +8,104 @@
</el-row>
<el-row>
<el-form :model="flight" :rules="rules" ref="flight" label-width="100px" class="demo-ruleForm">
- <el-col :span="12">
- <el-form-item label="航班号" prop="flightNo" label-width="120px">
- <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input>
- </el-form-item>
+ <el-col :span="24">
+ <div class="grid-content content">申报单位</div>
</el-col>
- <el-col :span="12">
- <el-form-item label="航班日期" prop="flightDate" label-width="120px">
- <el-date-picker
- v-model="flight.flightDate"
- type="date"
- value-format="yyyyMMdd"
- format="yyyyMMdd"
- style="width:100%"
- placeholder="选择日期">
- </el-date-picker>
- </el-form-item>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="海关关区" prop="flightNo" label-width="120px">
+ <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-col :span="24">
+ <div class="grid-content content">当日飞行计划备案信息</div>
</el-col>
- <el-col :span="12">
- <el-form-item label="出发港" prop="departurePort" label-width="120px">
- <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)"
- maxLength='3'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px">
- <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
- <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)"
- maxLength='3'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px">
- <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
- maxLength='4'></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="计划离港时间" prop="currentTakeoffTime" label-width="120px">
- <el-date-picker
- v-model="flight.currentTakeoffTime"
- type="date"
- format="yyyyMMddHHmm"
- value-format="yyyyMMddHHmm"
- style="width:100%"
- placeholder="任意时间点">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="计划抵港时间" prop="currentLandingTime" label-width="120px">
- <el-date-picker
- v-model="flight.currentLandingTime"
- type="date"
- format="yyyyMMddHHmm"
- value-format="yyyyMMddHHmm"
- style="width:100%"
- placeholder="任意时间点">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="执行任务类型" prop="linesType" label-width="120px">
- <el-select v-model="flight.linesType" placeholder="" style="display:inline">
- <el-option v-for="item in linesTypes" :key="item.value" :label="item.label"
- :value="item.value"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="备注" prop="meno" label-width="120px">
- <el-input v-model="flight.meno"></el-input>
- </el-form-item>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="航班号" prop="flightNo" label-width="120px">
+ <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="航班日期" prop="flightDate" label-width="140px">
+ <el-date-picker
+ v-model="flight.flightDate"
+ type="date"
+ value-format="yyyyMMdd"
+ format="yyyyMMdd"
+ style="width:100%"
+ placeholder="选择日期">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="出发港" prop="departurePort" label-width="140px">
+ <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)"
+ maxLength='3'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="140px">
+ <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="目的港" prop="arrivalPort" label-width="120px">
+ <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)"
+ maxLength='3'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="140px">
+ <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')"
+ maxLength='4'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="计划离港时间" prop="currentTakeoffTime" label-width="140px">
+ <el-date-picker
+ v-model="flight.currentTakeoffTime"
+ type="date"
+ format="yyyyMMddHHmm"
+ value-format="yyyyMMddHHmm"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="计划抵港时间" prop="currentLandingTime" label-width="140px">
+ <el-date-picker
+ v-model="flight.currentLandingTime"
+ type="date"
+ format="yyyyMMddHHmm"
+ value-format="yyyyMMddHHmm"
+ style="width:100%"
+ placeholder="任意时间点">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="执行任务类型" prop="linesType" label-width="120px">
+ <el-select v-model="flight.linesType" placeholder="" style="display:inline">
+ <el-option v-for="item in linesTypes" :key="item.value" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-col :span="24">
+ <div class="grid-content content">备注信息</div>
</el-col>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="备注" prop="meno" label-width="120px">
+ <el-input v-model="flight.meno"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</el-row>
<el-row style="margin-left: 120px">
@@ -174,15 +194,15 @@
//{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'},
{required: true, message: '请输入(三字码)', trigger: 'blur'},
],
- departureCustomNo: [
- {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
- ],
+ // departureCustomNo: [
+ // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+ // ],
arrivalPort: [
{required: true, message: '请输入(三字码)', trigger: 'blur'},
],
- arrivalCustomNo: [
- {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
- ],
+ // arrivalCustomNo: [
+ // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'}
+ // ],
currentTakeoffTime: [
{required: true, message: '请选择日期', trigger: 'blur'}
],
diff --git a/src/views/airtransport/routeaircraft.vue b/src/views/airtransport/routeaircraft.vue
index a51377a..7513818 100644
--- a/src/views/airtransport/routeaircraft.vue
+++ b/src/views/airtransport/routeaircraft.vue
@@ -9,7 +9,12 @@
<el-row>
<el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm">
<el-col :span="6">
- <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px">
+ <el-form-item label="海关关区" prop="airwayCode" label-width="130px">
+ <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="运营企业海关编码" prop="airwayCode" label-width="140px">
<el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
</el-form-item>
</el-col>
@@ -23,41 +28,55 @@
<el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12"></el-col>
<el-col :span="6">
<el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px">
<el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
+<!-- <el-col :span="6">-->
+<!-- <el-form-item label="航空器国籍/地区" prop="aeroNationality" label-width="130px">-->
+<!-- <el-input v-model="aircraft.aeroNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.aeroNationality=inputMe(e)"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
<el-col :span="6">
- <el-form-item label="航空器国籍" prop="aeroNationality" label-width="130px">
- <el-input v-model="aircraft.aeroNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.aeroNationality=inputMe(e)"></el-input>
+ <el-form-item label="机型" prop="aeroModel" label-width="140px">
+ <el-input v-model="aircraft.aeroModel" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="证书类型" prop="credentialType" label-width="130px">
- <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input>
+ <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="140px">
+ <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="证书编号" prop="credentialNo" label-width="130px">
- <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input>
+ <el-form-item label="最大起飞重量" prop="grossWeight" label-width="140px">
+ <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item>
</el-col>
+ <el-col :sapn="24">
+ <el-form-item label="备注" prop="meno" label-width="130px">
+ <el-input v-model="aircraft.meno" placeholder="请输入"></el-input>
+ </el-form-item>
+ </el-col>
+
+
+
+
+
<el-col :span="6">
- <el-form-item label="机型" prop="aeroModel" label-width="130px">
- <el-input v-model="aircraft.aeroModel" placeholder="请输入"></el-input>
+ <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px">
+ <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="最大起飞重量" prop="grossWeight" label-width="130px">
- <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+ <el-form-item label="证书类型" prop="credentialType" label-width="130px">
+ <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px">
- <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+ <el-form-item label="证书编号" prop="credentialNo" label-width="130px">
+ <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -87,11 +106,7 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :sapn="24">
- <el-form-item label="备注" prop="meno" label-width="130px">
- <el-input type="textarea" v-model="aircraft.meno" :rows="4" placeholder="请输入"></el-input>
- </el-form-item>
- </el-col>
+
</el-form>
</el-row>
<el-row style="margin-left: 130px">
@@ -175,9 +190,9 @@
airwayNameEn: [
{required: true, message: '请输入', trigger: 'blur'}
],
- airwayNameCn: [
- {required: true, message: '请输入', trigger: 'blur'}
- ],
+ // airwayNameCn: [
+ // {required: true, message: '请输入', trigger: 'blur'}
+ // ],
aeroNationality: [
{required: true, message: '请输入', trigger: 'blur'}
],