正在显示
11 个修改的文件
包含
370 行增加
和
253 行删除
| @@ -87,20 +87,20 @@ var axois_init = { | @@ -87,20 +87,20 @@ var axois_init = { | ||
| 87 | init_router: (router,axios) => { | 87 | init_router: (router,axios) => { |
| 88 | router.beforeEach((to, from, next) => { | 88 | router.beforeEach((to, from, next) => { |
| 89 | // NProgress.start(); | 89 | // NProgress.start(); |
| 90 | - // if (to.path == '/login') { | ||
| 91 | - // sessionStorage.removeItem('user'); | ||
| 92 | - // sessionStorage.removeItem('menu'); | ||
| 93 | - // sessionStorage.removeItem('token'); | ||
| 94 | - // }else{ | ||
| 95 | - // let user = JSON.parse(sessionStorage.getItem('user')); | ||
| 96 | - // if(sessionStorage.getItem('token')){ | ||
| 97 | - // axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token'); | ||
| 98 | - // } | ||
| 99 | - // | ||
| 100 | - // if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) { | ||
| 101 | - // next({ path: '/login' }) | ||
| 102 | - // } | ||
| 103 | - // } | 90 | + if (to.path == '/login') { |
| 91 | + sessionStorage.removeItem('user'); | ||
| 92 | + sessionStorage.removeItem('menu'); | ||
| 93 | + sessionStorage.removeItem('token'); | ||
| 94 | + }else{ | ||
| 95 | + let user = JSON.parse(sessionStorage.getItem('user')); | ||
| 96 | + if(sessionStorage.getItem('token')){ | ||
| 97 | + axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token'); | ||
| 98 | + } | ||
| 99 | + | ||
| 100 | + if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) { | ||
| 101 | + next({ path: '/login' }) | ||
| 102 | + } | ||
| 103 | + } | ||
| 104 | next() | 104 | next() |
| 105 | }); | 105 | }); |
| 106 | } | 106 | } |
| @@ -33,7 +33,11 @@ Vue.prototype.socketApi = socketApi | @@ -33,7 +33,11 @@ Vue.prototype.socketApi = socketApi | ||
| 33 | 33 | ||
| 34 | Vue.config.productionTip = false | 34 | Vue.config.productionTip = false |
| 35 | Mock.bootstrap(); | 35 | Mock.bootstrap(); |
| 36 | -Vue.use(ElementUI) | 36 | +Vue.use(ElementUI, |
| 37 | + { | ||
| 38 | + // eslint-disable-next-line no-undef | ||
| 39 | + size: 'mini' | ||
| 40 | + }) | ||
| 37 | Vue.use(VueRouter) | 41 | Vue.use(VueRouter) |
| 38 | Vue.use(Vuex) | 42 | Vue.use(Vuex) |
| 39 | Vue.prototype.$axios = axios; | 43 | Vue.prototype.$axios = axios; |
| @@ -3,13 +3,18 @@ | @@ -3,13 +3,18 @@ | ||
| 3 | <el-main> | 3 | <el-main> |
| 4 | <el-row class="row-bg"> | 4 | <el-row class="row-bg"> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
| 6 | - <div class="grid-content content">通用航空器注册</div> | 6 | + <div class="grid-content content">航空器备案申报</div> |
| 7 | </el-col> | 7 | </el-col> |
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm"> | 10 | <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm"> |
| 11 | <el-col :span="6"> | 11 | <el-col :span="6"> |
| 12 | - <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px"> | 12 | + <el-form-item label="海关关区" prop="airwayCode" label-width="130px"> |
| 13 | + <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> | ||
| 14 | + </el-form-item> | ||
| 15 | + </el-col> | ||
| 16 | + <el-col :span="6"> | ||
| 17 | + <el-form-item label="代理企业海关编码" prop="airwayCode" label-width="130px"> | ||
| 13 | <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> | 18 | <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> |
| 14 | </el-form-item> | 19 | </el-form-item> |
| 15 | </el-col> | 20 | </el-col> |
| @@ -23,31 +28,44 @@ | @@ -23,31 +28,44 @@ | ||
| 23 | <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input> | 28 | <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input> |
| 24 | </el-form-item> | 29 | </el-form-item> |
| 25 | </el-col> | 30 | </el-col> |
| 26 | - <el-col :span="12"></el-col> | ||
| 27 | <el-col :span="6"> | 31 | <el-col :span="6"> |
| 28 | <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> | 32 | <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> |
| 29 | <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input> | 33 | <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input> |
| 30 | </el-form-item> | 34 | </el-form-item> |
| 31 | </el-col> | 35 | </el-col> |
| 32 | <el-col :span="6"> | 36 | <el-col :span="6"> |
| 33 | - <el-form-item label="航空器国籍" prop="areoNationality" label-width="130px"> | 37 | + <el-form-item label="航空器国籍/地区" prop="areoNationality" label-width="130px"> |
| 34 | <el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input> | 38 | <el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input> |
| 35 | </el-form-item> | 39 | </el-form-item> |
| 36 | </el-col> | 40 | </el-col> |
| 41 | +<!-- <el-col :span="6">--> | ||
| 42 | +<!-- <el-form-item label="航空器类型" prop="areoNationality" label-width="140px">--> | ||
| 43 | +<!-- <el-input v-model="aircraft.areoNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.areoNationality=inputMe(e)"></el-input>--> | ||
| 44 | +<!-- </el-form-item>--> | ||
| 45 | +<!-- </el-col>--> | ||
| 37 | <el-col :span="6"> | 46 | <el-col :span="6"> |
| 38 | - <el-form-item label="证书类型" prop="credentialType" label-width="130px"> | ||
| 39 | - <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input> | 47 | + <el-form-item label="机型" prop="areoModel" label-width="140px"> |
| 48 | + <el-input v-model="aircraft.areoModel" placeholder="请输入"></el-input> | ||
| 40 | </el-form-item> | 49 | </el-form-item> |
| 41 | </el-col> | 50 | </el-col> |
| 42 | <el-col :span="6"> | 51 | <el-col :span="6"> |
| 43 | - <el-form-item label="证书编号" prop="credentialNo" label-width="130px"> | ||
| 44 | - <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input> | 52 | + <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px"> |
| 53 | + <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
| 45 | </el-form-item> | 54 | </el-form-item> |
| 46 | </el-col> | 55 | </el-col> |
| 47 | - | ||
| 48 | <el-col :span="6"> | 56 | <el-col :span="6"> |
| 49 | - <el-form-item label="机型" prop="areoModel" label-width="130px"> | ||
| 50 | - <el-input v-model="aircraft.areoModel" placeholder="请输入"></el-input> | 57 | + <el-form-item label="航空器所有人" prop="ownerCo" label-width="130px"> |
| 58 | + <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
| 59 | + </el-form-item> | ||
| 60 | + </el-col> | ||
| 61 | + <el-col :span="6"> | ||
| 62 | + <el-form-item label="所有人证件类型" prop="credentialType" label-width="140px"> | ||
| 63 | + <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input> | ||
| 64 | + </el-form-item> | ||
| 65 | + </el-col> | ||
| 66 | + <el-col :span="6"> | ||
| 67 | + <el-form-item label="所有人证件号码" prop="credentialNo" label-width="140px"> | ||
| 68 | + <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input> | ||
| 51 | </el-form-item> | 69 | </el-form-item> |
| 52 | </el-col> | 70 | </el-col> |
| 53 | <el-col :span="6"> | 71 | <el-col :span="6"> |
| @@ -55,21 +73,30 @@ | @@ -55,21 +73,30 @@ | ||
| 55 | <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 73 | <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> |
| 56 | </el-form-item> | 74 | </el-form-item> |
| 57 | </el-col> | 75 | </el-col> |
| 58 | - <el-col :span="6"> | ||
| 59 | - <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px"> | ||
| 60 | - <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 76 | + <el-col :span="24"> |
| 77 | + <el-form-item label="备注" prop="meno" label-width="130px"> | ||
| 78 | + <el-input v-model="aircraft.meno" placeholder="请输入" ></el-input> | ||
| 61 | </el-form-item> | 79 | </el-form-item> |
| 62 | </el-col> | 80 | </el-col> |
| 81 | +<!-- <el-col :sapn="6">--> | ||
| 82 | +<!-- <el-form-item label="备注" prop="meno" label-width="130px">--> | ||
| 83 | +<!-- <el-input v-model="aircraft.meno" placeholder="请输入"></el-input>--> | ||
| 84 | +<!-- </el-form-item>--> | ||
| 85 | +<!-- </el-col>--> | ||
| 86 | + | ||
| 87 | + | ||
| 88 | + | ||
| 63 | <el-col :span="6"> | 89 | <el-col :span="6"> |
| 64 | - <el-form-item label="航空器所有方式" prop="useRelation" label-width="130px"> | ||
| 65 | - <el-input v-model="aircraft.useRelation" placeholder="请输入"></el-input> | 90 | + <el-form-item label="航空公司代码" prop="airwayCode" label-width="140px"> |
| 91 | + <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> | ||
| 66 | </el-form-item> | 92 | </el-form-item> |
| 67 | </el-col> | 93 | </el-col> |
| 68 | <el-col :span="6"> | 94 | <el-col :span="6"> |
| 69 | - <el-form-item label="航空器所有人代码" prop="ownerCo" label-width="140px"> | ||
| 70 | - <el-input v-model="aircraft.ownerCo" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 95 | + <el-form-item label="航空器所有方式" prop="useRelation" label-width="130px"> |
| 96 | + <el-input v-model="aircraft.useRelation" placeholder="请输入"></el-input> | ||
| 71 | </el-form-item> | 97 | </el-form-item> |
| 72 | </el-col> | 98 | </el-col> |
| 99 | + | ||
| 73 | <el-col :span="6"> | 100 | <el-col :span="6"> |
| 74 | <el-form-item label="国际证书编号" prop="certNo" label-width="130px"> | 101 | <el-form-item label="国际证书编号" prop="certNo" label-width="130px"> |
| 75 | <el-input v-model="aircraft.certNo" placeholder="请输入"></el-input> | 102 | <el-input v-model="aircraft.certNo" placeholder="请输入"></el-input> |
| @@ -87,11 +114,7 @@ | @@ -87,11 +114,7 @@ | ||
| 87 | </el-date-picker> | 114 | </el-date-picker> |
| 88 | </el-form-item> | 115 | </el-form-item> |
| 89 | </el-col> | 116 | </el-col> |
| 90 | - <el-col :sapn="24"> | ||
| 91 | - <el-form-item label="备注" prop="meno" label-width="130px"> | ||
| 92 | - <el-input type="textarea" v-model="aircraft.meno" :rows="4" placeholder="请输入"></el-input> | ||
| 93 | - </el-form-item> | ||
| 94 | - </el-col> | 117 | + |
| 95 | </el-form> | 118 | </el-form> |
| 96 | </el-row> | 119 | </el-row> |
| 97 | <el-row style="margin-left: 130px"> | 120 | <el-row style="margin-left: 130px"> |
| @@ -166,15 +189,15 @@ | @@ -166,15 +189,15 @@ | ||
| 166 | messageid:undefined | 189 | messageid:undefined |
| 167 | }, | 190 | }, |
| 168 | rules:{ | 191 | rules:{ |
| 169 | - airwayCode: [ | ||
| 170 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 171 | - ], | 192 | + // airwayCode: [ |
| 193 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 194 | + // ], | ||
| 172 | airwayNameEn: [ | 195 | airwayNameEn: [ |
| 173 | {required: true, message: '请输入', trigger: 'blur'} | 196 | {required: true, message: '请输入', trigger: 'blur'} |
| 174 | ], | 197 | ], |
| 175 | - airwayNameCn: [ | ||
| 176 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 177 | - ], | 198 | + // airwayNameCn: [ |
| 199 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 200 | + // ], | ||
| 178 | areoNationality: [ | 201 | areoNationality: [ |
| 179 | {required: true, message: '请输入', trigger: 'blur'} | 202 | {required: true, message: '请输入', trigger: 'blur'} |
| 180 | ], | 203 | ], |
| @@ -196,18 +219,18 @@ | @@ -196,18 +219,18 @@ | ||
| 196 | passengerLimit: [ | 219 | passengerLimit: [ |
| 197 | {required: true, message: '请输入', trigger: 'blur'} | 220 | {required: true, message: '请输入', trigger: 'blur'} |
| 198 | ], | 221 | ], |
| 199 | - useRelation: [ | ||
| 200 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 201 | - ], | 222 | + // useRelation: [ |
| 223 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 224 | + // ], | ||
| 202 | ownerCo: [ | 225 | ownerCo: [ |
| 203 | {required: true, message: '请输入', trigger: 'blur'} | 226 | {required: true, message: '请输入', trigger: 'blur'} |
| 204 | ], | 227 | ], |
| 205 | - certNo: [ | ||
| 206 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 207 | - ], | ||
| 208 | - deliverDate: [ | ||
| 209 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 210 | - ], | 228 | + // certNo: [ |
| 229 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 230 | + // ], | ||
| 231 | + // deliverDate: [ | ||
| 232 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 233 | + // ], | ||
| 211 | }, | 234 | }, |
| 212 | centerDialogVisible:false, | 235 | centerDialogVisible:false, |
| 213 | msg:undefined | 236 | msg:undefined |
| @@ -240,6 +263,7 @@ | @@ -240,6 +263,7 @@ | ||
| 240 | if (valid) { | 263 | if (valid) { |
| 241 | sendAircraft(this.aircraft).then(res=>{ | 264 | sendAircraft(this.aircraft).then(res=>{ |
| 242 | let response=res.data; | 265 | let response=res.data; |
| 266 | + console.log(response); | ||
| 243 | if(response.code=='200'){ | 267 | if(response.code=='200'){ |
| 244 | this.centerDialogVisible=true; | 268 | this.centerDialogVisible=true; |
| 245 | this.msg=response.msg; | 269 | this.msg=response.msg; |
| @@ -8,17 +8,32 @@ | @@ -8,17 +8,32 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm"> | 10 | <el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm"> |
| 11 | - <el-col :span="8"> | ||
| 12 | - <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px"> | 11 | + <el-col :span="24"> |
| 12 | + <div class="grid-content content">航空器信息</div> | ||
| 13 | + </el-col> | ||
| 14 | + <el-row> | ||
| 15 | + <el-col :span="6"> | ||
| 16 | + <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> | ||
| 13 | <el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input> | 17 | <el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input> |
| 14 | </el-form-item> | 18 | </el-form-item> |
| 15 | </el-col> | 19 | </el-col> |
| 16 | - <el-col :span="8"> | ||
| 17 | - <el-form-item label="航班号" prop="flightNo" label-width="120px"> | 20 | + <el-col :span="6"> |
| 21 | + <el-form-item label="海关关区" prop="customDistrictNo" label-width="120px"> | ||
| 22 | + <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 23 | + maxLength='4'></el-input> | ||
| 24 | + </el-form-item> | ||
| 25 | + </el-col> | ||
| 26 | + </el-row> | ||
| 27 | + <el-col :span="24"> | ||
| 28 | + <div class="grid-content content">航空器动态信息</div> | ||
| 29 | + </el-col> | ||
| 30 | + <el-row> | ||
| 31 | + <el-col :span="6"> | ||
| 32 | + <el-form-item label="航班号" prop="flightNo" label-width="130px"> | ||
| 18 | <el-input v-model="arrival.flightNo" @input="e => arrival.flightNo=inputMe(e)"></el-input> | 33 | <el-input v-model="arrival.flightNo" @input="e => arrival.flightNo=inputMe(e)"></el-input> |
| 19 | </el-form-item> | 34 | </el-form-item> |
| 20 | </el-col> | 35 | </el-col> |
| 21 | - <el-col :span="8"> | 36 | + <el-col :span="6"> |
| 22 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> | 37 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> |
| 23 | <el-date-picker | 38 | <el-date-picker |
| 24 | v-model="arrival.flightDate" | 39 | v-model="arrival.flightDate" |
| @@ -26,27 +41,27 @@ | @@ -26,27 +41,27 @@ | ||
| 26 | placeholder="选择日期时间" | 41 | placeholder="选择日期时间" |
| 27 | value-format="yyyyMMdd" | 42 | value-format="yyyyMMdd" |
| 28 | format="yyyyMMdd" | 43 | format="yyyyMMdd" |
| 29 | - style="width:275px" | 44 | + style="width: 100%" |
| 30 | > | 45 | > |
| 31 | </el-date-picker> | 46 | </el-date-picker> |
| 32 | </el-form-item> | 47 | </el-form-item> |
| 33 | </el-col> | 48 | </el-col> |
| 34 | - <el-col :span="8"> | 49 | + <el-col :span="6"> |
| 50 | + <el-form-item label="停机位" prop="stayid" label-width="140px"> | ||
| 51 | + <el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 52 | + ></el-input> | ||
| 53 | + </el-form-item> | ||
| 54 | + </el-col> | ||
| 55 | + <el-col :span="6"> | ||
| 35 | <el-form-item label="出发港" prop="departurePort" label-width="120px"> | 56 | <el-form-item label="出发港" prop="departurePort" label-width="120px"> |
| 36 | <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)" maxLength='3'></el-input> | 57 | <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)" maxLength='3'></el-input> |
| 37 | </el-form-item> | 58 | </el-form-item> |
| 38 | </el-col> | 59 | </el-col> |
| 39 | - <el-col :span="8"> | ||
| 40 | - <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 60 | + <el-col :span="6"> |
| 61 | + <el-form-item label="目的港" prop="arrivalPort" label-width="130px"> | ||
| 41 | <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)" maxLength='3'></el-input> | 62 | <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)" maxLength='3'></el-input> |
| 42 | </el-form-item> | 63 | </el-form-item> |
| 43 | </el-col> | 64 | </el-col> |
| 44 | - <el-col :span="8"> | ||
| 45 | - <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 46 | - <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 47 | - maxLength='4'></el-input> | ||
| 48 | - </el-form-item> | ||
| 49 | - </el-col> | ||
| 50 | <el-col :span="6"> | 65 | <el-col :span="6"> |
| 51 | <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> | 66 | <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> |
| 52 | <el-date-picker | 67 | <el-date-picker |
| @@ -55,20 +70,14 @@ | @@ -55,20 +70,14 @@ | ||
| 55 | placeholder="选择日期时间" | 70 | placeholder="选择日期时间" |
| 56 | value-format="yyyyMMddHHmmss" | 71 | value-format="yyyyMMddHHmmss" |
| 57 | format="yyyyMMddHHmmss" | 72 | format="yyyyMMddHHmmss" |
| 58 | - style="width:110%"> | 73 | + style="width:100%"> |
| 59 | </el-date-picker> | 74 | </el-date-picker> |
| 60 | </el-form-item> | 75 | </el-form-item> |
| 61 | </el-col> | 76 | </el-col> |
| 62 | <el-col :span="6"> | 77 | <el-col :span="6"> |
| 63 | - <el-form-item label="停靠机坪" prop="stayid" label-width="120px"> | ||
| 64 | - <el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 65 | - ></el-input> | ||
| 66 | - </el-form-item> | ||
| 67 | - </el-col> | ||
| 68 | - <el-col :span="6"> | ||
| 69 | - <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px"> | 78 | + <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px"> |
| 70 | <el-date-picker | 79 | <el-date-picker |
| 71 | - v-model="arrival.dischargecompleteddatetime" | 80 | + v-model="arrival.arrivaldatetime" |
| 72 | type="datetime" | 81 | type="datetime" |
| 73 | placeholder="选择日期时间" | 82 | placeholder="选择日期时间" |
| 74 | value-format="yyyyMMddHHmmss" | 83 | value-format="yyyyMMddHHmmss" |
| @@ -77,20 +86,24 @@ | @@ -77,20 +86,24 @@ | ||
| 77 | </el-date-picker> | 86 | </el-date-picker> |
| 78 | </el-form-item> | 87 | </el-form-item> |
| 79 | </el-col> | 88 | </el-col> |
| 89 | + </el-row> | ||
| 80 | <el-col :span="6"> | 90 | <el-col :span="6"> |
| 81 | - <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px"> | 91 | + <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="130px"> |
| 82 | <el-date-picker | 92 | <el-date-picker |
| 83 | - v-model="arrival.arrivaldatetime" | 93 | + v-model="arrival.dischargecompleteddatetime" |
| 84 | type="datetime" | 94 | type="datetime" |
| 85 | placeholder="选择日期时间" | 95 | placeholder="选择日期时间" |
| 86 | value-format="yyyyMMddHHmmss" | 96 | value-format="yyyyMMddHHmmss" |
| 87 | format="yyyyMMddHHmmss" | 97 | format="yyyyMMddHHmmss" |
| 88 | - style="width:115%"> | 98 | + style="width:100%"> |
| 89 | </el-date-picker> | 99 | </el-date-picker> |
| 90 | </el-form-item> | 100 | </el-form-item> |
| 91 | </el-col> | 101 | </el-col> |
| 92 | <el-col :span="24"> | 102 | <el-col :span="24"> |
| 93 | - <el-form-item label="备注" prop="meno" label-width="120px"> | 103 | + <div class="grid-content content">备注信息</div> |
| 104 | + </el-col> | ||
| 105 | + <el-col :span="24"> | ||
| 106 | + <el-form-item label="备注" prop="meno" label-width="130px"> | ||
| 94 | <el-input v-model="arrival.meno"></el-input> | 107 | <el-input v-model="arrival.meno"></el-input> |
| 95 | </el-form-item> | 108 | </el-form-item> |
| 96 | </el-col> | 109 | </el-col> |
| @@ -208,9 +221,9 @@ | @@ -208,9 +221,9 @@ | ||
| 208 | stayid: [ | 221 | stayid: [ |
| 209 | {required: true, message: '请输入', trigger: 'blur'}, | 222 | {required: true, message: '请输入', trigger: 'blur'}, |
| 210 | ], | 223 | ], |
| 211 | - dischargecompleteddatetime: [ | ||
| 212 | - {required: true, message: '请选择', trigger: 'blur'} | ||
| 213 | - ], | 224 | + // dischargecompleteddatetime: [ |
| 225 | + // {required: true, message: '请选择', trigger: 'blur'} | ||
| 226 | + // ], | ||
| 214 | arrivaldatetime: [ | 227 | arrivaldatetime: [ |
| 215 | {required: true, message: '请选择', trigger: 'blur'} | 228 | {required: true, message: '请选择', trigger: 'blur'} |
| 216 | ], | 229 | ], |
| @@ -550,9 +550,9 @@ background-color: white; | @@ -550,9 +550,9 @@ background-color: white; | ||
| 550 | name: [ | 550 | name: [ |
| 551 | {required: true, message: '请输入', trigger: 'blur'} | 551 | {required: true, message: '请输入', trigger: 'blur'} |
| 552 | ], | 552 | ], |
| 553 | - gender: [ | ||
| 554 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 555 | - ], | 553 | + // gender: [ |
| 554 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 555 | + // ], | ||
| 556 | certType: [ | 556 | certType: [ |
| 557 | {required: true, message: '请输入', trigger: 'blur'} | 557 | {required: true, message: '请输入', trigger: 'blur'} |
| 558 | ], | 558 | ], |
| @@ -631,7 +631,7 @@ background-color: white; | @@ -631,7 +631,7 @@ background-color: white; | ||
| 631 | } | 631 | } |
| 632 | }); | 632 | }); |
| 633 | }, | 633 | }, |
| 634 | - btDeleStatusFormater:(status) => { | 634 | + btDeleStatusFormater:(stastatustus) => { |
| 635 | if(status=='1'){ | 635 | if(status=='1'){ |
| 636 | return true; | 636 | return true; |
| 637 | }else{ | 637 | }else{ |
| @@ -8,54 +8,68 @@ | @@ -8,54 +8,68 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm"> | 10 | <el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm"> |
| 11 | - <el-col :span="8"> | ||
| 12 | - <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px"> | 11 | + <el-col :span="24"> |
| 12 | + <div class="grid-content content">航空器信息</div> | ||
| 13 | + </el-col> | ||
| 14 | + <el-row> | ||
| 15 | + <el-col :span="6"> | ||
| 16 | + <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> | ||
| 13 | <el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input> | 17 | <el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input> |
| 14 | </el-form-item> | 18 | </el-form-item> |
| 15 | </el-col> | 19 | </el-col> |
| 16 | - <el-col :span="8"> | ||
| 17 | - <el-form-item label="进港航班号" prop="flightNo" label-width="120px"> | 20 | + <el-col :span="6"> |
| 21 | + <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 22 | + <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 23 | + maxLength='4'></el-input> | ||
| 24 | + </el-form-item> | ||
| 25 | + </el-col> | ||
| 26 | + </el-row> | ||
| 27 | + <el-col :span="24"> | ||
| 28 | + <div class="grid-content content">航空器动态信息</div> | ||
| 29 | + </el-col> | ||
| 30 | + <el-col :span="6"> | ||
| 31 | + <el-form-item label="进港航班号" prop="flightNo" label-width="130px"> | ||
| 18 | <el-input v-model="confirmatory.flightNo" @input="e => confirmatory.flightNo=inputMe(e)"></el-input> | 32 | <el-input v-model="confirmatory.flightNo" @input="e => confirmatory.flightNo=inputMe(e)"></el-input> |
| 19 | </el-form-item> | 33 | </el-form-item> |
| 20 | </el-col> | 34 | </el-col> |
| 21 | - <el-col :span="8"> | 35 | + <el-col :span="6"> |
| 22 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> | 36 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> |
| 23 | <el-date-picker | 37 | <el-date-picker |
| 24 | v-model="confirmatory.flightDate" | 38 | v-model="confirmatory.flightDate" |
| 25 | type="date" | 39 | type="date" |
| 26 | value-format="yyyyMMdd" | 40 | value-format="yyyyMMdd" |
| 27 | format="yyyyMMdd" | 41 | format="yyyyMMdd" |
| 28 | - style="width:275px" | 42 | + style="width:100%" |
| 29 | placeholder="选择日期"> | 43 | placeholder="选择日期"> |
| 30 | </el-date-picker> | 44 | </el-date-picker> |
| 31 | </el-form-item> | 45 | </el-form-item> |
| 32 | </el-col> | 46 | </el-col> |
| 33 | - <el-col :span="8"> | ||
| 34 | - <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> | ||
| 35 | - <el-date-picker | ||
| 36 | - v-model="confirmatory.departuredatetime" | ||
| 37 | - type="datetime" | ||
| 38 | - placeholder="选择日期时间" | ||
| 39 | - value-format="yyyyMMddHHmmss" | ||
| 40 | - format="yyyyMMddHHmmss" | ||
| 41 | - style="width:100%"> | ||
| 42 | - </el-date-picker> | 47 | + <el-col :span="6"> |
| 48 | + <el-form-item label="停机位" prop="stayid" label-width="120px"> | ||
| 49 | + <el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 50 | + ></el-input> | ||
| 43 | </el-form-item> | 51 | </el-form-item> |
| 44 | </el-col> | 52 | </el-col> |
| 45 | - <el-col :span="8"> | 53 | + <el-col :span="6"> |
| 46 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 54 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> |
| 47 | <el-input v-model="confirmatory.arrivalPort" @input="e => confirmatory.arrivalPort=inputMe(e)" | 55 | <el-input v-model="confirmatory.arrivalPort" @input="e => confirmatory.arrivalPort=inputMe(e)" |
| 48 | maxLength='3'></el-input> | 56 | maxLength='3'></el-input> |
| 49 | </el-form-item> | 57 | </el-form-item> |
| 50 | </el-col> | 58 | </el-col> |
| 51 | - <el-col :span="8"> | ||
| 52 | - <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 53 | - <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 54 | - maxLength='4'></el-input> | ||
| 55 | - </el-form-item> | ||
| 56 | - </el-col> | ||
| 57 | - <el-col :span="8"> | ||
| 58 | - <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px"> | 59 | +<!-- <el-col :span="6">--> |
| 60 | +<!-- <el-form-item label="离港时间" prop="departuredatetime" label-width="120px">--> | ||
| 61 | +<!-- <el-date-picker--> | ||
| 62 | +<!-- v-model="confirmatory.departuredatetime"--> | ||
| 63 | +<!-- type="datetime"--> | ||
| 64 | +<!-- placeholder="选择日期时间"--> | ||
| 65 | +<!-- value-format="yyyyMMddHHmmss"--> | ||
| 66 | +<!-- format="yyyyMMddHHmmss"--> | ||
| 67 | +<!-- style="width:100%">--> | ||
| 68 | +<!-- </el-date-picker>--> | ||
| 69 | +<!-- </el-form-item>--> | ||
| 70 | +<!-- </el-col>--> | ||
| 71 | + <el-col :span="6"> | ||
| 72 | + <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="130px"> | ||
| 59 | <el-date-picker | 73 | <el-date-picker |
| 60 | v-model="confirmatory.arrivaldatetime" | 74 | v-model="confirmatory.arrivaldatetime" |
| 61 | type="datetime" | 75 | type="datetime" |
| @@ -66,14 +80,11 @@ | @@ -66,14 +80,11 @@ | ||
| 66 | </el-date-picker> | 80 | </el-date-picker> |
| 67 | </el-form-item> | 81 | </el-form-item> |
| 68 | </el-col> | 82 | </el-col> |
| 69 | - <el-col :span="8"> | ||
| 70 | - <el-form-item label="停靠机坪" prop="stayid" label-width="120px"> | ||
| 71 | - <el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 72 | - ></el-input> | ||
| 73 | - </el-form-item> | 83 | + <el-col :span="24"> |
| 84 | + <div class="grid-content content">备注信息</div> | ||
| 74 | </el-col> | 85 | </el-col> |
| 75 | <el-col :span="24"> | 86 | <el-col :span="24"> |
| 76 | - <el-form-item label="备注" prop="meno" label-width="120px"> | 87 | + <el-form-item label="备注" prop="meno" label-width="130px"> |
| 77 | <el-input v-model="confirmatory.meno"></el-input> | 88 | <el-input v-model="confirmatory.meno"></el-input> |
| 78 | </el-form-item> | 89 | </el-form-item> |
| 79 | </el-col> | 90 | </el-col> |
| @@ -8,29 +8,47 @@ | @@ -8,29 +8,47 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm"> | 10 | <el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm"> |
| 11 | - <el-col :span="8"> | 11 | + <el-col :span="24"> |
| 12 | + <div class="grid-content content">航空器信息</div> | ||
| 13 | + </el-col> | ||
| 14 | + <el-col :span="6"> | ||
| 12 | <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px"> | 15 | <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px"> |
| 13 | <el-input v-model.trim="declare.aircraftNo" @input="e => declare.aircraftNo=inputMe(e)"></el-input> | 16 | <el-input v-model.trim="declare.aircraftNo" @input="e => declare.aircraftNo=inputMe(e)"></el-input> |
| 14 | </el-form-item> | 17 | </el-form-item> |
| 15 | </el-col> | 18 | </el-col> |
| 16 | - <el-col :span="8"> | 19 | + <el-col :span="6"> |
| 20 | + <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 21 | + <el-input v-model="declare.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 22 | + maxLength='4'></el-input> | ||
| 23 | + </el-form-item> | ||
| 24 | + </el-col> | ||
| 25 | + <el-col :span="24"> | ||
| 26 | + <div class="grid-content content">航空器动态信息</div> | ||
| 27 | + </el-col> | ||
| 28 | + <el-col :span="6"> | ||
| 17 | <el-form-item label="出港航班号" prop="flightNo" label-width="120px"> | 29 | <el-form-item label="出港航班号" prop="flightNo" label-width="120px"> |
| 18 | <el-input v-model="declare.flightNo" @input="e => declare.flightNo=inputMe(e)"></el-input> | 30 | <el-input v-model="declare.flightNo" @input="e => declare.flightNo=inputMe(e)"></el-input> |
| 19 | </el-form-item> | 31 | </el-form-item> |
| 20 | </el-col> | 32 | </el-col> |
| 21 | - <el-col :span="8"> | 33 | + <el-col :span="6"> |
| 22 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> | 34 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> |
| 23 | <el-date-picker | 35 | <el-date-picker |
| 24 | v-model="declare.flightDate" | 36 | v-model="declare.flightDate" |
| 25 | type="date" | 37 | type="date" |
| 26 | value-format="yyyyMMdd" | 38 | value-format="yyyyMMdd" |
| 27 | format="yyyyMMdd" | 39 | format="yyyyMMdd" |
| 28 | - style="width:275px" | 40 | + style="width:100%" |
| 29 | placeholder="选择日期"> | 41 | placeholder="选择日期"> |
| 30 | </el-date-picker> | 42 | </el-date-picker> |
| 31 | </el-form-item> | 43 | </el-form-item> |
| 32 | </el-col> | 44 | </el-col> |
| 33 | - <el-col :span="8"> | 45 | + <el-col :span="6"> |
| 46 | + <el-form-item label="出发港" prop="departurePort" label-width="120px"> | ||
| 47 | + <el-input v-model="declare.departurePort" @input="e => declare.departurePort=inputMe(e)" | ||
| 48 | + maxLength='3'></el-input> | ||
| 49 | + </el-form-item> | ||
| 50 | + </el-col> | ||
| 51 | + <el-col :span="6"> | ||
| 34 | <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> | 52 | <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> |
| 35 | <!-- <el-input v-model="declare.departuredatetime"--> | 53 | <!-- <el-input v-model="declare.departuredatetime"--> |
| 36 | <!-- type="date"--> | 54 | <!-- type="date"--> |
| @@ -48,17 +66,8 @@ | @@ -48,17 +66,8 @@ | ||
| 48 | </el-date-picker> | 66 | </el-date-picker> |
| 49 | </el-form-item> | 67 | </el-form-item> |
| 50 | </el-col> | 68 | </el-col> |
| 51 | - <el-col :span="8"> | ||
| 52 | - <el-form-item label="出发港" prop="departurePort" label-width="120px"> | ||
| 53 | - <el-input v-model="declare.departurePort" @input="e => declare.departurePort=inputMe(e)" | ||
| 54 | - maxLength='3'></el-input> | ||
| 55 | - </el-form-item> | ||
| 56 | - </el-col> | ||
| 57 | - <el-col :span="8"> | ||
| 58 | - <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 59 | - <el-input v-model="declare.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 60 | - maxLength='4'></el-input> | ||
| 61 | - </el-form-item> | 69 | + <el-col :span="24"> |
| 70 | + <div class="grid-content content">备注信息</div> | ||
| 62 | </el-col> | 71 | </el-col> |
| 63 | <el-col :span="24"> | 72 | <el-col :span="24"> |
| 64 | <el-form-item label="备注" prop="meno" label-width="120px"> | 73 | <el-form-item label="备注" prop="meno" label-width="120px"> |
| @@ -8,45 +8,57 @@ | @@ -8,45 +8,57 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm"> | 10 | <el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm"> |
| 11 | - <el-col :span="8"> | ||
| 12 | - <el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px"> | 11 | + <el-col :span="24"> |
| 12 | + <div class="grid-content content">航空器信息</div> | ||
| 13 | + </el-col> | ||
| 14 | + <el-col :span="6"> | ||
| 15 | + <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> | ||
| 13 | <el-input v-model.trim="departure.aircraftNo" @input="e => departure.aircraftNo=inputMe(e)"></el-input> | 16 | <el-input v-model.trim="departure.aircraftNo" @input="e => departure.aircraftNo=inputMe(e)"></el-input> |
| 14 | </el-form-item> | 17 | </el-form-item> |
| 15 | </el-col> | 18 | </el-col> |
| 16 | - <el-col :span="8"> | ||
| 17 | - <el-form-item label="航班号" prop="flightNo" label-width="120px"> | 19 | + <el-col :span="6"> |
| 20 | + <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 21 | + <el-input v-model="departure.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 22 | + maxLength='4'></el-input> | ||
| 23 | + </el-form-item> | ||
| 24 | + </el-col> | ||
| 25 | + <el-col :span="24"> | ||
| 26 | + <div class="grid-content content">航空器动态信息</div> | ||
| 27 | + </el-col> | ||
| 28 | + <el-col :span="6"> | ||
| 29 | + <el-form-item label="航班号" prop="flightNo" label-width="130px"> | ||
| 18 | <el-input v-model="departure.flightNo" @input="e => departure.flightNo=inputMe(e)"></el-input> | 30 | <el-input v-model="departure.flightNo" @input="e => departure.flightNo=inputMe(e)"></el-input> |
| 19 | </el-form-item> | 31 | </el-form-item> |
| 20 | </el-col> | 32 | </el-col> |
| 21 | - <el-col :span="8"> | 33 | + <el-col :span="6"> |
| 22 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> | 34 | <el-form-item label="航班日期" prop="flightDate" label-width="120px"> |
| 23 | <el-date-picker | 35 | <el-date-picker |
| 24 | v-model="departure.flightDate" | 36 | v-model="departure.flightDate" |
| 25 | type="date" | 37 | type="date" |
| 26 | value-format="yyyyMMdd" | 38 | value-format="yyyyMMdd" |
| 27 | format="yyyyMMdd" | 39 | format="yyyyMMdd" |
| 28 | - style="width:275px" | 40 | + style="width:100%" |
| 29 | placeholder="选择日期"> | 41 | placeholder="选择日期"> |
| 30 | </el-date-picker> | 42 | </el-date-picker> |
| 31 | </el-form-item> | 43 | </el-form-item> |
| 32 | </el-col> | 44 | </el-col> |
| 33 | - <el-col :span="8"> | 45 | + <el-col :span="6"> |
| 46 | + <el-form-item label="停机位" prop="stayid" label-width="120px"> | ||
| 47 | + <el-input v-model="departure.stayid" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
| 48 | + </el-form-item> | ||
| 49 | + </el-col> | ||
| 50 | + <el-col :span="6"> | ||
| 34 | <el-form-item label="出发港" prop="departurePort" label-width="120px"> | 51 | <el-form-item label="出发港" prop="departurePort" label-width="120px"> |
| 35 | <el-input v-model="departure.departurePort" @input="e => departure.departurePort=inputMe(e)" maxLength='3'></el-input> | 52 | <el-input v-model="departure.departurePort" @input="e => departure.departurePort=inputMe(e)" maxLength='3'></el-input> |
| 36 | </el-form-item> | 53 | </el-form-item> |
| 37 | </el-col> | 54 | </el-col> |
| 38 | - <el-col :span="8"> | ||
| 39 | - <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 55 | + <el-col :span="6"> |
| 56 | + <el-form-item label="目的港" prop="arrivalPort" label-width="130px"> | ||
| 40 | <el-input v-model="departure.arrivalPort" @input="e => departure.arrivalPort=inputMe(e)" maxLength='3'></el-input> | 57 | <el-input v-model="departure.arrivalPort" @input="e => departure.arrivalPort=inputMe(e)" maxLength='3'></el-input> |
| 41 | </el-form-item> | 58 | </el-form-item> |
| 42 | </el-col> | 59 | </el-col> |
| 43 | - <el-col :span="8"> | ||
| 44 | - <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | ||
| 45 | - <el-input v-model="departure.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 46 | - maxLength='4'></el-input> | ||
| 47 | - </el-form-item> | ||
| 48 | - </el-col> | ||
| 49 | - <el-col :span="8"> | 60 | + |
| 61 | + <el-col :span="6"> | ||
| 50 | <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> | 62 | <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> |
| 51 | <!-- <el-input v-model="departure.departuredatetime"--> | 63 | <!-- <el-input v-model="departure.departuredatetime"--> |
| 52 | <!-- type="datetime"--> | 64 | <!-- type="datetime"--> |
| @@ -65,13 +77,11 @@ | @@ -65,13 +77,11 @@ | ||
| 65 | </el-date-picker> | 77 | </el-date-picker> |
| 66 | </el-form-item> | 78 | </el-form-item> |
| 67 | </el-col> | 79 | </el-col> |
| 68 | - <el-col :span="8"> | ||
| 69 | - <el-form-item label="停靠机坪" prop="stayid" label-width="120px"> | ||
| 70 | - <el-input v-model="departure.stayid" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
| 71 | - </el-form-item> | 80 | + <el-col :span="24"> |
| 81 | + <div class="grid-content content">备注信息</div> | ||
| 72 | </el-col> | 82 | </el-col> |
| 73 | <el-col :span="24"> | 83 | <el-col :span="24"> |
| 74 | - <el-form-item label="备注" prop="meno" label-width="120px"> | 84 | + <el-form-item label="备注" prop="meno" label-width="130px"> |
| 75 | <el-input v-model="departure.meno"></el-input> | 85 | <el-input v-model="departure.meno"></el-input> |
| 76 | </el-form-item> | 86 | </el-form-item> |
| 77 | </el-col> | 87 | </el-col> |
| @@ -8,59 +8,70 @@ | @@ -8,59 +8,70 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="flight" :rules="rules" ref="flight" label-width="130px" class="demo-ruleForm"> | 10 | <el-form :model="flight" :rules="rules" ref="flight" label-width="130px" class="demo-ruleForm"> |
| 11 | + <el-col :span="24"> | ||
| 12 | + <div class="grid-content content">申报单位</div> | ||
| 13 | + </el-col> | ||
| 11 | <el-col :span="6"> | 14 | <el-col :span="6"> |
| 12 | - <el-form-item label="航班号" prop="flightNo" label-width="120px"> | 15 | + <el-form-item label="海关关区" prop="flightNo" label-width="140px"> |
| 13 | <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> | 16 | <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> |
| 14 | </el-form-item> | 17 | </el-form-item> |
| 18 | + </el-col><el-col :span="24"> | ||
| 19 | + <div class="grid-content content">航班信息</div> | ||
| 15 | </el-col> | 20 | </el-col> |
| 16 | <el-col :span="6"> | 21 | <el-col :span="6"> |
| 17 | - <el-form-item label="航空公司代码" prop="airwayCode" label-width="120px"> | 22 | + <el-form-item label="运营企业海关编码" prop="airwayCode" label-width="140px"> |
| 18 | <el-input v-model="flight.airwayCode" @input="e => flight.airwayCode=inputMe(e)"></el-input> | 23 | <el-input v-model="flight.airwayCode" @input="e => flight.airwayCode=inputMe(e)"></el-input> |
| 19 | </el-form-item> | 24 | </el-form-item> |
| 20 | </el-col> | 25 | </el-col> |
| 21 | <el-col :span="6"> | 26 | <el-col :span="6"> |
| 22 | - <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="140px"> | ||
| 23 | - <el-input v-model="flight.airwayNameCn"></el-input> | ||
| 24 | - </el-form-item> | ||
| 25 | - </el-col> | ||
| 26 | - <el-col :span="6"> | ||
| 27 | - <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px"> | ||
| 28 | - <el-input v-model="flight.airwayNameEn"></el-input> | 27 | + <el-form-item label="航班号" prop="flightNo" label-width="120px"> |
| 28 | + <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> | ||
| 29 | </el-form-item> | 29 | </el-form-item> |
| 30 | </el-col> | 30 | </el-col> |
| 31 | - | ||
| 32 | <el-col :span="6"> | 31 | <el-col :span="6"> |
| 33 | - <el-form-item label="传输代理人" prop="transportAgentCode" label-width="120px"> | 32 | + <el-form-item label="航空器传输代理人代码" prop="transportAgentCode" label-width="170px"> |
| 34 | <el-input v-model="flight.transportAgentCode"></el-input> | 33 | <el-input v-model="flight.transportAgentCode"></el-input> |
| 35 | </el-form-item> | 34 | </el-form-item> |
| 36 | </el-col> | 35 | </el-col> |
| 37 | <el-col :span="6"> | 36 | <el-col :span="6"> |
| 38 | - <el-form-item label="地面代理人" prop="groundAgentCode" label-width="120px"> | 37 | + <el-form-item label="航空器地面代理人代码" prop="groundAgentCode" label-width="170px"> |
| 39 | <el-input v-model="flight.groundAgentCode"></el-input> | 38 | <el-input v-model="flight.groundAgentCode"></el-input> |
| 40 | </el-form-item> | 39 | </el-form-item> |
| 41 | </el-col> | 40 | </el-col> |
| 41 | + <el-col :span="12"> | ||
| 42 | + <el-form-item label="航空公司英文名称" prop="airwayNameEn" label-width="140px"> | ||
| 43 | + <el-input v-model="flight.airwayNameEn"></el-input> | ||
| 44 | + </el-form-item> | ||
| 45 | + </el-col> | ||
| 46 | + <el-col :span="12"> | ||
| 47 | + <el-form-item label="航空公司中文名称" prop="airwayNameCn" label-width="170px"> | ||
| 48 | + <el-input v-model="flight.airwayNameCn"></el-input> | ||
| 49 | + </el-form-item> | ||
| 50 | + </el-col> | ||
| 42 | <el-col :span="6"> | 51 | <el-col :span="6"> |
| 43 | - <el-form-item label="航班性质" prop="flightType" label-width="130px"> | ||
| 44 | - <el-select v-model="flight.flightType" placeholder="" style="display:inline"> | ||
| 45 | - <el-option v-for="item in flightTypes" :key="item.value" :label="item.label" | 52 | + <el-form-item label="执行任务类型" prop="linesType" label-width="140px"> |
| 53 | + <el-select v-model="flight.linesType" placeholder="" style="display:inline"> | ||
| 54 | + <el-option v-for="item in linesTypes" :key="item.value" :label="item.label" | ||
| 46 | :value="item.value"></el-option> | 55 | :value="item.value"></el-option> |
| 47 | </el-select> | 56 | </el-select> |
| 48 | </el-form-item> | 57 | </el-form-item> |
| 49 | </el-col> | 58 | </el-col> |
| 50 | <el-col :span="6"> | 59 | <el-col :span="6"> |
| 51 | - <el-form-item label="运输标识" prop="linesType" label-width="130px"> | ||
| 52 | - <el-select v-model="flight.linesType" placeholder="" style="display:inline"> | ||
| 53 | - <el-option v-for="item in linesTypes" :key="item.value" :label="item.label" | 60 | + <el-form-item label="航班性质" prop="flightType" label-width="130px"> |
| 61 | + <el-select v-model="flight.flightType" placeholder="" style="display:inline"> | ||
| 62 | + <el-option v-for="item in flightTypes" :key="item.value" :label="item.label" | ||
| 54 | :value="item.value"></el-option> | 63 | :value="item.value"></el-option> |
| 55 | </el-select> | 64 | </el-select> |
| 56 | </el-form-item> | 65 | </el-form-item> |
| 57 | </el-col> | 66 | </el-col> |
| 58 | - | ||
| 59 | <el-col :span="6"> | 67 | <el-col :span="6"> |
| 60 | - <el-form-item label="共享航班号" prop="shareFlightNo" label-width="120px"> | 68 | + <el-form-item label="共享航班号" prop="shareFlightNo" label-width="170px"> |
| 61 | <el-input v-model="flight.shareFlightNo" @input="e => flight.shareFlightNo=inputMe(e)"></el-input> | 69 | <el-input v-model="flight.shareFlightNo" @input="e => flight.shareFlightNo=inputMe(e)"></el-input> |
| 62 | </el-form-item> | 70 | </el-form-item> |
| 63 | </el-col> | 71 | </el-col> |
| 72 | + <el-col :span="24"> | ||
| 73 | + <div class="grid-content content">备注信息</div> | ||
| 74 | + </el-col> | ||
| 64 | <el-col :span="18"> | 75 | <el-col :span="18"> |
| 65 | <el-form-item label="备注" prop="remark" label-width="120px"> | 76 | <el-form-item label="备注" prop="remark" label-width="120px"> |
| 66 | <el-input v-model="flight.remark"></el-input> | 77 | <el-input v-model="flight.remark"></el-input> |
| @@ -69,37 +80,19 @@ | @@ -69,37 +80,19 @@ | ||
| 69 | <el-col :span="24" style="margin-bottom: 20px"> | 80 | <el-col :span="24" style="margin-bottom: 20px"> |
| 70 | <div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="selectAirline()" style="margin-left:50px">航线信息查询</el-button></div> | 81 | <div class="grid-content content">航线信息<el-button type="primary" size="mini" @click="selectAirline()" style="margin-left:50px">航线信息查询</el-button></div> |
| 71 | </el-col> | 82 | </el-col> |
| 72 | - | ||
| 73 | <el-col :span="6"> | 83 | <el-col :span="6"> |
| 74 | - <el-form-item label="出发港" prop="departurePort" label-width="120px"> | 84 | + <el-form-item label="出发港" prop="departurePort" label-width="140px"> |
| 75 | <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)" | 85 | <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)" |
| 76 | maxLength='3' ></el-input> | 86 | maxLength='3' ></el-input> |
| 77 | </el-form-item> | 87 | </el-form-item> |
| 78 | </el-col> | 88 | </el-col> |
| 79 | <el-col :span="6"> | 89 | <el-col :span="6"> |
| 80 | - <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px"> | ||
| 81 | - <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 82 | - maxLength='4'></el-input> | ||
| 83 | - </el-form-item> | ||
| 84 | - </el-col> | ||
| 85 | - <el-col :span="6"> | ||
| 86 | - <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 90 | + <el-form-item label="目的港" prop="arrivalPort" label-width="130px"> |
| 87 | <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)" | 91 | <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)" |
| 88 | maxLength='3'></el-input> | 92 | maxLength='3'></el-input> |
| 89 | </el-form-item> | 93 | </el-form-item> |
| 90 | </el-col> | 94 | </el-col> |
| 91 | <el-col :span="6"> | 95 | <el-col :span="6"> |
| 92 | - <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px"> | ||
| 93 | - <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 94 | - maxLength='4'></el-input> | ||
| 95 | - </el-form-item> | ||
| 96 | - </el-col> | ||
| 97 | - <el-col :span="6"> | ||
| 98 | - <el-form-item label="每周执行情况" prop="plan" label-width="120px"> | ||
| 99 | - <el-input v-model="flight.plan"></el-input> | ||
| 100 | - </el-form-item> | ||
| 101 | - </el-col> | ||
| 102 | - <el-col :span="6"> | ||
| 103 | <el-form-item label="长期离港时间" prop="std" label-width="120px"> | 96 | <el-form-item label="长期离港时间" prop="std" label-width="120px"> |
| 104 | <el-time-picker | 97 | <el-time-picker |
| 105 | v-model="flight.std" | 98 | v-model="flight.std" |
| @@ -125,10 +118,8 @@ | @@ -125,10 +118,8 @@ | ||
| 125 | </el-time-picker> | 118 | </el-time-picker> |
| 126 | </el-form-item> | 119 | </el-form-item> |
| 127 | </el-col> | 120 | </el-col> |
| 128 | - <el-col :span="12"></el-col> | ||
| 129 | - | ||
| 130 | <el-col :span="6"> | 121 | <el-col :span="6"> |
| 131 | - <el-form-item label="有效期起始时间" prop="effStartdate" label-width="120px"> | 122 | + <el-form-item label="有效期起始时间" prop="effStartdate" label-width="140px"> |
| 132 | <el-date-picker | 123 | <el-date-picker |
| 133 | v-model="flight.effStartdate" | 124 | v-model="flight.effStartdate" |
| 134 | type="date" | 125 | type="date" |
| @@ -140,7 +131,7 @@ | @@ -140,7 +131,7 @@ | ||
| 140 | </el-form-item> | 131 | </el-form-item> |
| 141 | </el-col> | 132 | </el-col> |
| 142 | <el-col :span="6"> | 133 | <el-col :span="6"> |
| 143 | - <el-form-item label="有效期结束时间" prop="effEnddate" label-width="120px"> | 134 | + <el-form-item label="有效期结束时间" prop="effEnddate" label-width="130px"> |
| 144 | <el-date-picker | 135 | <el-date-picker |
| 145 | v-model="flight.effEnddate" | 136 | v-model="flight.effEnddate" |
| 146 | type="date" | 137 | type="date" |
| @@ -151,6 +142,26 @@ | @@ -151,6 +142,26 @@ | ||
| 151 | </el-date-picker> | 142 | </el-date-picker> |
| 152 | </el-form-item> | 143 | </el-form-item> |
| 153 | </el-col> | 144 | </el-col> |
| 145 | + <el-col :span="24"> | ||
| 146 | + <el-form-item label="每周执行情况" prop="plan" label-width="140px"> | ||
| 147 | + <el-input v-model="flight.plan"></el-input> | ||
| 148 | + </el-form-item> | ||
| 149 | + </el-col> | ||
| 150 | + | ||
| 151 | + | ||
| 152 | + | ||
| 153 | + <el-col :span="6"> | ||
| 154 | + <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="140px"> | ||
| 155 | + <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 156 | + maxLength='4'></el-input> | ||
| 157 | + </el-form-item> | ||
| 158 | + </el-col> | ||
| 159 | + <el-col :span="6"> | ||
| 160 | + <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="130px"> | ||
| 161 | + <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')" | ||
| 162 | + maxLength='4'></el-input> | ||
| 163 | + </el-form-item> | ||
| 164 | + </el-col> | ||
| 154 | <el-col :span="6"> | 165 | <el-col :span="6"> |
| 155 | <el-form-item label="备注" prop="remark" label-width="120px"> | 166 | <el-form-item label="备注" prop="remark" label-width="120px"> |
| 156 | <el-input v-model="flight.remark"></el-input> | 167 | <el-input v-model="flight.remark"></el-input> |
| @@ -323,9 +334,9 @@ | @@ -323,9 +334,9 @@ | ||
| 323 | airwayNameEn: [ | 334 | airwayNameEn: [ |
| 324 | {required: true, message: '请输入', trigger: 'blur'} | 335 | {required: true, message: '请输入', trigger: 'blur'} |
| 325 | ], | 336 | ], |
| 326 | - airwayNameCn: [ | ||
| 327 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 328 | - ], | 337 | + // airwayNameCn: [ |
| 338 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 339 | + // ], | ||
| 329 | transportAgentCode: [ | 340 | transportAgentCode: [ |
| 330 | {required: true, message: '请输入', trigger: 'blur'} | 341 | {required: true, message: '请输入', trigger: 'blur'} |
| 331 | ], | 342 | ], |
| @@ -345,15 +356,15 @@ | @@ -345,15 +356,15 @@ | ||
| 345 | //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'}, | 356 | //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'}, |
| 346 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, | 357 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, |
| 347 | ], | 358 | ], |
| 348 | - departureCustomNo: [ | ||
| 349 | - {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 350 | - ], | 359 | + // departureCustomNo: [ |
| 360 | + // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 361 | + // ], | ||
| 351 | arrivalPort: [ | 362 | arrivalPort: [ |
| 352 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, | 363 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, |
| 353 | ], | 364 | ], |
| 354 | - arrivalCustomNo: [ | ||
| 355 | - {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 356 | - ], | 365 | + // arrivalCustomNo: [ |
| 366 | + // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 367 | + // ], | ||
| 357 | plan: [ | 368 | plan: [ |
| 358 | {required: true, message: '请输入', trigger: 'blur'}, | 369 | {required: true, message: '请输入', trigger: 'blur'}, |
| 359 | ], | 370 | ], |
| @@ -8,13 +8,27 @@ | @@ -8,13 +8,27 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="flight" :rules="rules" ref="flight" label-width="100px" class="demo-ruleForm"> | 10 | <el-form :model="flight" :rules="rules" ref="flight" label-width="100px" class="demo-ruleForm"> |
| 11 | - <el-col :span="12"> | 11 | + <el-col :span="24"> |
| 12 | + <div class="grid-content content">申报单位</div> | ||
| 13 | + </el-col> | ||
| 14 | + <el-row> | ||
| 15 | + <el-col :span="6"> | ||
| 16 | + <el-form-item label="海关关区" prop="flightNo" label-width="120px"> | ||
| 17 | + <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> | ||
| 18 | + </el-form-item> | ||
| 19 | + </el-col> | ||
| 20 | + </el-row> | ||
| 21 | + <el-col :span="24"> | ||
| 22 | + <div class="grid-content content">当日飞行计划备案信息</div> | ||
| 23 | + </el-col> | ||
| 24 | + <el-row> | ||
| 25 | + <el-col :span="6"> | ||
| 12 | <el-form-item label="航班号" prop="flightNo" label-width="120px"> | 26 | <el-form-item label="航班号" prop="flightNo" label-width="120px"> |
| 13 | <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> | 27 | <el-input v-model="flight.flightNo" @input="e => flight.flightNo=inputMe(e)"></el-input> |
| 14 | </el-form-item> | 28 | </el-form-item> |
| 15 | </el-col> | 29 | </el-col> |
| 16 | - <el-col :span="12"> | ||
| 17 | - <el-form-item label="航班日期" prop="flightDate" label-width="120px"> | 30 | + <el-col :span="6"> |
| 31 | + <el-form-item label="航班日期" prop="flightDate" label-width="140px"> | ||
| 18 | <el-date-picker | 32 | <el-date-picker |
| 19 | v-model="flight.flightDate" | 33 | v-model="flight.flightDate" |
| 20 | type="date" | 34 | type="date" |
| @@ -25,32 +39,32 @@ | @@ -25,32 +39,32 @@ | ||
| 25 | </el-date-picker> | 39 | </el-date-picker> |
| 26 | </el-form-item> | 40 | </el-form-item> |
| 27 | </el-col> | 41 | </el-col> |
| 28 | - <el-col :span="12"> | ||
| 29 | - <el-form-item label="出发港" prop="departurePort" label-width="120px"> | 42 | + <el-col :span="6"> |
| 43 | + <el-form-item label="出发港" prop="departurePort" label-width="140px"> | ||
| 30 | <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)" | 44 | <el-input v-model="flight.departurePort" @input="e => flight.departurePort=inputMe(e)" |
| 31 | maxLength='3'></el-input> | 45 | maxLength='3'></el-input> |
| 32 | </el-form-item> | 46 | </el-form-item> |
| 33 | </el-col> | 47 | </el-col> |
| 34 | - <el-col :span="12"> | ||
| 35 | - <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="120px"> | 48 | + <el-col :span="6"> |
| 49 | + <el-form-item label="出发港关区代码" prop="departureCustomNo" label-width="140px"> | ||
| 36 | <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')" | 50 | <el-input v-model="flight.departureCustomNo" oninput="value=value.replace(/[^\d]/g,'')" |
| 37 | maxLength='4'></el-input> | 51 | maxLength='4'></el-input> |
| 38 | </el-form-item> | 52 | </el-form-item> |
| 39 | </el-col> | 53 | </el-col> |
| 40 | - <el-col :span="12"> | 54 | + <el-col :span="6"> |
| 41 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 55 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> |
| 42 | <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)" | 56 | <el-input v-model="flight.arrivalPort" @input="e => flight.arrivalPort=inputMe(e)" |
| 43 | maxLength='3'></el-input> | 57 | maxLength='3'></el-input> |
| 44 | </el-form-item> | 58 | </el-form-item> |
| 45 | </el-col> | 59 | </el-col> |
| 46 | - <el-col :span="12"> | ||
| 47 | - <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="120px"> | 60 | + <el-col :span="6"> |
| 61 | + <el-form-item label="目的港关区代码" prop="arrivalCustomNo" label-width="140px"> | ||
| 48 | <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')" | 62 | <el-input v-model="flight.arrivalCustomNo" oninput="value=value.replace(/[^\d]/g,'')" |
| 49 | maxLength='4'></el-input> | 63 | maxLength='4'></el-input> |
| 50 | </el-form-item> | 64 | </el-form-item> |
| 51 | </el-col> | 65 | </el-col> |
| 52 | - <el-col :span="12"> | ||
| 53 | - <el-form-item label="计划离港时间" prop="currentTakeoffTime" label-width="120px"> | 66 | + <el-col :span="6"> |
| 67 | + <el-form-item label="计划离港时间" prop="currentTakeoffTime" label-width="140px"> | ||
| 54 | <el-date-picker | 68 | <el-date-picker |
| 55 | v-model="flight.currentTakeoffTime" | 69 | v-model="flight.currentTakeoffTime" |
| 56 | type="date" | 70 | type="date" |
| @@ -61,8 +75,8 @@ | @@ -61,8 +75,8 @@ | ||
| 61 | </el-date-picker> | 75 | </el-date-picker> |
| 62 | </el-form-item> | 76 | </el-form-item> |
| 63 | </el-col> | 77 | </el-col> |
| 64 | - <el-col :span="12"> | ||
| 65 | - <el-form-item label="计划抵港时间" prop="currentLandingTime" label-width="120px"> | 78 | + <el-col :span="6"> |
| 79 | + <el-form-item label="计划抵港时间" prop="currentLandingTime" label-width="140px"> | ||
| 66 | <el-date-picker | 80 | <el-date-picker |
| 67 | v-model="flight.currentLandingTime" | 81 | v-model="flight.currentLandingTime" |
| 68 | type="date" | 82 | type="date" |
| @@ -73,7 +87,7 @@ | @@ -73,7 +87,7 @@ | ||
| 73 | </el-date-picker> | 87 | </el-date-picker> |
| 74 | </el-form-item> | 88 | </el-form-item> |
| 75 | </el-col> | 89 | </el-col> |
| 76 | - <el-col :span="12"> | 90 | + <el-col :span="6"> |
| 77 | <el-form-item label="执行任务类型" prop="linesType" label-width="120px"> | 91 | <el-form-item label="执行任务类型" prop="linesType" label-width="120px"> |
| 78 | <el-select v-model="flight.linesType" placeholder="" style="display:inline"> | 92 | <el-select v-model="flight.linesType" placeholder="" style="display:inline"> |
| 79 | <el-option v-for="item in linesTypes" :key="item.value" :label="item.label" | 93 | <el-option v-for="item in linesTypes" :key="item.value" :label="item.label" |
| @@ -81,11 +95,17 @@ | @@ -81,11 +95,17 @@ | ||
| 81 | </el-select> | 95 | </el-select> |
| 82 | </el-form-item> | 96 | </el-form-item> |
| 83 | </el-col> | 97 | </el-col> |
| 84 | - <el-col :span="12"> | 98 | + </el-row> |
| 99 | + <el-col :span="24"> | ||
| 100 | + <div class="grid-content content">备注信息</div> | ||
| 101 | + </el-col> | ||
| 102 | + <el-row> | ||
| 103 | + <el-col :span="24"> | ||
| 85 | <el-form-item label="备注" prop="meno" label-width="120px"> | 104 | <el-form-item label="备注" prop="meno" label-width="120px"> |
| 86 | <el-input v-model="flight.meno"></el-input> | 105 | <el-input v-model="flight.meno"></el-input> |
| 87 | </el-form-item> | 106 | </el-form-item> |
| 88 | </el-col> | 107 | </el-col> |
| 108 | + </el-row> | ||
| 89 | </el-form> | 109 | </el-form> |
| 90 | </el-row> | 110 | </el-row> |
| 91 | <el-row style="margin-left: 120px"> | 111 | <el-row style="margin-left: 120px"> |
| @@ -174,15 +194,15 @@ | @@ -174,15 +194,15 @@ | ||
| 174 | //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'}, | 194 | //{ min: 3, max: 3, message: '长度在3个字符', trigger: 'blur'}, |
| 175 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, | 195 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, |
| 176 | ], | 196 | ], |
| 177 | - departureCustomNo: [ | ||
| 178 | - {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 179 | - ], | 197 | + // departureCustomNo: [ |
| 198 | + // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 199 | + // ], | ||
| 180 | arrivalPort: [ | 200 | arrivalPort: [ |
| 181 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, | 201 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, |
| 182 | ], | 202 | ], |
| 183 | - arrivalCustomNo: [ | ||
| 184 | - {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 185 | - ], | 203 | + // arrivalCustomNo: [ |
| 204 | + // {required: true, message: '请输入四位（数字）关区代码', trigger: 'blur'} | ||
| 205 | + // ], | ||
| 186 | currentTakeoffTime: [ | 206 | currentTakeoffTime: [ |
| 187 | {required: true, message: '请选择日期', trigger: 'blur'} | 207 | {required: true, message: '请选择日期', trigger: 'blur'} |
| 188 | ], | 208 | ], |
| @@ -9,7 +9,12 @@ | @@ -9,7 +9,12 @@ | ||
| 9 | <el-row> | 9 | <el-row> |
| 10 | <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm"> | 10 | <el-form :model="aircraft" :rules="rules" ref="aircraft" label-width="130px" class="demo-ruleForm"> |
| 11 | <el-col :span="6"> | 11 | <el-col :span="6"> |
| 12 | - <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px"> | 12 | + <el-form-item label="海关关区" prop="airwayCode" label-width="130px"> |
| 13 | + <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> | ||
| 14 | + </el-form-item> | ||
| 15 | + </el-col> | ||
| 16 | + <el-col :span="6"> | ||
| 17 | + <el-form-item label="运营企业海关编码" prop="airwayCode" label-width="140px"> | ||
| 13 | <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> | 18 | <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> |
| 14 | </el-form-item> | 19 | </el-form-item> |
| 15 | </el-col> | 20 | </el-col> |
| @@ -23,41 +28,55 @@ | @@ -23,41 +28,55 @@ | ||
| 23 | <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input> | 28 | <el-input v-model="aircraft.airwayNameCn" placeholder="请输入"></el-input> |
| 24 | </el-form-item> | 29 | </el-form-item> |
| 25 | </el-col> | 30 | </el-col> |
| 26 | - <el-col :span="12"></el-col> | ||
| 27 | <el-col :span="6"> | 31 | <el-col :span="6"> |
| 28 | <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> | 32 | <el-form-item label="航空器注册编号" prop="aircraftNo" label-width="130px"> |
| 29 | <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input> | 33 | <el-input v-model.trim="aircraft.aircraftNo" placeholder="请输入" @input="e => aircraft.aircraftNo=inputMe(e)"></el-input> |
| 30 | </el-form-item> | 34 | </el-form-item> |
| 31 | </el-col> | 35 | </el-col> |
| 36 | +<!-- <el-col :span="6">--> | ||
| 37 | +<!-- <el-form-item label="航空器国籍/地区" prop="aeroNationality" label-width="130px">--> | ||
| 38 | +<!-- <el-input v-model="aircraft.aeroNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.aeroNationality=inputMe(e)"></el-input>--> | ||
| 39 | +<!-- </el-form-item>--> | ||
| 40 | +<!-- </el-col>--> | ||
| 32 | <el-col :span="6"> | 41 | <el-col :span="6"> |
| 33 | - <el-form-item label="航空器国籍" prop="aeroNationality" label-width="130px"> | ||
| 34 | - <el-input v-model="aircraft.aeroNationality" placeholder="请输入" maxLength='2' @input="e => aircraft.aeroNationality=inputMe(e)"></el-input> | 42 | + <el-form-item label="机型" prop="aeroModel" label-width="140px"> |
| 43 | + <el-input v-model="aircraft.aeroModel" placeholder="请输入"></el-input> | ||
| 35 | </el-form-item> | 44 | </el-form-item> |
| 36 | </el-col> | 45 | </el-col> |
| 37 | <el-col :span="6"> | 46 | <el-col :span="6"> |
| 38 | - <el-form-item label="证书类型" prop="credentialType" label-width="130px"> | ||
| 39 | - <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input> | 47 | + <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="140px"> |
| 48 | + <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
| 40 | </el-form-item> | 49 | </el-form-item> |
| 41 | </el-col> | 50 | </el-col> |
| 42 | <el-col :span="6"> | 51 | <el-col :span="6"> |
| 43 | - <el-form-item label="证书编号" prop="credentialNo" label-width="130px"> | ||
| 44 | - <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input> | 52 | + <el-form-item label="最大起飞重量" prop="grossWeight" label-width="140px"> |
| 53 | + <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | ||
| 45 | </el-form-item> | 54 | </el-form-item> |
| 46 | </el-col> | 55 | </el-col> |
| 56 | + <el-col :sapn="24"> | ||
| 57 | + <el-form-item label="备注" prop="meno" label-width="130px"> | ||
| 58 | + <el-input v-model="aircraft.meno" placeholder="请输入"></el-input> | ||
| 59 | + </el-form-item> | ||
| 60 | + </el-col> | ||
| 61 | + | ||
| 62 | + | ||
| 63 | + | ||
| 64 | + | ||
| 65 | + | ||
| 47 | 66 | ||
| 48 | <el-col :span="6"> | 67 | <el-col :span="6"> |
| 49 | - <el-form-item label="机型" prop="aeroModel" label-width="130px"> | ||
| 50 | - <el-input v-model="aircraft.aeroModel" placeholder="请输入"></el-input> | 68 | + <el-form-item label="航空公司代码" prop="airwayCode" label-width="130px"> |
| 69 | + <el-input v-model="aircraft.airwayCode" placeholder="请输入" @input="e => aircraft.airwayCode=inputMe(e)" maxLength='2'></el-input> | ||
| 51 | </el-form-item> | 70 | </el-form-item> |
| 52 | </el-col> | 71 | </el-col> |
| 53 | <el-col :span="6"> | 72 | <el-col :span="6"> |
| 54 | - <el-form-item label="最大起飞重量" prop="grossWeight" label-width="130px"> | ||
| 55 | - <el-input v-model="aircraft.grossWeight" placeholder="请输入重量（单位：KG）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 73 | + <el-form-item label="证书类型" prop="credentialType" label-width="130px"> |
| 74 | + <el-input v-model="aircraft.credentialType" placeholder="请输入"></el-input> | ||
| 56 | </el-form-item> | 75 | </el-form-item> |
| 57 | </el-col> | 76 | </el-col> |
| 58 | <el-col :span="6"> | 77 | <el-col :span="6"> |
| 59 | - <el-form-item label="标客舱载客人数" prop="passengerLimit" label-width="130px"> | ||
| 60 | - <el-input v-model="aircraft.passengerLimit" placeholder="请输入数量（单位：人）" oninput="value=value.replace(/[^\d]/g,'')"></el-input> | 78 | + <el-form-item label="证书编号" prop="credentialNo" label-width="130px"> |
| 79 | + <el-input v-model="aircraft.credentialNo" placeholder="请输入"></el-input> | ||
| 61 | </el-form-item> | 80 | </el-form-item> |
| 62 | </el-col> | 81 | </el-col> |
| 63 | <el-col :span="6"> | 82 | <el-col :span="6"> |
| @@ -87,11 +106,7 @@ | @@ -87,11 +106,7 @@ | ||
| 87 | </el-date-picker> | 106 | </el-date-picker> |
| 88 | </el-form-item> | 107 | </el-form-item> |
| 89 | </el-col> | 108 | </el-col> |
| 90 | - <el-col :sapn="24"> | ||
| 91 | - <el-form-item label="备注" prop="meno" label-width="130px"> | ||
| 92 | - <el-input type="textarea" v-model="aircraft.meno" :rows="4" placeholder="请输入"></el-input> | ||
| 93 | - </el-form-item> | ||
| 94 | - </el-col> | 109 | + |
| 95 | </el-form> | 110 | </el-form> |
| 96 | </el-row> | 111 | </el-row> |
| 97 | <el-row style="margin-left: 130px"> | 112 | <el-row style="margin-left: 130px"> |
| @@ -175,9 +190,9 @@ | @@ -175,9 +190,9 @@ | ||
| 175 | airwayNameEn: [ | 190 | airwayNameEn: [ |
| 176 | {required: true, message: '请输入', trigger: 'blur'} | 191 | {required: true, message: '请输入', trigger: 'blur'} |
| 177 | ], | 192 | ], |
| 178 | - airwayNameCn: [ | ||
| 179 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 180 | - ], | 193 | + // airwayNameCn: [ |
| 194 | + // {required: true, message: '请输入', trigger: 'blur'} | ||
| 195 | + // ], | ||
| 181 | aeroNationality: [ | 196 | aeroNationality: [ |
| 182 | {required: true, message: '请输入', trigger: 'blur'} | 197 | {required: true, message: '请输入', trigger: 'blur'} |
| 183 | ], | 198 | ], |
-
请 注册 或 登录 后发表评论