正在显示
18 个修改的文件
包含
532 行增加
和
286 行删除
| @@ -94,9 +94,12 @@ export const editSchedule=params=>{return http.put(`${baseUrlSchedule}/editSched | @@ -94,9 +94,12 @@ export const editSchedule=params=>{return http.put(`${baseUrlSchedule}/editSched | ||
| 94 | //查询列表 | 94 | //查询列表 |
| 95 | export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`, params);}; | 95 | export const selectSchedule=params=>{return http.get(`${baseUrlSchedule}/selectSchedule`, params);}; |
| 96 | 96 | ||
| 97 | + | ||
| 98 | + | ||
| 97 | //查询长期计划查询列表 | 99 | //查询长期计划查询列表 |
| 98 | export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`, params);}; | 100 | export const selectLongTimePlan=params=>{return http.get(`${baseUrlLongtimeplan}/selectLongTimePlan`, params);}; |
| 99 | 101 | ||
| 102 | + | ||
| 100 | //机组人员 | 103 | //机组人员 |
| 101 | //新增方法 | 104 | //新增方法 |
| 102 | export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`, params); }; | 105 | export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/addBillPerson`, params); }; |
| @@ -23,6 +23,8 @@ | @@ -23,6 +23,8 @@ | ||
| 23 | <el-date-picker | 23 | <el-date-picker |
| 24 | v-model="arrival.flightDate" | 24 | v-model="arrival.flightDate" |
| 25 | type="date" | 25 | type="date" |
| 26 | + value-format="yyyyMMdd" | ||
| 27 | + format="yyyyMMdd" | ||
| 26 | style="width:275px" | 28 | style="width:275px" |
| 27 | placeholder="选择日期"> | 29 | placeholder="选择日期"> |
| 28 | </el-date-picker> | 30 | </el-date-picker> |
| @@ -30,22 +32,32 @@ | @@ -30,22 +32,32 @@ | ||
| 30 | </el-col> | 32 | </el-col> |
| 31 | <el-col :span="8"> | 33 | <el-col :span="8"> |
| 32 | <el-form-item label="出发港" prop="departurePort" label-width="120px"> | 34 | <el-form-item label="出发港" prop="departurePort" label-width="120px"> |
| 33 | - <el-input v-model="arrival.departurePort"></el-input> | 35 | + <el-input v-model="arrival.departurePort" @input="e => arrival.departurePort=inputMe(e)" |
| 36 | + maxLength='3'></el-input> | ||
| 34 | </el-form-item> | 37 | </el-form-item> |
| 35 | </el-col> | 38 | </el-col> |
| 36 | <el-col :span="8"> | 39 | <el-col :span="8"> |
| 37 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 40 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> |
| 38 | - <el-input v-model="arrival.arrivalPort"></el-input> | 41 | + <el-input v-model="arrival.arrivalPort" @input="e => arrival.arrivalPort=inputMe(e)" |
| 42 | + maxLength='3'></el-input> | ||
| 39 | </el-form-item> | 43 | </el-form-item> |
| 40 | </el-col> | 44 | </el-col> |
| 41 | <el-col :span="8"> | 45 | <el-col :span="8"> |
| 42 | <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | 46 | <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> |
| 43 | - <el-input v-model="arrival.customDistrictNo"></el-input> | 47 | + <el-input v-model="arrival.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" |
| 48 | + maxLength='4'></el-input> | ||
| 44 | </el-form-item> | 49 | </el-form-item> |
| 45 | </el-col> | 50 | </el-col> |
| 46 | <el-col :span="6"> | 51 | <el-col :span="6"> |
| 47 | <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> | 52 | <el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px"> |
| 48 | - <el-input v-model="arrival.departuredatetime"></el-input> | 53 | + <el-date-picker |
| 54 | + v-model="arrival.departuredatetime" | ||
| 55 | + type="date" | ||
| 56 | + format="yyyyMMdd" | ||
| 57 | + value-format="yyyyMMdd" | ||
| 58 | + style="width:100%" | ||
| 59 | + placeholder="任意时间点"> | ||
| 60 | + </el-date-picker> | ||
| 49 | </el-form-item> | 61 | </el-form-item> |
| 50 | </el-col> | 62 | </el-col> |
| 51 | <el-col :span="6"> | 63 | <el-col :span="6"> |
| @@ -55,12 +67,26 @@ | @@ -55,12 +67,26 @@ | ||
| 55 | </el-col> | 67 | </el-col> |
| 56 | <el-col :span="6"> | 68 | <el-col :span="6"> |
| 57 | <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px"> | 69 | <el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px"> |
| 58 | - <el-input v-model="arrival.dischargecompleteddatetime"></el-input> | 70 | + <el-date-picker |
| 71 | + v-model="arrival.dischargecompleteddatetime" | ||
| 72 | + type="date" | ||
| 73 | + format="yyyyMMdd" | ||
| 74 | + value-format="yyyyMMdd" | ||
| 75 | + style="width:100%" | ||
| 76 | + placeholder="任意时间点"> | ||
| 77 | + </el-date-picker> | ||
| 59 | </el-form-item> | 78 | </el-form-item> |
| 60 | </el-col> | 79 | </el-col> |
| 61 | <el-col :span="6"> | 80 | <el-col :span="6"> |
| 62 | <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px"> | 81 | <el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px"> |
| 63 | - <el-input v-model="arrival.arrivaldatetime"></el-input> | 82 | + <el-date-picker |
| 83 | + v-model="arrival.arrivaldatetime" | ||
| 84 | + type="date" | ||
| 85 | + format="yyyyMMdd" | ||
| 86 | + value-format="yyyyMMdd" | ||
| 87 | + style="width:100%" | ||
| 88 | + placeholder="任意时间点"> | ||
| 89 | + </el-date-picker> | ||
| 64 | </el-form-item> | 90 | </el-form-item> |
| 65 | </el-col> | 91 | </el-col> |
| 66 | <el-col :span="24"> | 92 | <el-col :span="24"> |
| @@ -74,6 +100,20 @@ | @@ -74,6 +100,20 @@ | ||
| 74 | <el-col :span="24"> <el-button type="primary" @click="submitForm('arrival')">保 存</el-button> | 100 | <el-col :span="24"> <el-button type="primary" @click="submitForm('arrival')">保 存</el-button> |
| 75 | <el-button type="success">保存并发送</el-button></el-col> | 101 | <el-button type="success">保存并发送</el-button></el-col> |
| 76 | </el-row> | 102 | </el-row> |
| 103 | + <!--对话提示框--> | ||
| 104 | + <el-row> | ||
| 105 | + <el-dialog | ||
| 106 | + title="系统提示" | ||
| 107 | + :visible.sync="centerDialogVisible" | ||
| 108 | + width="30%" | ||
| 109 | + center> | ||
| 110 | + <span>{{msg}}</span> | ||
| 111 | + <span slot="footer" class="dialog-footer"> | ||
| 112 | + <el-button @click="centerDialogVisible = false">取 消</el-button> | ||
| 113 | + <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button> | ||
| 114 | + </span> | ||
| 115 | + </el-dialog> | ||
| 116 | + </el-row> | ||
| 77 | </el-main> | 117 | </el-main> |
| 78 | </el-container> | 118 | </el-container> |
| 79 | </template> | 119 | </template> |
| @@ -96,6 +136,8 @@ | @@ -96,6 +136,8 @@ | ||
| 96 | .el-col{margin-right: 0px;} | 136 | .el-col{margin-right: 0px;} |
| 97 | </style> | 137 | </style> |
| 98 | <script> | 138 | <script> |
| 139 | + import {addPrediction} from "../../api/transport"; | ||
| 140 | + | ||
| 99 | export default { | 141 | export default { |
| 100 | data(){ | 142 | data(){ |
| 101 | return{ | 143 | return{ |
| @@ -121,7 +163,7 @@ | @@ -121,7 +163,7 @@ | ||
| 121 | {required: true, message: '请输入', trigger: 'blur'} | 163 | {required: true, message: '请输入', trigger: 'blur'} |
| 122 | ], | 164 | ], |
| 123 | flightDate: [ | 165 | flightDate: [ |
| 124 | - {type: 'date',required: true, message: '请选择', trigger: 'change'} | 166 | + {required: true, message: '请选择', trigger: 'change'} |
| 125 | ], | 167 | ], |
| 126 | departurePort: [ | 168 | departurePort: [ |
| 127 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, | 169 | {required: true, message: '请输入(三字码)', trigger: 'blur'}, |
| @@ -135,7 +177,7 @@ | @@ -135,7 +177,7 @@ | ||
| 135 | {required: true, message: '请选择', trigger: 'blur'} | 177 | {required: true, message: '请选择', trigger: 'blur'} |
| 136 | ], | 178 | ], |
| 137 | departuredatetime: [ | 179 | departuredatetime: [ |
| 138 | - {required: true, message: '请选择', trigger: 'blur'} | 180 | + {required: true, message: '请选择', trigger: 'change'} |
| 139 | ], | 181 | ], |
| 140 | stayid: [ | 182 | stayid: [ |
| 141 | {required: true, message: '请输入', trigger: 'blur'} | 183 | {required: true, message: '请输入', trigger: 'blur'} |
| @@ -147,31 +189,45 @@ | @@ -147,31 +189,45 @@ | ||
| 147 | {required: true, message: '请选择', trigger: 'blur'} | 189 | {required: true, message: '请选择', trigger: 'blur'} |
| 148 | ], | 190 | ], |
| 149 | }, | 191 | }, |
| 150 | - tableData:[] | 192 | + tableData:[], |
| 193 | + centerDialogVisible:false, | ||
| 194 | + msg:undefined, | ||
| 151 | } | 195 | } |
| 152 | }, | 196 | }, |
| 153 | methods:{ | 197 | methods:{ |
| 198 | + //新增进港预报申报（保存按钮） | ||
| 154 | submitForm(formName) { | 199 | submitForm(formName) { |
| 155 | this.$refs[formName].validate((valid) => { | 200 | this.$refs[formName].validate((valid) => { |
| 156 | if (valid) { | 201 | if (valid) { |
| 157 | - alert('submit!'); | 202 | + addPrediction(this.arrival).then(res=>{ |
| 203 | + let response=res.data; | ||
| 204 | + if(response.code=='200'){ | ||
| 205 | + this.centerDialogVisible=true; | ||
| 206 | + this.msg=response.msg; | ||
| 207 | + this.$router.push({path:'/queryArrival',query:{flightNo:JSON.stringify(this.arrival.flightNo),flightDate:JSON.stringify(this.arrival.flightDate)},}); | ||
| 208 | + }else{ | ||
| 209 | + this.msg=response.msg; | ||
| 210 | + } | ||
| 211 | + }); | ||
| 158 | } else { | 212 | } else { |
| 159 | console.log('error submit!!'); | 213 | console.log('error submit!!'); |
| 160 | return false; | 214 | return false; |
| 161 | } | 215 | } |
| 162 | }); | 216 | }); |
| 163 | }, | 217 | }, |
| 164 | - submitPerson(formName){ | ||
| 165 | - this.$refs[formName].validate((valid) => { | ||
| 166 | - if (valid) { | ||
| 167 | - alert('submit!'); | ||
| 168 | - } else { | ||
| 169 | - console.log('error submit!!'); | ||
| 170 | - return false; | ||
| 171 | - } | ||
| 172 | - }); | 218 | + //加载默认值 |
| 219 | + defaultData(){ | ||
| 220 | + if(this.$route.query!=null){ | ||
| 221 | + let ob=Object.assign(this.arrival, this.$route.query); | ||
| 222 | + } | ||
| 173 | }, | 223 | }, |
| 174 | - | 224 | + // 过滤中英文 |
| 225 | + inputMe(e){ | ||
| 226 | + return e.replace(/[^a-zA-Z]/g,'').toUpperCase(); | ||
| 227 | + } | ||
| 228 | + }, | ||
| 229 | + mounted(){ | ||
| 230 | + this.defaultData(); | ||
| 175 | } | 231 | } |
| 176 | } | 232 | } |
| 177 | </script> | 233 | </script> |
| @@ -29,9 +29,23 @@ | @@ -29,9 +29,23 @@ | ||
| 29 | </el-form> | 29 | </el-form> |
| 30 | </el-row> | 30 | </el-row> |
| 31 | <el-row style="margin-left: 120px"> | 31 | <el-row style="margin-left: 120px"> |
| 32 | - <el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button> | 32 | + <el-col :span="24"> <el-button type="primary" @click="submitForm('configure')">保 存</el-button> |
| 33 | </el-col> | 33 | </el-col> |
| 34 | </el-row> | 34 | </el-row> |
| 35 | + <!--对话提示框--> | ||
| 36 | + <el-row> | ||
| 37 | + <el-dialog | ||
| 38 | + title="系统提示" | ||
| 39 | + :visible.sync="centerDialogVisible" | ||
| 40 | + width="30%" | ||
| 41 | + center> | ||
| 42 | + <span>{{msg}}</span> | ||
| 43 | + <span slot="footer" class="dialog-footer"> | ||
| 44 | + <el-button @click="centerDialogVisible = false">取 消</el-button> | ||
| 45 | + <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button> | ||
| 46 | + </span> | ||
| 47 | + </el-dialog> | ||
| 48 | + </el-row> | ||
| 35 | </el-main> | 49 | </el-main> |
| 36 | </el-container> | 50 | </el-container> |
| 37 | </template> | 51 | </template> |
| @@ -54,6 +68,8 @@ | @@ -54,6 +68,8 @@ | ||
| 54 | .el-col{margin-right: 0px;} | 68 | .el-col{margin-right: 0px;} |
| 55 | </style> | 69 | </style> |
| 56 | <script> | 70 | <script> |
| 71 | + import { addSchedule} from "../../api/transport"; | ||
| 72 | + | ||
| 57 | export default { | 73 | export default { |
| 58 | data(){ | 74 | data(){ |
| 59 | return{ | 75 | return{ |
| @@ -75,31 +91,42 @@ | @@ -75,31 +91,42 @@ | ||
| 75 | {value:'1',label:'进港'}, | 91 | {value:'1',label:'进港'}, |
| 76 | {value:'2',label:'出港'} | 92 | {value:'2',label:'出港'} |
| 77 | ], | 93 | ], |
| 78 | - tableData:[] | 94 | + tableData:[], |
| 95 | + msg:undefined, | ||
| 96 | + centerDialogVisible:false, | ||
| 97 | + accessFlag:'1' | ||
| 79 | } | 98 | } |
| 80 | }, | 99 | }, |
| 81 | methods:{ | 100 | methods:{ |
| 101 | + //新增进港确报申报（保存按钮） | ||
| 82 | submitForm(formName) { | 102 | submitForm(formName) { |
| 83 | this.$refs[formName].validate((valid) => { | 103 | this.$refs[formName].validate((valid) => { |
| 84 | if (valid) { | 104 | if (valid) { |
| 85 | - alert('submit!'); | 105 | + addSchedule(this.configure).then(res=>{ |
| 106 | + let response=res.data; | ||
| 107 | + if(response.code=='200'){ | ||
| 108 | + this.centerDialogVisible=true; | ||
| 109 | + this.msg=response.msg; | ||
| 110 | + this.$router.push({path:'/queryConfigure',query:{flightNo:JSON.stringify(this.queryConfigure.flightNo)},}); | ||
| 111 | + }else{ | ||
| 112 | + this.msg=response.msg; | ||
| 113 | + } | ||
| 114 | + }); | ||
| 86 | } else { | 115 | } else { |
| 87 | console.log('error submit!!'); | 116 | console.log('error submit!!'); |
| 88 | return false; | 117 | return false; |
| 89 | } | 118 | } |
| 90 | }); | 119 | }); |
| 91 | }, | 120 | }, |
| 92 | - submitPerson(formName){ | ||
| 93 | - this.$refs[formName].validate((valid) => { | ||
| 94 | - if (valid) { | ||
| 95 | - alert('submit!'); | ||
| 96 | - } else { | ||
| 97 | - console.log('error submit!!'); | ||
| 98 | - return false; | ||
| 99 | - } | ||
| 100 | - }); | 121 | + //加载默认值 |
| 122 | + defaultData(){ | ||
| 123 | + if(this.$route.query!=null){ | ||
| 124 | + let ob=Object.assign(this.configure, this.$route.query); | ||
| 125 | + } | ||
| 101 | }, | 126 | }, |
| 102 | - | 127 | + }, |
| 128 | + mounted(){ | ||
| 129 | + this.defaultData(); | ||
| 103 | } | 130 | } |
| 104 | } | 131 | } |
| 105 | </script> | 132 | </script> |
| @@ -23,6 +23,8 @@ | @@ -23,6 +23,8 @@ | ||
| 23 | <el-date-picker | 23 | <el-date-picker |
| 24 | v-model="confirmatory.flightDate" | 24 | v-model="confirmatory.flightDate" |
| 25 | type="date" | 25 | type="date" |
| 26 | + value-format="yyyyMMdd" | ||
| 27 | + format="yyyyMMdd" | ||
| 26 | style="width:275px" | 28 | style="width:275px" |
| 27 | placeholder="选择日期"> | 29 | placeholder="选择日期"> |
| 28 | </el-date-picker> | 30 | </el-date-picker> |
| @@ -30,22 +32,38 @@ | @@ -30,22 +32,38 @@ | ||
| 30 | </el-col> | 32 | </el-col> |
| 31 | <el-col :span="8"> | 33 | <el-col :span="8"> |
| 32 | <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> | 34 | <el-form-item label="离港时间" prop="departuredatetime" label-width="120px"> |
| 33 | - <el-input v-model="confirmatory.departuredatetime"></el-input> | 35 | + <el-date-picker |
| 36 | + v-model="confirmatory.departuredatetime" | ||
| 37 | + type="date" | ||
| 38 | + value-format="yyyyMMdd" | ||
| 39 | + format="yyyyMMdd" | ||
| 40 | + style="width:100%" | ||
| 41 | + placeholder="任意时间点"> | ||
| 42 | + </el-date-picker> | ||
| 34 | </el-form-item> | 43 | </el-form-item> |
| 35 | </el-col> | 44 | </el-col> |
| 36 | <el-col :span="8"> | 45 | <el-col :span="8"> |
| 37 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 46 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> |
| 38 | - <el-input v-model="confirmatory.arrivalPort"></el-input> | 47 | + <el-input v-model="confirmatory.arrivalPort" @input="e => confirmatory.arrivalPort=inputMe(e)" |
| 48 | + maxLength='3'></el-input> | ||
| 39 | </el-form-item> | 49 | </el-form-item> |
| 40 | </el-col> | 50 | </el-col> |
| 41 | <el-col :span="8"> | 51 | <el-col :span="8"> |
| 42 | <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> | 52 | <el-form-item label="关区代码" prop="customDistrictNo" label-width="120px"> |
| 43 | - <el-input v-model="confirmatory.customDistrictNo"></el-input> | 53 | + <el-input v-model="confirmatory.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')" |
| 54 | + maxLength='4'></el-input> | ||
| 44 | </el-form-item> | 55 | </el-form-item> |
| 45 | </el-col> | 56 | </el-col> |
| 46 | <el-col :span="8"> | 57 | <el-col :span="8"> |
| 47 | <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px"> | 58 | <el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px"> |
| 48 | - <el-input v-model="confirmatory.arrivaldatetime"></el-input> | 59 | + <el-date-picker |
| 60 | + v-model="confirmatory.arrivaldatetime" | ||
| 61 | + type="date" | ||
| 62 | + value-format="yyyyMMdd" | ||
| 63 | + format="yyyyMMdd" | ||
| 64 | + style="width:100%" | ||
| 65 | + placeholder="任意时间点"> | ||
| 66 | + </el-date-picker> | ||
| 49 | </el-form-item> | 67 | </el-form-item> |
| 50 | </el-col> | 68 | </el-col> |
| 51 | <el-col :span="8"> | 69 | <el-col :span="8"> |
| @@ -64,6 +82,20 @@ | @@ -64,6 +82,20 @@ | ||
| 64 | <el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button> | 82 | <el-col :span="24"> <el-button type="primary" @click="submitForm('confirmatory')">保 存</el-button> |
| 65 | <el-button type="success">保存并发送</el-button></el-col> | 83 | <el-button type="success">保存并发送</el-button></el-col> |
| 66 | </el-row> | 84 | </el-row> |
| 85 | + <!--对话提示框--> | ||
| 86 | + <el-row> | ||
| 87 | + <el-dialog | ||
| 88 | + title="系统提示" | ||
| 89 | + :visible.sync="centerDialogVisible" | ||
| 90 | + width="30%" | ||
| 91 | + center> | ||
| 92 | + <span>{{msg}}</span> | ||
| 93 | + <span slot="footer" class="dialog-footer"> | ||
| 94 | + <el-button @click="centerDialogVisible = false">取 消</el-button> | ||
| 95 | + <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button> | ||
| 96 | + </span> | ||
| 97 | + </el-dialog> | ||
| 98 | + </el-row> | ||
| 67 | </el-main> | 99 | </el-main> |
| 68 | </el-container> | 100 | </el-container> |
| 69 | </template> | 101 | </template> |
| @@ -86,6 +118,8 @@ | @@ -86,6 +118,8 @@ | ||
| 86 | .el-col{margin-right: 0px;} | 118 | .el-col{margin-right: 0px;} |
| 87 | </style> | 119 | </style> |
| 88 | <script> | 120 | <script> |
| 121 | + import {addConfirm} from "../../api/transport"; | ||
| 122 | + | ||
| 89 | export default { | 123 | export default { |
| 90 | data(){ | 124 | data(){ |
| 91 | return{ | 125 | return{ |
| @@ -128,31 +162,45 @@ | @@ -128,31 +162,45 @@ | ||
| 128 | {required: true, message: '请选择', trigger: 'blur'} | 162 | {required: true, message: '请选择', trigger: 'blur'} |
| 129 | ], | 163 | ], |
| 130 | }, | 164 | }, |
| 131 | - tableData:[] | 165 | + tableData:[], |
| 166 | + msg:undefined, | ||
| 167 | + centerDialogVisible:false, | ||
| 132 | } | 168 | } |
| 133 | }, | 169 | }, |
| 134 | methods:{ | 170 | methods:{ |
| 171 | + //新增进港确报申报（保存按钮） | ||
| 135 | submitForm(formName) { | 172 | submitForm(formName) { |
| 136 | this.$refs[formName].validate((valid) => { | 173 | this.$refs[formName].validate((valid) => { |
| 137 | if (valid) { | 174 | if (valid) { |
| 138 | - alert('submit!'); | 175 | + addConfirm(this.confirmatory).then(res=>{ |
| 176 | + let response=res.data; | ||
| 177 | + if(response.code=='200'){ | ||
| 178 | + this.centerDialogVisible=true; | ||
| 179 | + this.msg=response.msg; | ||
| 180 | + this.$router.push({path:'/queryConfirmatory',query:{flightNo:JSON.stringify(this.confirmatory.flightNo),flightDate:JSON.stringify(this.confirmatory.flightDate)},}); | ||
| 181 | + }else{ | ||
| 182 | + this.msg=response.msg; | ||
| 183 | + } | ||
| 184 | + }); | ||
| 139 | } else { | 185 | } else { |
| 140 | console.log('error submit!!'); | 186 | console.log('error submit!!'); |
| 141 | return false; | 187 | return false; |
| 142 | } | 188 | } |
| 143 | }); | 189 | }); |
| 144 | }, | 190 | }, |
| 145 | - submitPerson(formName){ | ||
| 146 | - this.$refs[formName].validate((valid) => { | ||
| 147 | - if (valid) { | ||
| 148 | - alert('submit!'); | ||
| 149 | - } else { | ||
| 150 | - console.log('error submit!!'); | ||
| 151 | - return false; | ||
| 152 | - } | ||
| 153 | - }); | 191 | + //加载默认值 |
| 192 | + defaultData(){ | ||
| 193 | + if(this.$route.query!=null){ | ||
| 194 | + let ob=Object.assign(this.confirmatory, this.$route.query); | ||
| 195 | + } | ||
| 154 | }, | 196 | }, |
| 155 | - | 197 | + // 过滤中英文 |
| 198 | + inputMe(e){ | ||
| 199 | + return e.replace(/[^a-zA-Z]/g,'').toUpperCase(); | ||
| 200 | + } | ||
| 201 | + }, | ||
| 202 | + mounted(){ | ||
| 203 | + this.defaultData(); | ||
| 156 | } | 204 | } |
| 157 | } | 205 | } |
| 158 | </script> | 206 | </script> |
| @@ -225,6 +225,19 @@ | @@ -225,6 +225,19 @@ | ||
| 225 | label="备注"> | 225 | label="备注"> |
| 226 | </el-table-column> | 226 | </el-table-column> |
| 227 | </el-table> | 227 | </el-table> |
| 228 | + <el-row> | ||
| 229 | + <div class="block"> | ||
| 230 | + <el-pagination | ||
| 231 | + @size-change="handleSizeChange" | ||
| 232 | + @current-change="handleCurrentChange" | ||
| 233 | + :current-page="currentPage" | ||
| 234 | + :page-sizes="[10, 20, 30, 40]" | ||
| 235 | + :page-size="pageSize" | ||
| 236 | + layout="total, sizes, prev, pager, next, jumper" | ||
| 237 | + :total="total"> | ||
| 238 | + </el-pagination> | ||
| 239 | + </div> | ||
| 240 | + </el-row> | ||
| 228 | </el-dialog> | 241 | </el-dialog> |
| 229 | </el-row> | 242 | </el-row> |
| 230 | <el-row> | 243 | <el-row> |
| @@ -383,7 +396,9 @@ | @@ -383,7 +396,9 @@ | ||
| 383 | ], | 396 | ], |
| 384 | dialogTableVisible:false, | 397 | dialogTableVisible:false, |
| 385 | centerDialogVisible:false, | 398 | centerDialogVisible:false, |
| 386 | - currentPage4:4, | 399 | + currentPage: 1, |
| 400 | + pageSize:10, | ||
| 401 | + total:0, | ||
| 387 | msg:undefined, | 402 | msg:undefined, |
| 388 | tableData: [], | 403 | tableData: [], |
| 389 | tableloading:true, | 404 | tableloading:true, |
| @@ -392,7 +407,7 @@ | @@ -392,7 +407,7 @@ | ||
| 392 | methods:{ | 407 | methods:{ |
| 393 | //航线信息查询 | 408 | //航线信息查询 |
| 394 | selectAirline(){ | 409 | selectAirline(){ |
| 395 | - let params={currentPage:this.currentPage,pageSize:this.pageSize,createBy:this.airLine.createBy}; | 410 | + let params={currentPage:this.currentPage,pageSize:this.pageSize,aircraftNo:this.flight.aircraftNo}; |
| 396 | this.dialogTableVisible=true; | 411 | this.dialogTableVisible=true; |
| 397 | this.tableloading=true; | 412 | this.tableloading=true; |
| 398 | selectRoute(params).then(res=>{ | 413 | selectRoute(params).then(res=>{ |
| @@ -411,7 +426,7 @@ | @@ -411,7 +426,7 @@ | ||
| 411 | if(response.code=='200'){ | 426 | if(response.code=='200'){ |
| 412 | this.centerDialogVisible=true; | 427 | this.centerDialogVisible=true; |
| 413 | this.msg=response.msg; | 428 | this.msg=response.msg; |
| 414 | - this.$router.push({path:'/queryFlight',query:{flightNo:JSON.stringify(this.flight.flightNo),aircraftNo:JSON.stringify(this.flight.aircraftNo)}}); | 429 | + this.$router.push({path:'/queryFlights',query:{flightNo:JSON.stringify(this.flight.flightNo),flightDate:JSON.stringify(this.flight.flightDate)}}); |
| 415 | this.centerDialogVisible=false; | 430 | this.centerDialogVisible=false; |
| 416 | }else{ | 431 | }else{ |
| 417 | this.centerDialogVisible=true; | 432 | this.centerDialogVisible=true; |
| @@ -426,10 +441,11 @@ | @@ -426,10 +441,11 @@ | ||
| 426 | }, | 441 | }, |
| 427 | //分页方法 | 442 | //分页方法 |
| 428 | handleSizeChange(val) { | 443 | handleSizeChange(val) { |
| 429 | - console.log(`每页 ${val} 条`); | 444 | + this.pageSize=val; |
| 430 | }, | 445 | }, |
| 431 | handleCurrentChange(val) { | 446 | handleCurrentChange(val) { |
| 432 | - console.log(`当前页: ${val}`); | 447 | + this.currentPage=val; |
| 448 | + this.submitForm(); | ||
| 433 | }, | 449 | }, |
| 434 | //航线信息查询选择功能 | 450 | //航线信息查询选择功能 |
| 435 | handleEdit(index,row){ | 451 | handleEdit(index,row){ |
| @@ -45,43 +45,35 @@ | @@ -45,43 +45,35 @@ | ||
| 45 | </el-table-column> | 45 | </el-table-column> |
| 46 | <el-table-column | 46 | <el-table-column |
| 47 | prop=airwayCode" | 47 | prop=airwayCode" |
| 48 | - label="航空器所有人代码" | ||
| 49 | - width="120"> | 48 | + label="航空器所有人代码"> |
| 50 | </el-table-column> | 49 | </el-table-column> |
| 51 | <el-table-column | 50 | <el-table-column |
| 52 | prop="airwayNameEn" | 51 | prop="airwayNameEn" |
| 53 | - label="所有人英文名称" | ||
| 54 | - width="120"> | 52 | + label="所有人英文名称"> |
| 55 | </el-table-column> | 53 | </el-table-column> |
| 56 | <el-table-column | 54 | <el-table-column |
| 57 | prop="airwayNameCn" | 55 | prop="airwayNameCn" |
| 58 | - label="所有人中文名称" | ||
| 59 | - width="150"> | 56 | + label="所有人中文名称"> |
| 60 | </el-table-column> | 57 | </el-table-column> |
| 61 | <el-table-column | 58 | <el-table-column |
| 62 | prop="aircraftNo" | 59 | prop="aircraftNo" |
| 63 | - label="航空器注册编号" | ||
| 64 | - width="120"> | 60 | + label="航空器注册编号"> |
| 65 | </el-table-column> | 61 | </el-table-column> |
| 66 | <el-table-column | 62 | <el-table-column |
| 67 | prop="certNo" | 63 | prop="certNo" |
| 68 | - label="国际证书编号" | ||
| 69 | - width="120"> | 64 | + label="国际证书编号"> |
| 70 | </el-table-column> | 65 | </el-table-column> |
| 71 | <el-table-column | 66 | <el-table-column |
| 72 | prop="ownerCo" | 67 | prop="ownerCo" |
| 73 | - label="航空器所有人" | ||
| 74 | - width="120"> | 68 | + label="航空器所有人"> |
| 75 | </el-table-column> | 69 | </el-table-column> |
| 76 | <el-table-column | 70 | <el-table-column |
| 77 | prop="areoNationality" | 71 | prop="areoNationality" |
| 78 | - label="国籍" | ||
| 79 | - width="80"> | 72 | + label="国籍"> |
| 80 | </el-table-column> | 73 | </el-table-column> |
| 81 | <el-table-column | 74 | <el-table-column |
| 82 | prop="areoModel" | 75 | prop="areoModel" |
| 83 | - label="机型" | ||
| 84 | - width="80"> | 76 | + label="机型"> |
| 85 | </el-table-column> | 77 | </el-table-column> |
| 86 | <el-table-column | 78 | <el-table-column |
| 87 | prop="deliverDate" | 79 | prop="deliverDate" |
| @@ -90,10 +82,10 @@ | @@ -90,10 +82,10 @@ | ||
| 90 | </el-table-column> | 82 | </el-table-column> |
| 91 | <el-table-column | 83 | <el-table-column |
| 92 | prop="statusMsg" | 84 | prop="statusMsg" |
| 93 | - label="海关回执" | ||
| 94 | - width="120"> | 85 | + label="海关回执"> |
| 95 | </el-table-column> | 86 | </el-table-column> |
| 96 | <el-table-column | 87 | <el-table-column |
| 88 | + fixed="right" | ||
| 97 | prop="" | 89 | prop="" |
| 98 | label="报文操作" | 90 | label="报文操作" |
| 99 | width="150"> | 91 | width="150"> |
| @@ -11,11 +11,6 @@ | @@ -11,11 +11,6 @@ | ||
| 11 | <el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight" | 11 | <el-form :label-position="labelPosition" :model="queryArrival" :rules="rules" ref="queryFlight" |
| 12 | label-width="130px" class="demo-ruleForm"> | 12 | label-width="130px" class="demo-ruleForm"> |
| 13 | <el-col :span="6" > | 13 | <el-col :span="6" > |
| 14 | - <el-form-item label="承运人：" prop="awcd" label-width="80px"> | ||
| 15 | - <el-input v-model="queryArrival.awcd" style="width:190px"></el-input> | ||
| 16 | - </el-form-item> | ||
| 17 | - </el-col> | ||
| 18 | - <el-col :span="6" > | ||
| 19 | <el-form-item label="航班号：" prop="flightNo" label-width="80px"> | 14 | <el-form-item label="航班号：" prop="flightNo" label-width="80px"> |
| 20 | <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input> | 15 | <el-input v-model="queryArrival.flightNo" style="width:190px"></el-input> |
| 21 | </el-form-item> | 16 | </el-form-item> |
| @@ -25,13 +20,14 @@ | @@ -25,13 +20,14 @@ | ||
| 25 | <el-date-picker | 20 | <el-date-picker |
| 26 | v-model="queryArrival.flightDate" | 21 | v-model="queryArrival.flightDate" |
| 27 | type="date" | 22 | type="date" |
| 23 | + format="yyyyMMdd" | ||
| 28 | style="width:190px" | 24 | style="width:190px" |
| 29 | placeholder="选择日期"> | 25 | placeholder="选择日期"> |
| 30 | </el-date-picker> | 26 | </el-date-picker> |
| 31 | </el-form-item> | 27 | </el-form-item> |
| 32 | </el-col> | 28 | </el-col> |
| 33 | <el-col :span="5" > | 29 | <el-col :span="5" > |
| 34 | - <el-button type="primary" @click="submitForm('queryArrival')">查询</el-button> | 30 | + <el-button type="primary" @click="submitForm()">查询</el-button> |
| 35 | </el-col> | 31 | </el-col> |
| 36 | </el-form> | 32 | </el-form> |
| 37 | </el-row> | 33 | </el-row> |
| @@ -40,6 +36,7 @@ | @@ -40,6 +36,7 @@ | ||
| 40 | <el-table | 36 | <el-table |
| 41 | :data="tableData" | 37 | :data="tableData" |
| 42 | border | 38 | border |
| 39 | + v-loading="tableloading" | ||
| 43 | style="width: 100%;margin-bottom: 10px"> | 40 | style="width: 100%;margin-bottom: 10px"> |
| 44 | <el-table-column | 41 | <el-table-column |
| 45 | fixed="left" | 42 | fixed="left" |
| @@ -54,8 +51,7 @@ | @@ -54,8 +51,7 @@ | ||
| 54 | </el-table-column> | 51 | </el-table-column> |
| 55 | <el-table-column | 52 | <el-table-column |
| 56 | prop="flightNo" | 53 | prop="flightNo" |
| 57 | - label="航班号" | ||
| 58 | - width="80"> | 54 | + label="航班号"> |
| 59 | </el-table-column> | 55 | </el-table-column> |
| 60 | <el-table-column | 56 | <el-table-column |
| 61 | prop="flightDate" | 57 | prop="flightDate" |
| @@ -64,28 +60,23 @@ | @@ -64,28 +60,23 @@ | ||
| 64 | </el-table-column> | 60 | </el-table-column> |
| 65 | <el-table-column | 61 | <el-table-column |
| 66 | prop="aircraftNo" | 62 | prop="aircraftNo" |
| 67 | - label="航空器注册编码" | ||
| 68 | - width="120"> | 63 | + label="航空器注册编码"> |
| 69 | </el-table-column> | 64 | </el-table-column> |
| 70 | <el-table-column | 65 | <el-table-column |
| 71 | prop="departurePort" | 66 | prop="departurePort" |
| 72 | - label="出发港" | ||
| 73 | - width="80"> | 67 | + label="出发港"> |
| 74 | </el-table-column> | 68 | </el-table-column> |
| 75 | <el-table-column | 69 | <el-table-column |
| 76 | prop="arrivalPort" | 70 | prop="arrivalPort" |
| 77 | - label="目的港" | ||
| 78 | - width="80"> | 71 | + label="目的港"> |
| 79 | </el-table-column> | 72 | </el-table-column> |
| 80 | <el-table-column | 73 | <el-table-column |
| 81 | prop="customDistrictNo" | 74 | prop="customDistrictNo" |
| 82 | - label="关区代码" | ||
| 83 | - width="80"> | 75 | + label="关区代码"> |
| 84 | </el-table-column> | 76 | </el-table-column> |
| 85 | <el-table-column | 77 | <el-table-column |
| 86 | prop="transportflag" | 78 | prop="transportflag" |
| 87 | - label="运输计划" | ||
| 88 | - width="150"> | 79 | + label="运输计划"> |
| 89 | </el-table-column> | 80 | </el-table-column> |
| 90 | <el-table-column | 81 | <el-table-column |
| 91 | prop="departuredatetime" | 82 | prop="departuredatetime" |
| @@ -94,13 +85,12 @@ | @@ -94,13 +85,12 @@ | ||
| 94 | </el-table-column> | 85 | </el-table-column> |
| 95 | <el-table-column | 86 | <el-table-column |
| 96 | prop="statusMsg" | 87 | prop="statusMsg" |
| 97 | - label="海关回执" | ||
| 98 | - width="150"> | 88 | + label="海关回执"> |
| 99 | </el-table-column> | 89 | </el-table-column> |
| 100 | <el-table-column | 90 | <el-table-column |
| 91 | + fixed="right" | ||
| 101 | prop="" | 92 | prop="" |
| 102 | - label="报文操作" | ||
| 103 | - width="150"> | 93 | + label="报文操作"> |
| 104 | <template slot-scope="scope"> | 94 | <template slot-scope="scope"> |
| 105 | <el-button | 95 | <el-button |
| 106 | size="mini" | 96 | size="mini" |
| @@ -122,10 +112,10 @@ | @@ -122,10 +112,10 @@ | ||
| 122 | @size-change="handleSizeChange" | 112 | @size-change="handleSizeChange" |
| 123 | @current-change="handleCurrentChange" | 113 | @current-change="handleCurrentChange" |
| 124 | :current-page="currentPage" | 114 | :current-page="currentPage" |
| 125 | - :page-sizes="[100, 200, 300, 400]" | ||
| 126 | - :page-size="100" | 115 | + :page-sizes="[10, 20, 30, 40]" |
| 116 | + :page-size="pageSize" | ||
| 127 | layout="total, sizes, prev, pager, next, jumper" | 117 | layout="total, sizes, prev, pager, next, jumper" |
| 128 | - :total="400"> | 118 | + :total="total"> |
| 129 | </el-pagination> | 119 | </el-pagination> |
| 130 | </div> | 120 | </div> |
| 131 | </el-row> | 121 | </el-row> |
| @@ -151,37 +141,91 @@ | @@ -151,37 +141,91 @@ | ||
| 151 | 141 | ||
| 152 | </style> | 142 | </style> |
| 153 | <script> | 143 | <script> |
| 144 | + import {editPrediction, selectPrediction} from "../../api/transport"; | ||
| 145 | + | ||
| 154 | export default { | 146 | export default { |
| 155 | data(){ | 147 | data(){ |
| 156 | return{ | 148 | return{ |
| 157 | queryArrival:{ | 149 | queryArrival:{ |
| 158 | - awcd:undefined, | ||
| 159 | flightNo:undefined, | 150 | flightNo:undefined, |
| 160 | flightDate:undefined, | 151 | flightDate:undefined, |
| 161 | }, | 152 | }, |
| 162 | - rules:{ | ||
| 163 | - awcd: [ | ||
| 164 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 165 | - ], | ||
| 166 | - flightNo: [ | ||
| 167 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 168 | - ], | ||
| 169 | - flightDate: [ | ||
| 170 | - {required: true, message: '请选择', trigger: 'change'} | ||
| 171 | - ], | ||
| 172 | - }, | 153 | + rules: {}, |
| 173 | labelPosition:'left', | 154 | labelPosition:'left', |
| 174 | - currentPage: 4, | ||
| 175 | - tableData:[] | 155 | + currentPage: 1, |
| 156 | + pageSize:10, | ||
| 157 | + total:0, | ||
| 158 | + tableData:[], | ||
| 159 | + tableloading:false | ||
| 176 | } | 160 | } |
| 177 | }, | 161 | }, |
| 178 | methods: { | 162 | methods: { |
| 163 | + //分页 | ||
| 179 | handleSizeChange(val) { | 164 | handleSizeChange(val) { |
| 180 | - console.log(`每页 ${val} 条`); | 165 | + this.pageSize=val; |
| 181 | }, | 166 | }, |
| 182 | handleCurrentChange(val) { | 167 | handleCurrentChange(val) { |
| 183 | - console.log(`当前页: ${val}`); | ||
| 184 | - } | 168 | + this.currentPage=val; |
| 169 | + this.submitForm(); | ||
| 170 | + }, | ||
| 171 | + //获取进港预报查询列表 | ||
| 172 | + submitForm() { | ||
| 173 | + let params = { | ||
| 174 | + currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo, | ||
| 175 | + flightDate: this.queryArrival.flightDate | ||
| 176 | + }; | ||
| 177 | + this.tableloading = true; | ||
| 178 | + selectPrediction(params).then(res => { | ||
| 179 | + let response = res.data.data; | ||
| 180 | + this.tableData = response.list; | ||
| 181 | + this.tableloading = false; | ||
| 182 | + this.total = response.total; | ||
| 183 | + }); | ||
| 184 | + }, | ||
| 185 | + //列表删除功能 | ||
| 186 | + handleDel(index, row) { | ||
| 187 | + this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { | ||
| 188 | + confirmButtonText: '确定', | ||
| 189 | + cancelButtonText: '取消', | ||
| 190 | + type: 'warning' | ||
| 191 | + }).then(() => { | ||
| 192 | + editPrediction(row).then(res => { | ||
| 193 | + let response = res.data; | ||
| 194 | + if (response.code == '200') { | ||
| 195 | + this.$message({ | ||
| 196 | + type: 'info', | ||
| 197 | + message: '删除成功' | ||
| 198 | + }); | ||
| 199 | + this.submitForm(); | ||
| 200 | + } else { | ||
| 201 | + this.$message({ | ||
| 202 | + type: 'info', | ||
| 203 | + message: '删除失败' | ||
| 204 | + }); | ||
| 205 | + } | ||
| 206 | + }); | ||
| 207 | + }).catch(() => { | ||
| 208 | + this.$message({ | ||
| 209 | + type: 'info', | ||
| 210 | + message: '已取消删除' | ||
| 211 | + }); | ||
| 212 | + }); | ||
| 213 | + }, | ||
| 214 | + //获取默认值 | ||
| 215 | + defaultData() { | ||
| 216 | + this.flightNo = JSON.parse(this.$route.query.flightNo); | ||
| 217 | + this.flightDate = JSON.parse(this.$route.query.flightDate); | ||
| 218 | + }, | ||
| 219 | + //编辑进港预报 | ||
| 220 | + handleEdit(index,row){ | ||
| 221 | + this.$router.push({path:'/arrival',query: row}) | ||
| 222 | + }, | ||
| 223 | + | ||
| 185 | }, | 224 | }, |
| 225 | + //渲染方法 | ||
| 226 | + mounted(){ | ||
| 227 | + this.defaultData(); | ||
| 228 | + this.submitForm(); | ||
| 229 | + } | ||
| 186 | } | 230 | } |
| 187 | </script> | 231 | </script> |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <!-- 搜索区域--> | 9 | <!-- 搜索区域--> |
| 10 | <el-row> | 10 | <el-row> |
| 11 | - <el-form :label-position="labelPosition" :model="queryConfigure" :rules="rules" ref="queryFlight" | 11 | + <el-form :label-position="labelPosition" :model="queryConfigure" ref="queryFlight" |
| 12 | label-width="130px" class="demo-ruleForm"> | 12 | label-width="130px" class="demo-ruleForm"> |
| 13 | 13 | ||
| 14 | <el-col :span="6" > | 14 | <el-col :span="6" > |
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | </el-form-item> | 17 | </el-form-item> |
| 18 | </el-col> | 18 | </el-col> |
| 19 | <el-col :span="5" > | 19 | <el-col :span="5" > |
| 20 | - <el-button type="primary" @click="submitForm('queryConfigure')">查询</el-button> | 20 | + <el-button type="primary" @click="submitForm()">查询</el-button> |
| 21 | </el-col> | 21 | </el-col> |
| 22 | </el-form> | 22 | </el-form> |
| 23 | </el-row> | 23 | </el-row> |
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | <el-table | 26 | <el-table |
| 27 | :data="tableData" | 27 | :data="tableData" |
| 28 | border | 28 | border |
| 29 | + v-loading="tableloading" | ||
| 29 | style="width: 100%;margin-bottom: 10px"> | 30 | style="width: 100%;margin-bottom: 10px"> |
| 30 | <el-table-column | 31 | <el-table-column |
| 31 | fixed="left" | 32 | fixed="left" |
| @@ -40,23 +41,19 @@ | @@ -40,23 +41,19 @@ | ||
| 40 | </el-table-column> | 41 | </el-table-column> |
| 41 | <el-table-column | 42 | <el-table-column |
| 42 | prop="username" | 43 | prop="username" |
| 43 | - label="用户名" | ||
| 44 | - width="120"> | 44 | + label="用户名"> |
| 45 | </el-table-column> | 45 | </el-table-column> |
| 46 | <el-table-column | 46 | <el-table-column |
| 47 | prop="flightno" | 47 | prop="flightno" |
| 48 | - label="航班号" | ||
| 49 | - width="80"> | 48 | + label="航班号"> |
| 50 | </el-table-column> | 49 | </el-table-column> |
| 51 | <el-table-column | 50 | <el-table-column |
| 52 | prop="ietype" | 51 | prop="ietype" |
| 53 | - label="进出港" | ||
| 54 | - width="80"> | 52 | + label="进出港"> |
| 55 | </el-table-column> | 53 | </el-table-column> |
| 56 | <el-table-column | 54 | <el-table-column |
| 57 | prop="createby" | 55 | prop="createby" |
| 58 | - label="创建人" | ||
| 59 | - width="120"> | 56 | + label="创建人"> |
| 60 | </el-table-column> | 57 | </el-table-column> |
| 61 | <el-table-column | 58 | <el-table-column |
| 62 | prop="createtime" | 59 | prop="createtime" |
| @@ -65,8 +62,7 @@ | @@ -65,8 +62,7 @@ | ||
| 65 | </el-table-column> | 62 | </el-table-column> |
| 66 | <el-table-column | 63 | <el-table-column |
| 67 | prop="updateby" | 64 | prop="updateby" |
| 68 | - label="更新人" | ||
| 69 | - width="120"> | 65 | + label="更新人"> |
| 70 | </el-table-column> | 66 | </el-table-column> |
| 71 | <el-table-column | 67 | <el-table-column |
| 72 | prop="updatetime" | 68 | prop="updatetime" |
| @@ -74,6 +70,7 @@ | @@ -74,6 +70,7 @@ | ||
| 74 | width="120"> | 70 | width="120"> |
| 75 | </el-table-column> | 71 | </el-table-column> |
| 76 | <el-table-column | 72 | <el-table-column |
| 73 | + fixed="right" | ||
| 77 | prop="" | 74 | prop="" |
| 78 | label="报文操作" | 75 | label="报文操作" |
| 79 | width="150"> | 76 | width="150"> |
| @@ -98,10 +95,10 @@ | @@ -98,10 +95,10 @@ | ||
| 98 | @size-change="handleSizeChange" | 95 | @size-change="handleSizeChange" |
| 99 | @current-change="handleCurrentChange" | 96 | @current-change="handleCurrentChange" |
| 100 | :current-page="currentPage" | 97 | :current-page="currentPage" |
| 101 | - :page-sizes="[100, 200, 300, 400]" | ||
| 102 | - :page-size="100" | 98 | + :page-sizes="[10, 20, 30, 40]" |
| 99 | + :page-size="pageSize" | ||
| 103 | layout="total, sizes, prev, pager, next, jumper" | 100 | layout="total, sizes, prev, pager, next, jumper" |
| 104 | - :total="400"> | 101 | + :total="total"> |
| 105 | </el-pagination> | 102 | </el-pagination> |
| 106 | </div> | 103 | </div> |
| 107 | </el-row> | 104 | </el-row> |
| @@ -127,29 +124,86 @@ | @@ -127,29 +124,86 @@ | ||
| 127 | 124 | ||
| 128 | </style> | 125 | </style> |
| 129 | <script> | 126 | <script> |
| 127 | + import {editSchedule, selectSchedule} from "../../api/transport"; | ||
| 128 | + | ||
| 130 | export default { | 129 | export default { |
| 131 | data(){ | 130 | data(){ |
| 132 | return{ | 131 | return{ |
| 133 | queryConfigure:{ | 132 | queryConfigure:{ |
| 134 | flightNo:undefined, | 133 | flightNo:undefined, |
| 135 | }, | 134 | }, |
| 136 | - rules:{ | ||
| 137 | - flightNo: [ | ||
| 138 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 139 | - ], | ||
| 140 | - }, | ||
| 141 | labelPosition:'left', | 135 | labelPosition:'left', |
| 142 | - currentPage: 4, | 136 | + currentPage: 1, |
| 137 | + pageSize:10, | ||
| 138 | + total:0, | ||
| 139 | + tableloading:false, | ||
| 143 | tableData:[] | 140 | tableData:[] |
| 144 | } | 141 | } |
| 145 | }, | 142 | }, |
| 146 | methods: { | 143 | methods: { |
| 144 | + //分页 | ||
| 147 | handleSizeChange(val) { | 145 | handleSizeChange(val) { |
| 148 | - console.log(`每页 ${val} 条`); | 146 | + this.pageSize=val; |
| 149 | }, | 147 | }, |
| 150 | handleCurrentChange(val) { | 148 | handleCurrentChange(val) { |
| 151 | - console.log(`当前页: ${val}`); | ||
| 152 | - } | 149 | + this.currentPage=val; |
| 150 | + this.submitForm(); | ||
| 151 | + }, | ||
| 152 | + //获取进港航班配置查询列表 | ||
| 153 | + submitForm() { | ||
| 154 | + let params = { | ||
| 155 | + currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo, | ||
| 156 | + }; | ||
| 157 | + this.tableloading = true; | ||
| 158 | + selectSchedule(params).then(res => { | ||
| 159 | + let response = res.data.data; | ||
| 160 | + this.tableData = response.list; | ||
| 161 | + this.tableloading = false; | ||
| 162 | + this.total = response.total; | ||
| 163 | + }); | ||
| 164 | + }, | ||
| 165 | + //列表删除功能 | ||
| 166 | + handleDel(index, row) { | ||
| 167 | + this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { | ||
| 168 | + confirmButtonText: '确定', | ||
| 169 | + cancelButtonText: '取消', | ||
| 170 | + type: 'warning' | ||
| 171 | + }).then(() => { | ||
| 172 | + editSchedule(row).then(res => { | ||
| 173 | + let response = res.data; | ||
| 174 | + if (response.code == '200') { | ||
| 175 | + this.$message({ | ||
| 176 | + type: 'info', | ||
| 177 | + message: '删除成功' | ||
| 178 | + }); | ||
| 179 | + this.submitForm(); | ||
| 180 | + } else { | ||
| 181 | + this.$message({ | ||
| 182 | + type: 'info', | ||
| 183 | + message: '删除失败' | ||
| 184 | + }); | ||
| 185 | + } | ||
| 186 | + }); | ||
| 187 | + }).catch(() => { | ||
| 188 | + this.$message({ | ||
| 189 | + type: 'info', | ||
| 190 | + message: '已取消删除' | ||
| 191 | + }); | ||
| 192 | + }); | ||
| 193 | + }, | ||
| 194 | + //获取默认值 | ||
| 195 | + defaultData() { | ||
| 196 | + this.flightNo = JSON.parse(this.$route.query.flightNo); | ||
| 197 | + }, | ||
| 198 | + //编辑进港航班配置 | ||
| 199 | + handleEdit(index,row){ | ||
| 200 | + this.$router.push({path:'/configure',query: row}) | ||
| 201 | + }, | ||
| 153 | }, | 202 | }, |
| 203 | + //渲染方法 | ||
| 204 | + mounted(){ | ||
| 205 | + this.defaultData(); | ||
| 206 | + this.submitForm(); | ||
| 207 | + } | ||
| 154 | } | 208 | } |
| 155 | </script> | 209 | </script> |
| @@ -8,14 +8,9 @@ | @@ -8,14 +8,9 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <!-- 搜索区域--> | 9 | <!-- 搜索区域--> |
| 10 | <el-row> | 10 | <el-row> |
| 11 | - <el-form :label-position="labelPosition" :model="queryConfirmatory" :rules="rules" ref="queryFlight" | 11 | + <el-form :label-position="labelPosition" :model="queryConfirmatory" ref="queryFlight" |
| 12 | label-width="130px" class="demo-ruleForm"> | 12 | label-width="130px" class="demo-ruleForm"> |
| 13 | <el-col :span="6" > | 13 | <el-col :span="6" > |
| 14 | - <el-form-item label="承运人：" prop="awcd" label-width="80px"> | ||
| 15 | - <el-input v-model="queryConfirmatory.awcd" style="width:190px"></el-input> | ||
| 16 | - </el-form-item> | ||
| 17 | - </el-col> | ||
| 18 | - <el-col :span="6" > | ||
| 19 | <el-form-item label="航班号：" prop="flightNo" label-width="80px"> | 14 | <el-form-item label="航班号：" prop="flightNo" label-width="80px"> |
| 20 | <el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input> | 15 | <el-input v-model="queryConfirmatory.flightNo" style="width:190px"></el-input> |
| 21 | </el-form-item> | 16 | </el-form-item> |
| @@ -25,13 +20,14 @@ | @@ -25,13 +20,14 @@ | ||
| 25 | <el-date-picker | 20 | <el-date-picker |
| 26 | v-model="queryConfirmatory.flightDate" | 21 | v-model="queryConfirmatory.flightDate" |
| 27 | type="date" | 22 | type="date" |
| 23 | + format="yyyyMMdd" | ||
| 28 | style="width:190px" | 24 | style="width:190px" |
| 29 | placeholder="选择日期"> | 25 | placeholder="选择日期"> |
| 30 | </el-date-picker> | 26 | </el-date-picker> |
| 31 | </el-form-item> | 27 | </el-form-item> |
| 32 | </el-col> | 28 | </el-col> |
| 33 | <el-col :span="5" > | 29 | <el-col :span="5" > |
| 34 | - <el-button type="primary" @click="submitForm('queryConfirmatory')">查询</el-button> | 30 | + <el-button type="primary" @click="submitForm()">查询</el-button> |
| 35 | </el-col> | 31 | </el-col> |
| 36 | </el-form> | 32 | </el-form> |
| 37 | </el-row> | 33 | </el-row> |
| @@ -40,6 +36,7 @@ | @@ -40,6 +36,7 @@ | ||
| 40 | <el-table | 36 | <el-table |
| 41 | :data="tableData" | 37 | :data="tableData" |
| 42 | border | 38 | border |
| 39 | + v-loading="tableloading" | ||
| 43 | style="width: 100%;margin-bottom: 10px"> | 40 | style="width: 100%;margin-bottom: 10px"> |
| 44 | <el-table-column | 41 | <el-table-column |
| 45 | fixed="left" | 42 | fixed="left" |
| @@ -54,8 +51,7 @@ | @@ -54,8 +51,7 @@ | ||
| 54 | </el-table-column> | 51 | </el-table-column> |
| 55 | <el-table-column | 52 | <el-table-column |
| 56 | prop="flightNo" | 53 | prop="flightNo" |
| 57 | - label="航班号" | ||
| 58 | - width="80"> | 54 | + label="航班号"> |
| 59 | </el-table-column> | 55 | </el-table-column> |
| 60 | <el-table-column | 56 | <el-table-column |
| 61 | prop="flightDate" | 57 | prop="flightDate" |
| @@ -64,23 +60,19 @@ | @@ -64,23 +60,19 @@ | ||
| 64 | </el-table-column> | 60 | </el-table-column> |
| 65 | <el-table-column | 61 | <el-table-column |
| 66 | prop="aircraftNo" | 62 | prop="aircraftNo" |
| 67 | - label="航空器注册编码" | ||
| 68 | - width="120"> | 63 | + label="航空器注册编码"> |
| 69 | </el-table-column> | 64 | </el-table-column> |
| 70 | <el-table-column | 65 | <el-table-column |
| 71 | prop="arrivalPort" | 66 | prop="arrivalPort" |
| 72 | - label="目的港" | ||
| 73 | - width="80"> | 67 | + label="目的港"> |
| 74 | </el-table-column> | 68 | </el-table-column> |
| 75 | <el-table-column | 69 | <el-table-column |
| 76 | prop="customDistrictNo" | 70 | prop="customDistrictNo" |
| 77 | - label="关区代码" | ||
| 78 | - width="80"> | 71 | + label="关区代码"> |
| 79 | </el-table-column> | 72 | </el-table-column> |
| 80 | <el-table-column | 73 | <el-table-column |
| 81 | prop="transportflag" | 74 | prop="transportflag" |
| 82 | - label="运输计划" | ||
| 83 | - width="80"> | 75 | + label="运输计划"> |
| 84 | </el-table-column> | 76 | </el-table-column> |
| 85 | <el-table-column | 77 | <el-table-column |
| 86 | prop="departuredatetime" | 78 | prop="departuredatetime" |
| @@ -94,10 +86,10 @@ | @@ -94,10 +86,10 @@ | ||
| 94 | </el-table-column> | 86 | </el-table-column> |
| 95 | <el-table-column | 87 | <el-table-column |
| 96 | prop="statusMsg" | 88 | prop="statusMsg" |
| 97 | - label="海关回执" | ||
| 98 | - width="150"> | 89 | + label="海关回执"> |
| 99 | </el-table-column> | 90 | </el-table-column> |
| 100 | <el-table-column | 91 | <el-table-column |
| 92 | + fixed="right" | ||
| 101 | prop="" | 93 | prop="" |
| 102 | label="报文操作" | 94 | label="报文操作" |
| 103 | width="150"> | 95 | width="150"> |
| @@ -122,10 +114,10 @@ | @@ -122,10 +114,10 @@ | ||
| 122 | @size-change="handleSizeChange" | 114 | @size-change="handleSizeChange" |
| 123 | @current-change="handleCurrentChange" | 115 | @current-change="handleCurrentChange" |
| 124 | :current-page="currentPage" | 116 | :current-page="currentPage" |
| 125 | - :page-sizes="[100, 200, 300, 400]" | ||
| 126 | - :page-size="100" | 117 | + :page-sizes="[10, 20, 30, 40]" |
| 118 | + :page-size="pageSize" | ||
| 127 | layout="total, sizes, prev, pager, next, jumper" | 119 | layout="total, sizes, prev, pager, next, jumper" |
| 128 | - :total="400"> | 120 | + :total="total"> |
| 129 | </el-pagination> | 121 | </el-pagination> |
| 130 | </div> | 122 | </div> |
| 131 | </el-row> | 123 | </el-row> |
| @@ -151,37 +143,88 @@ | @@ -151,37 +143,88 @@ | ||
| 151 | 143 | ||
| 152 | </style> | 144 | </style> |
| 153 | <script> | 145 | <script> |
| 146 | + import {editConfirm, selectConfirm} from "../../api/transport"; | ||
| 147 | + | ||
| 154 | export default { | 148 | export default { |
| 155 | data(){ | 149 | data(){ |
| 156 | return{ | 150 | return{ |
| 157 | queryConfirmatory:{ | 151 | queryConfirmatory:{ |
| 158 | - awcd:undefined, | ||
| 159 | flightNo:undefined, | 152 | flightNo:undefined, |
| 160 | flightDate:undefined, | 153 | flightDate:undefined, |
| 161 | }, | 154 | }, |
| 162 | - rules:{ | ||
| 163 | - awcd: [ | ||
| 164 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 165 | - ], | ||
| 166 | - flightNo: [ | ||
| 167 | - {required: true, message: '请输入', trigger: 'blur'} | ||
| 168 | - ], | ||
| 169 | - flightDate: [ | ||
| 170 | - {required: true, message: '请选择', trigger: 'change'} | ||
| 171 | - ], | ||
| 172 | - }, | ||
| 173 | labelPosition:'left', | 155 | labelPosition:'left', |
| 174 | - currentPage: 4, | 156 | + currentPage: 1, |
| 157 | + pageSize:10, | ||
| 158 | + total:0, | ||
| 159 | + tableloading:false, | ||
| 175 | tableData:[] | 160 | tableData:[] |
| 176 | } | 161 | } |
| 177 | }, | 162 | }, |
| 178 | methods: { | 163 | methods: { |
| 164 | + //分页 | ||
| 179 | handleSizeChange(val) { | 165 | handleSizeChange(val) { |
| 180 | - console.log(`每页 ${val} 条`); | 166 | + this.pageSize=val; |
| 181 | }, | 167 | }, |
| 182 | handleCurrentChange(val) { | 168 | handleCurrentChange(val) { |
| 183 | - console.log(`当前页: ${val}`); | ||
| 184 | - } | 169 | + this.currentPage=val; |
| 170 | + this.submitForm(); | ||
| 171 | + }, | ||
| 172 | + //获取进港确报查询列表 | ||
| 173 | + submitForm() { | ||
| 174 | + let params = { | ||
| 175 | + currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo, | ||
| 176 | + flightDate: this.queryConfirmatory.flightDate | ||
| 177 | + }; | ||
| 178 | + this.tableloading = true; | ||
| 179 | + selectConfirm(params).then(res => { | ||
| 180 | + let response = res.data.data; | ||
| 181 | + this.tableData = response.list; | ||
| 182 | + this.tableloading = false; | ||
| 183 | + this.total = response.total; | ||
| 184 | + }); | ||
| 185 | + }, | ||
| 186 | + //列表删除功能 | ||
| 187 | + handleDel(index, row) { | ||
| 188 | + this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { | ||
| 189 | + confirmButtonText: '确定', | ||
| 190 | + cancelButtonText: '取消', | ||
| 191 | + type: 'warning' | ||
| 192 | + }).then(() => { | ||
| 193 | + editConfirm(row).then(res => { | ||
| 194 | + let response = res.data; | ||
| 195 | + if (response.code == '200') { | ||
| 196 | + this.$message({ | ||
| 197 | + type: 'info', | ||
| 198 | + message: '删除成功' | ||
| 199 | + }); | ||
| 200 | + this.submitForm(); | ||
| 201 | + } else { | ||
| 202 | + this.$message({ | ||
| 203 | + type: 'info', | ||
| 204 | + message: '删除失败' | ||
| 205 | + }); | ||
| 206 | + } | ||
| 207 | + }); | ||
| 208 | + }).catch(() => { | ||
| 209 | + this.$message({ | ||
| 210 | + type: 'info', | ||
| 211 | + message: '已取消删除' | ||
| 212 | + }); | ||
| 213 | + }); | ||
| 214 | + }, | ||
| 215 | + //获取默认值 | ||
| 216 | + defaultData() { | ||
| 217 | + this.flightNo = JSON.parse(this.$route.query.flightNo); | ||
| 218 | + }, | ||
| 219 | + //编辑进港确报 | ||
| 220 | + handleEdit(index,row){ | ||
| 221 | + this.$router.push({path:'/confirmatory',query: row}) | ||
| 222 | + }, | ||
| 185 | }, | 223 | }, |
| 224 | + //渲染方法 | ||
| 225 | + mounted(){ | ||
| 226 | + this.defaultData(); | ||
| 227 | + this.submitForm(); | ||
| 228 | + } | ||
| 186 | } | 229 | } |
| 187 | </script> | 230 | </script> |
| @@ -10,18 +10,18 @@ | @@ -10,18 +10,18 @@ | ||
| 10 | <el-row> | 10 | <el-row> |
| 11 | <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight" | 11 | <el-form :label-position="labelPosition" :model="queryFlight" :rules="rules" ref="queryFlight" |
| 12 | label-width="130px" class="demo-ruleForm"> | 12 | label-width="130px" class="demo-ruleForm"> |
| 13 | - <el-col :span="8"> | ||
| 14 | - <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px"> | ||
| 15 | - <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input> | ||
| 16 | - </el-form-item> | ||
| 17 | - </el-col> | ||
| 18 | <el-col :span="8" > | 13 | <el-col :span="8" > |
| 19 | <el-form-item label="航班号：" prop="aircraftNo" label-width="80px"> | 14 | <el-form-item label="航班号：" prop="aircraftNo" label-width="80px"> |
| 20 | <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input> | 15 | <el-input v-model="queryFlight.aircraftNo" style="width:190px"></el-input> |
| 21 | </el-form-item> | 16 | </el-form-item> |
| 22 | </el-col> | 17 | </el-col> |
| 18 | + <el-col :span="8"> | ||
| 19 | + <el-form-item label="航空公司代码：" prop="flightNo" label-width="110px"> | ||
| 20 | + <el-input v-model="queryFlight.flightNo" style="width:190px"></el-input> | ||
| 21 | + </el-form-item> | ||
| 22 | + </el-col> | ||
| 23 | <el-col :span="6" > | 23 | <el-col :span="6" > |
| 24 | - <el-button type="primary" @click="submitForm('queryFlight')">查询</el-button> | 24 | + <el-button type="primary" @click="submitForm()">查询</el-button> |
| 25 | </el-col> | 25 | </el-col> |
| 26 | </el-form> | 26 | </el-form> |
| 27 | </el-row> | 27 | </el-row> |
| @@ -45,50 +45,42 @@ | @@ -45,50 +45,42 @@ | ||
| 45 | </el-table-column> | 45 | </el-table-column> |
| 46 | <el-table-column | 46 | <el-table-column |
| 47 | prop="flightNo" | 47 | prop="flightNo" |
| 48 | - label="航班号" | ||
| 49 | - width="80"> | 48 | + label="航班号"> |
| 50 | </el-table-column> | 49 | </el-table-column> |
| 51 | <el-table-column | 50 | <el-table-column |
| 52 | prop="airwayCode" | 51 | prop="airwayCode" |
| 53 | - label="航空公司代码" | ||
| 54 | - width="120"> | 52 | + label="航空公司代码"> |
| 55 | </el-table-column> | 53 | </el-table-column> |
| 56 | <el-table-column | 54 | <el-table-column |
| 57 | prop="flightDate" | 55 | prop="flightDate" |
| 58 | - label="航空公司中文" | ||
| 59 | - width="150"> | 56 | + label="航空公司中文"> |
| 60 | </el-table-column> | 57 | </el-table-column> |
| 61 | <el-table-column | 58 | <el-table-column |
| 62 | prop="transportAgentCode" | 59 | prop="transportAgentCode" |
| 63 | - label="传输代理人" | ||
| 64 | - width="120"> | 60 | + label="传输代理人"> |
| 65 | </el-table-column> | 61 | </el-table-column> |
| 66 | <el-table-column | 62 | <el-table-column |
| 67 | prop="groundAgentCode" | 63 | prop="groundAgentCode" |
| 68 | - label="地面代理人" | ||
| 69 | - width="120"> | 64 | + label="地面代理人"> |
| 70 | </el-table-column> | 65 | </el-table-column> |
| 71 | <el-table-column | 66 | <el-table-column |
| 72 | prop="linesType" | 67 | prop="linesType" |
| 73 | - label="运输计划" | ||
| 74 | - width="150"> | 68 | + label="运输计划"> |
| 75 | </el-table-column> | 69 | </el-table-column> |
| 76 | <el-table-column | 70 | <el-table-column |
| 77 | prop="flightType" | 71 | prop="flightType" |
| 78 | - label="航班性质" | ||
| 79 | - width="80"> | 72 | + label="航班性质"> |
| 80 | </el-table-column> | 73 | </el-table-column> |
| 81 | <el-table-column | 74 | <el-table-column |
| 82 | prop="shareFlightNo" | 75 | prop="shareFlightNo" |
| 83 | - label="共享航班号" | ||
| 84 | - width="150"> | 76 | + label="共享航班号"> |
| 85 | </el-table-column> | 77 | </el-table-column> |
| 86 | <el-table-column | 78 | <el-table-column |
| 87 | prop="statusMsg" | 79 | prop="statusMsg" |
| 88 | - label="海关回执" | ||
| 89 | - width="150"> | 80 | + label="海关回执"> |
| 90 | </el-table-column> | 81 | </el-table-column> |
| 91 | <el-table-column | 82 | <el-table-column |
| 83 | + fixed="right" | ||
| 92 | prop="" | 84 | prop="" |
| 93 | label="报文操作" | 85 | label="报文操作" |
| 94 | width="150"> | 86 | width="150"> |
| @@ -199,9 +191,8 @@ | @@ -199,9 +191,8 @@ | ||
| 199 | }, | 191 | }, |
| 200 | //获取默认值 | 192 | //获取默认值 |
| 201 | defaultData(){ | 193 | defaultData(){ |
| 202 | - this.flightNo=JSON.parse(this.$route.query.flightNo); | ||
| 203 | - this.aircraftNo=JSON.parse(this.$route.query.aircraftNo); | ||
| 204 | - | 194 | + this.flightNo = JSON.parse(this.$route.query.flightNo); |
| 195 | + this.aircraftNo = JSON.parse(this.$route.query.aircraftNo); | ||
| 205 | }, | 196 | }, |
| 206 | //列表删除功能 | 197 | //列表删除功能 |
| 207 | handleDel(index,row){ | 198 | handleDel(index,row){ |
| @@ -40,23 +40,19 @@ | @@ -40,23 +40,19 @@ | ||
| 40 | </el-table-column> | 40 | </el-table-column> |
| 41 | <el-table-column | 41 | <el-table-column |
| 42 | prop="username" | 42 | prop="username" |
| 43 | - label="用户名" | ||
| 44 | - width="120"> | 43 | + label="用户名"> |
| 45 | </el-table-column> | 44 | </el-table-column> |
| 46 | <el-table-column | 45 | <el-table-column |
| 47 | prop="flightno" | 46 | prop="flightno" |
| 48 | - label="航班号" | ||
| 49 | - width="80"> | 47 | + label="航班号"> |
| 50 | </el-table-column> | 48 | </el-table-column> |
| 51 | <el-table-column | 49 | <el-table-column |
| 52 | prop="ietype" | 50 | prop="ietype" |
| 53 | - label="进出港" | ||
| 54 | - width="80"> | 51 | + label="进出港"> |
| 55 | </el-table-column> | 52 | </el-table-column> |
| 56 | <el-table-column | 53 | <el-table-column |
| 57 | prop="createby" | 54 | prop="createby" |
| 58 | - label="创建人" | ||
| 59 | - width="120"> | 55 | + label="创建人"> |
| 60 | </el-table-column> | 56 | </el-table-column> |
| 61 | <el-table-column | 57 | <el-table-column |
| 62 | prop="createtime" | 58 | prop="createtime" |
| @@ -65,8 +61,7 @@ | @@ -65,8 +61,7 @@ | ||
| 65 | </el-table-column> | 61 | </el-table-column> |
| 66 | <el-table-column | 62 | <el-table-column |
| 67 | prop="updateby" | 63 | prop="updateby" |
| 68 | - label="更新人" | ||
| 69 | - width="120"> | 64 | + label="更新人"> |
| 70 | </el-table-column> | 65 | </el-table-column> |
| 71 | <el-table-column | 66 | <el-table-column |
| 72 | prop="updatetime" | 67 | prop="updatetime" |
| @@ -74,6 +69,7 @@ | @@ -74,6 +69,7 @@ | ||
| 74 | width="120"> | 69 | width="120"> |
| 75 | </el-table-column> | 70 | </el-table-column> |
| 76 | <el-table-column | 71 | <el-table-column |
| 72 | + fixed="right" | ||
| 77 | prop="" | 73 | prop="" |
| 78 | label="报文操作" | 74 | label="报文操作" |
| 79 | width="150"> | 75 | width="150"> |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <!-- 搜索区域--> | 9 | <!-- 搜索区域--> |
| 10 | <el-row> | 10 | <el-row> |
| 11 | - <el-form :label-position="labelPosition" :model="queryFlightplan" :rules="rules" ref="queryFlightplan" | 11 | + <el-form :label-position="labelPosition" :model="queryFlightplan" ref="queryFlightplan" |
| 12 | label-width="130px" class="demo-ruleForm"> | 12 | label-width="130px" class="demo-ruleForm"> |
| 13 | <el-col :span="6" > | 13 | <el-col :span="6" > |
| 14 | <el-form-item label="承运人:" prop="awcd" label-width="110px"> | 14 | <el-form-item label="承运人:" prop="awcd" label-width="110px"> |
| @@ -56,60 +56,52 @@ | @@ -56,60 +56,52 @@ | ||
| 56 | </el-table-column> | 56 | </el-table-column> |
| 57 | <el-table-column | 57 | <el-table-column |
| 58 | prop="flightNo" | 58 | prop="flightNo" |
| 59 | - label="航班号" | ||
| 60 | - width="80"> | 59 | + label="航班号"> |
| 61 | </el-table-column> | 60 | </el-table-column> |
| 62 | <el-table-column | 61 | <el-table-column |
| 63 | prop="flightDate" | 62 | prop="flightDate" |
| 64 | - label="航班日期" | ||
| 65 | - width="150"> | 63 | + label="航班日期"> |
| 66 | </el-table-column> | 64 | </el-table-column> |
| 67 | <el-table-column | 65 | <el-table-column |
| 68 | prop="departurePort" | 66 | prop="departurePort" |
| 69 | - label="出发港" | ||
| 70 | - width="80"> | 67 | + label="出发港"> |
| 71 | </el-table-column> | 68 | </el-table-column> |
| 72 | <el-table-column | 69 | <el-table-column |
| 73 | prop="departureCustomNo" | 70 | prop="departureCustomNo" |
| 74 | - label="关区代码" | ||
| 75 | - width="80"> | 71 | + label="关区代码"> |
| 76 | </el-table-column> | 72 | </el-table-column> |
| 77 | <el-table-column | 73 | <el-table-column |
| 78 | prop="arrivalPort" | 74 | prop="arrivalPort" |
| 79 | - label="目的港" | ||
| 80 | - width="80"> | 75 | + label="目的港"> |
| 81 | </el-table-column> | 76 | </el-table-column> |
| 82 | <el-table-column | 77 | <el-table-column |
| 83 | prop="arrivalCustomNo" | 78 | prop="arrivalCustomNo" |
| 84 | - label="关区代码" | ||
| 85 | - width="80"> | 79 | + label="关区代码"> |
| 86 | </el-table-column> | 80 | </el-table-column> |
| 87 | <el-table-column | 81 | <el-table-column |
| 88 | prop="currentTakeoffTime" | 82 | prop="currentTakeoffTime" |
| 89 | label="离港时间" | 83 | label="离港时间" |
| 90 | - width="150"> | 84 | + width="120"> |
| 91 | </el-table-column> | 85 | </el-table-column> |
| 92 | <el-table-column | 86 | <el-table-column |
| 93 | prop="currentLandingTime" | 87 | prop="currentLandingTime" |
| 94 | label="抵港时间" | 88 | label="抵港时间" |
| 95 | - width="150"> | 89 | + width="120"> |
| 96 | </el-table-column> | 90 | </el-table-column> |
| 97 | <el-table-column | 91 | <el-table-column |
| 98 | prop="transportflag" | 92 | prop="transportflag" |
| 99 | - label="进出港" | ||
| 100 | - width="80"> | 93 | + label="进出港"> |
| 101 | </el-table-column> | 94 | </el-table-column> |
| 102 | <el-table-column | 95 | <el-table-column |
| 103 | prop="linesType" | 96 | prop="linesType" |
| 104 | - label="执行任务类型" | ||
| 105 | - width="150"> | 97 | + label="执行任务类型"> |
| 106 | </el-table-column> | 98 | </el-table-column> |
| 107 | <el-table-column | 99 | <el-table-column |
| 108 | prop="statusMsg" | 100 | prop="statusMsg" |
| 109 | - label="海关回执" | ||
| 110 | - width="150"> | 101 | + label="海关回执"> |
| 111 | </el-table-column> | 102 | </el-table-column> |
| 112 | <el-table-column | 103 | <el-table-column |
| 104 | + fixed="right" | ||
| 113 | prop="" | 105 | prop="" |
| 114 | label="报文操作" | 106 | label="报文操作" |
| 115 | width="150"> | 107 | width="150"> |
| @@ -172,7 +164,6 @@ | @@ -172,7 +164,6 @@ | ||
| 172 | flightDate:undefined, | 164 | flightDate:undefined, |
| 173 | aircraftNo:undefined, | 165 | aircraftNo:undefined, |
| 174 | }, | 166 | }, |
| 175 | - rules:{}, | ||
| 176 | labelPosition:'left', | 167 | labelPosition:'left', |
| 177 | currentPage: 1, | 168 | currentPage: 1, |
| 178 | pageSize:10, | 169 | pageSize:10, |
| @@ -27,8 +27,7 @@ | @@ -27,8 +27,7 @@ | ||
| 27 | style="width:100%;margin-bottom: 10px"> | 27 | style="width:100%;margin-bottom: 10px"> |
| 28 | <el-table-column | 28 | <el-table-column |
| 29 | fixed="left" | 29 | fixed="left" |
| 30 | - label="操作" | ||
| 31 | - width="100"> | 30 | + label="操作"> |
| 32 | <template slot-scope="scope"> | 31 | <template slot-scope="scope"> |
| 33 | <el-button | 32 | <el-button |
| 34 | size="mini" | 33 | size="mini" |
| @@ -38,59 +37,53 @@ | @@ -38,59 +37,53 @@ | ||
| 38 | </el-table-column> | 37 | </el-table-column> |
| 39 | <el-table-column | 38 | <el-table-column |
| 40 | prop="serialNo" | 39 | prop="serialNo" |
| 41 | - label="航线序号" | ||
| 42 | - width="80"> | 40 | + label="航线序号"> |
| 43 | </el-table-column> | 41 | </el-table-column> |
| 44 | <el-table-column | 42 | <el-table-column |
| 45 | prop="departurePort" | 43 | prop="departurePort" |
| 46 | - label="出发港" | ||
| 47 | - width="80"> | 44 | + label="出发港"> |
| 48 | </el-table-column> | 45 | </el-table-column> |
| 49 | <el-table-column | 46 | <el-table-column |
| 50 | prop="departureCustomNo" | 47 | prop="departureCustomNo" |
| 51 | label="出发港关区代码" | 48 | label="出发港关区代码" |
| 52 | - width="150"> | 49 | + width="120"> |
| 53 | </el-table-column> | 50 | </el-table-column> |
| 54 | <el-table-column | 51 | <el-table-column |
| 55 | prop="arrivalPort" | 52 | prop="arrivalPort" |
| 56 | - label="目的港" | ||
| 57 | - width="80"> | 53 | + label="目的港"> |
| 58 | </el-table-column> | 54 | </el-table-column> |
| 59 | <el-table-column | 55 | <el-table-column |
| 60 | prop="arrivalCustomNo" | 56 | prop="arrivalCustomNo" |
| 61 | label="目的港关区代码" | 57 | label="目的港关区代码" |
| 62 | - width="150"> | 58 | + width="120"> |
| 63 | </el-table-column> | 59 | </el-table-column> |
| 64 | <el-table-column | 60 | <el-table-column |
| 65 | prop="std" | 61 | prop="std" |
| 66 | - label="长期离港时间" | ||
| 67 | - width="150"> | 62 | + label="长期离港时间"> |
| 68 | </el-table-column> | 63 | </el-table-column> |
| 69 | <el-table-column | 64 | <el-table-column |
| 70 | prop="sta" | 65 | prop="sta" |
| 71 | - label="长期抵港时间" | ||
| 72 | - width="150"> | 66 | + label="长期抵港时间"> |
| 73 | </el-table-column> | 67 | </el-table-column> |
| 74 | <el-table-column | 68 | <el-table-column |
| 75 | prop="effStartdate" | 69 | prop="effStartdate" |
| 76 | label="有效期起始时间" | 70 | label="有效期起始时间" |
| 77 | - width="150"> | 71 | + width="120"> |
| 78 | </el-table-column> | 72 | </el-table-column> |
| 79 | <el-table-column | 73 | <el-table-column |
| 80 | prop="effEnddate" | 74 | prop="effEnddate" |
| 81 | label="有效期结束时间" | 75 | label="有效期结束时间" |
| 82 | - width="150"> | 76 | + width="120"> |
| 83 | </el-table-column> | 77 | </el-table-column> |
| 84 | <el-table-column | 78 | <el-table-column |
| 85 | prop="plan" | 79 | prop="plan" |
| 86 | - label="每周执行情况" | ||
| 87 | - width="150"> | 80 | + label="每周执行情况"> |
| 88 | </el-table-column> | 81 | </el-table-column> |
| 89 | <el-table-column | 82 | <el-table-column |
| 90 | - | 83 | + fixed="right" |
| 91 | prop="remark" | 84 | prop="remark" |
| 92 | label="报文操作" | 85 | label="报文操作" |
| 93 | - width="250"> | 86 | + width="200"> |
| 94 | <template slot-scope="scope"> | 87 | <template slot-scope="scope"> |
| 95 | <el-button | 88 | <el-button |
| 96 | size="mini" | 89 | size="mini" |
| @@ -182,7 +175,6 @@ | @@ -182,7 +175,6 @@ | ||
| 182 | //获取默认值 | 175 | //获取默认值 |
| 183 | defaultData(){ | 176 | defaultData(){ |
| 184 | let ob=Object.assign(this.queryRoute, this.$route.query); | 177 | let ob=Object.assign(this.queryRoute, this.$route.query); |
| 185 | - | ||
| 186 | }, | 178 | }, |
| 187 | //列表删除功能 | 179 | //列表删除功能 |
| 188 | handleDelete(index,row){ | 180 | handleDelete(index,row){ |
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | </el-row> | 8 | </el-row> |
| 9 | <!-- 搜索区域--> | 9 | <!-- 搜索区域--> |
| 10 | <el-row> | 10 | <el-row> |
| 11 | - <el-form :label-position="labelPosition" :model="queryRouteaircraft" :rules="rules" ref="queryRouteaircraft" | 11 | + <el-form :label-position="labelPosition" :model="queryRouteaircraft" ref="queryRouteaircraft" |
| 12 | label-width="130px" class="demo-ruleForm"> | 12 | label-width="130px" class="demo-ruleForm"> |
| 13 | <el-col :span="8"> | 13 | <el-col :span="8"> |
| 14 | <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px"> | 14 | <el-form-item label="航空器所有人代码:" prop="airwayCode" label-width="130px"> |
| @@ -45,60 +45,50 @@ | @@ -45,60 +45,50 @@ | ||
| 45 | </el-table-column> | 45 | </el-table-column> |
| 46 | <el-table-column | 46 | <el-table-column |
| 47 | prop=ownerCo" | 47 | prop=ownerCo" |
| 48 | - label="航空器所有人代码" | ||
| 49 | - width="120"> | 48 | + label="航空器所有人代码"> |
| 50 | </el-table-column> | 49 | </el-table-column> |
| 51 | <el-table-column | 50 | <el-table-column |
| 52 | prop="airwayNameEn" | 51 | prop="airwayNameEn" |
| 53 | - label="所有人英文名称" | ||
| 54 | - width="120"> | 52 | + label="所有人英文名称"> |
| 55 | </el-table-column> | 53 | </el-table-column> |
| 56 | <el-table-column | 54 | <el-table-column |
| 57 | prop="airwayNameCn" | 55 | prop="airwayNameCn" |
| 58 | - label="所有人中文名称" | ||
| 59 | - width="150"> | 56 | + label="所有人中文名称"> |
| 60 | </el-table-column> | 57 | </el-table-column> |
| 61 | <el-table-column | 58 | <el-table-column |
| 62 | prop="aircraftNo" | 59 | prop="aircraftNo" |
| 63 | - label="航空器注册编号" | ||
| 64 | - width="120"> | 60 | + label="航空器注册编号"> |
| 65 | </el-table-column> | 61 | </el-table-column> |
| 66 | <el-table-column | 62 | <el-table-column |
| 67 | prop="certNo" | 63 | prop="certNo" |
| 68 | - label="国际证书编号" | ||
| 69 | - width="120"> | 64 | + label="国际证书编号"> |
| 70 | </el-table-column> | 65 | </el-table-column> |
| 71 | <el-table-column | 66 | <el-table-column |
| 72 | prop="owner" | 67 | prop="owner" |
| 73 | - label="航空器所有人" | ||
| 74 | - width="120"> | 68 | + label="航空器所有人"> |
| 75 | </el-table-column> | 69 | </el-table-column> |
| 76 | <el-table-column | 70 | <el-table-column |
| 77 | prop="areoNationality" | 71 | prop="areoNationality" |
| 78 | - label="国籍" | ||
| 79 | - width="80"> | 72 | + label="国籍"> |
| 80 | </el-table-column> | 73 | </el-table-column> |
| 81 | <el-table-column | 74 | <el-table-column |
| 82 | prop="areoModel" | 75 | prop="areoModel" |
| 83 | - label="机型" | ||
| 84 | - width="80"> | 76 | + label="机型"> |
| 85 | </el-table-column> | 77 | </el-table-column> |
| 86 | <el-table-column | 78 | <el-table-column |
| 87 | prop="deliverDate" | 79 | prop="deliverDate" |
| 88 | - label="交付日期" | ||
| 89 | - width="120"> | 80 | + label="交付日期"> |
| 90 | </el-table-column> | 81 | </el-table-column> |
| 91 | <el-table-column | 82 | <el-table-column |
| 92 | prop="statusMsg" | 83 | prop="statusMsg" |
| 93 | - label="海关回执" | ||
| 94 | - width="120"> | 84 | + label="海关回执"> |
| 95 | </el-table-column> | 85 | </el-table-column> |
| 96 | <el-table-column | 86 | <el-table-column |
| 97 | prop="supervisoryProperty" | 87 | prop="supervisoryProperty" |
| 98 | - label="所有权监管" | ||
| 99 | - width="120"> | 88 | + label="所有权监管"> |
| 100 | </el-table-column> | 89 | </el-table-column> |
| 101 | <el-table-column | 90 | <el-table-column |
| 91 | + fixed="right" | ||
| 102 | prop="" | 92 | prop="" |
| 103 | label="报文操作" | 93 | label="报文操作" |
| 104 | width="150"> | 94 | width="150"> |
| @@ -235,7 +225,7 @@ | @@ -235,7 +225,7 @@ | ||
| 235 | this.defaultData(); | 225 | this.defaultData(); |
| 236 | this.submitForm(); | 226 | this.submitForm(); |
| 237 | } | 227 | } |
| 238 | - } | 228 | + }, |
| 239 | 229 | ||
| 240 | } | 230 | } |
| 241 | </script> | 231 | </script> |
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | </el-col> | 22 | </el-col> |
| 23 | <el-col :span="6"> | 23 | <el-col :span="6"> |
| 24 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> | 24 | <el-form-item label="目的港" prop="arrivalPort" label-width="120px"> |
| 25 | - <el-input @input="e => airline.arrivalPort=inputMe(e)" v-model="airline.arrivalPort" | 25 | + <el-input v-model="airline.arrivalPort" @input="e => airline.arrivalPort=inputMe(e)" |
| 26 | maxLength='3'></el-input> | 26 | maxLength='3'></el-input> |
| 27 | </el-form-item> | 27 | </el-form-item> |
| 28 | </el-col> | 28 | </el-col> |
| @@ -317,7 +317,7 @@ | @@ -317,7 +317,7 @@ | ||
| 317 | }, | 317 | }, |
| 318 | handleCurrentChange(val) { | 318 | handleCurrentChange(val) { |
| 319 | this.currentPage=val; | 319 | this.currentPage=val; |
| 320 | - this.selectLongtimeplan(); | 320 | + this.submitForm(); |
| 321 | }, | 321 | }, |
| 322 | //长期飞行计划选择功能 | 322 | //长期飞行计划选择功能 |
| 323 | handleEdit(index,row){ | 323 | handleEdit(index,row){ |
| @@ -134,7 +134,7 @@ | @@ -134,7 +134,7 @@ | ||
| 134 | .el-col{margin-right: 0px;} | 134 | .el-col{margin-right: 0px;} |
| 135 | </style> | 135 | </style> |
| 136 | <script> | 136 | <script> |
| 137 | - import {addFlightPlan} from "../../api/transport"; | 137 | + import {addAirLineAircraft} from "../../api/transport"; |
| 138 | 138 | ||
| 139 | export default { | 139 | export default { |
| 140 | data(){ | 140 | data(){ |
| @@ -210,6 +210,7 @@ | @@ -210,6 +210,7 @@ | ||
| 210 | ], | 210 | ], |
| 211 | }, | 211 | }, |
| 212 | centerDialogVisible:false, | 212 | centerDialogVisible:false, |
| 213 | + msg:undefined | ||
| 213 | } | 214 | } |
| 214 | }, | 215 | }, |
| 215 | methods:{ | 216 | methods:{ |
| @@ -217,12 +218,12 @@ | @@ -217,12 +218,12 @@ | ||
| 217 | submitForm(formName) { | 218 | submitForm(formName) { |
| 218 | this.$refs[formName].validate((valid) => { | 219 | this.$refs[formName].validate((valid) => { |
| 219 | if (valid) { | 220 | if (valid) { |
| 220 | - addFlightPlan(this.aircraft).then(res=>{ | 221 | + addAirLineAircraft(this.aircraft).then(res=>{ |
| 221 | let response=res.data; | 222 | let response=res.data; |
| 222 | if(response.code=='200'){ | 223 | if(response.code=='200'){ |
| 223 | this.centerDialogVisible=true; | 224 | this.centerDialogVisible=true; |
| 224 | this.msg=response.msg; | 225 | this.msg=response.msg; |
| 225 | - this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode)},}); | 226 | + this.$router.push({path:'/queryRouteaircraft',query:{airwayCode:JSON.stringify(this.aircraft.airwayCode),aircraftNo:JSON.stringify(this.aircraft.aircraftNo)},}); |
| 226 | }else{ | 227 | }else{ |
| 227 | this.msg=response.msg; | 228 | this.msg=response.msg; |
| 228 | } | 229 | } |
| @@ -236,7 +237,7 @@ | @@ -236,7 +237,7 @@ | ||
| 236 | //加载默认值 | 237 | //加载默认值 |
| 237 | defaultData(){ | 238 | defaultData(){ |
| 238 | if(this.$route.query!=null){ | 239 | if(this.$route.query!=null){ |
| 239 | - let ob=Object.assign(this.airwayCode, this.$route.query); | 240 | + let ob=Object.assign(this.aircraft, this.$route.query); |
| 240 | } | 241 | } |
| 241 | }, | 242 | }, |
| 242 | }, | 243 | }, |
-
请 注册 或 登录 后发表评论