正在显示
6 个修改的文件
包含
112 行增加
和
16 行删除
@@ -83,6 +83,9 @@ export const selectAirLineAircraft=params=>{return http.get(`${baseUrlAirLineAir | @@ -83,6 +83,9 @@ export const selectAirLineAircraft=params=>{return http.get(`${baseUrlAirLineAir | ||
83 | //进港预报申报prediction | 83 | //进港预报申报prediction |
84 | //新增方法 | 84 | //新增方法 |
85 | export const addPrediction = params => { return http.post(`${baseUrlPrediction}/addPrediction`, params); }; | 85 | export const addPrediction = params => { return http.post(`${baseUrlPrediction}/addPrediction`, params); }; |
86 | +//保存并发送 | ||
87 | +export const sendPredictionIn = params => { return http.post(`${baseUrlPrediction}/sendPredictionIn`, params); }; | ||
88 | + | ||
86 | //删除方法 | 89 | //删除方法 |
87 | export const editPrediction=params=>{return http.put(`${baseUrlPrediction}/editPrediction`, params);}; | 90 | export const editPrediction=params=>{return http.put(`${baseUrlPrediction}/editPrediction`, params);}; |
88 | //查询列表 | 91 | //查询列表 |
@@ -92,12 +95,22 @@ export const selectPrediction=params=>{return http.get(`${baseUrlPrediction}/sel | @@ -92,12 +95,22 @@ export const selectPrediction=params=>{return http.get(`${baseUrlPrediction}/sel | ||
92 | //进港确报申报confirm | 95 | //进港确报申报confirm |
93 | //新增方法 | 96 | //新增方法 |
94 | export const addConfirm = params => { return http.post(`${baseUrlConfirm}/addConfirm`, params); }; | 97 | export const addConfirm = params => { return http.post(`${baseUrlConfirm}/addConfirm`, params); }; |
98 | +//保存并发送 | ||
99 | +export const sendConfirmIn = params => { return http.post(`${baseUrlPrediction}/sendConfirmIn`, params); }; | ||
95 | //删除方法 | 100 | //删除方法 |
96 | export const editConfirm=params=>{return http.put(`${baseUrlConfirm}/editConfirm`, params);}; | 101 | export const editConfirm=params=>{return http.put(`${baseUrlConfirm}/editConfirm`, params);}; |
97 | //查询列表 | 102 | //查询列表 |
98 | export const selectConfirm=params=>{return http.get(`${baseUrlConfirm}/selectConfirm`, params);}; | 103 | export const selectConfirm=params=>{return http.get(`${baseUrlConfirm}/selectConfirm`, params);}; |
99 | 104 | ||
100 | 105 | ||
106 | +//出港预报申报 | ||
107 | +//保存并发送 | ||
108 | +export const sendPredictionOut = params => { return http.post(`${baseUrlPrediction}/sendPredictionOut`, params); }; | ||
109 | +//出港确报申报 | ||
110 | +//保存并发送 | ||
111 | +export const sendConfirmOut = params => { return http.post(`${baseUrlConfirm}/sendConfirmOut`, params); }; | ||
112 | + | ||
113 | + | ||
101 | //进港航班配置 | 114 | //进港航班配置 |
102 | //新增方法 | 115 | //新增方法 |
103 | export const addSchedule = params => { return http.post(`${baseUrlSchedule}/addSchedule`, params); }; | 116 | export const addSchedule = params => { return http.post(`${baseUrlSchedule}/addSchedule`, params); }; |
@@ -98,7 +98,7 @@ | @@ -98,7 +98,7 @@ | ||
98 | </el-row> | 98 | </el-row> |
99 | <el-row style="margin-left: 120px"> | 99 | <el-row style="margin-left: 120px"> |
100 | <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> |
101 | - <el-button type="success">保存并发送</el-button></el-col> | 101 | + <el-button type="success" @click="sendForm('arrival')">保存并发送</el-button></el-col> |
102 | </el-row> | 102 | </el-row> |
103 | <!--对话提示框--> | 103 | <!--对话提示框--> |
104 | <el-row> | 104 | <el-row> |
@@ -136,7 +136,7 @@ | @@ -136,7 +136,7 @@ | ||
136 | .el-col{margin-right: 0px;} | 136 | .el-col{margin-right: 0px;} |
137 | </style> | 137 | </style> |
138 | <script> | 138 | <script> |
139 | - import {addPrediction} from "../../api/transport"; | 139 | + import {addPrediction, sendPredictionIn} from "../../api/transport"; |
140 | 140 | ||
141 | export default { | 141 | export default { |
142 | data(){ | 142 | data(){ |
@@ -215,6 +215,26 @@ | @@ -215,6 +215,26 @@ | ||
215 | } | 215 | } |
216 | }); | 216 | }); |
217 | }, | 217 | }, |
218 | + //新增进港预报申报(保存并发送按钮) | ||
219 | + sendForm(formName) { | ||
220 | + this.$refs[formName].validate((valid) => { | ||
221 | + if (valid) { | ||
222 | + sendPredictionIn(this.arrival).then(res=>{ | ||
223 | + let response=res.data; | ||
224 | + if(response.code=='200'){ | ||
225 | + this.centerDialogVisible=true; | ||
226 | + this.msg=response.msg; | ||
227 | + this.$router.push({path:'/queryArrival',query:{flightNo:this.arrival.flightNo,flightDate:this.arrival.flightDate}}); | ||
228 | + }else{ | ||
229 | + this.msg=response.msg; | ||
230 | + } | ||
231 | + }); | ||
232 | + } else { | ||
233 | + console.log('error submit!!'); | ||
234 | + return false; | ||
235 | + } | ||
236 | + }); | ||
237 | + }, | ||
218 | //加载默认值 | 238 | //加载默认值 |
219 | defaultData(){ | 239 | defaultData(){ |
220 | if(this.$route.query!=null){ | 240 | if(this.$route.query!=null){ |
@@ -80,7 +80,7 @@ | @@ -80,7 +80,7 @@ | ||
80 | </el-row> | 80 | </el-row> |
81 | <el-row style="margin-left: 120px"> | 81 | <el-row style="margin-left: 120px"> |
82 | <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> |
83 | - <el-button type="success">保存并发送</el-button></el-col> | 83 | + <el-button type="success" @click="sendForm('confirmatory')">保存并发送</el-button></el-col> |
84 | </el-row> | 84 | </el-row> |
85 | <!--对话提示框--> | 85 | <!--对话提示框--> |
86 | <el-row> | 86 | <el-row> |
@@ -118,7 +118,7 @@ | @@ -118,7 +118,7 @@ | ||
118 | .el-col{margin-right: 0px;} | 118 | .el-col{margin-right: 0px;} |
119 | </style> | 119 | </style> |
120 | <script> | 120 | <script> |
121 | - import {addConfirm} from "../../api/transport"; | 121 | + import {addConfirm, sendConfirmIn} from "../../api/transport"; |
122 | 122 | ||
123 | export default { | 123 | export default { |
124 | data(){ | 124 | data(){ |
@@ -188,6 +188,26 @@ | @@ -188,6 +188,26 @@ | ||
188 | } | 188 | } |
189 | }); | 189 | }); |
190 | }, | 190 | }, |
191 | + //新增进港确报申报(保存并发送按钮) | ||
192 | + sendForm(formName) { | ||
193 | + this.$refs[formName].validate((valid) => { | ||
194 | + if (valid) { | ||
195 | + sendConfirmIn(this.confirmatory).then(res=>{ | ||
196 | + let response=res.data; | ||
197 | + if(response.code=='200'){ | ||
198 | + this.centerDialogVisible=true; | ||
199 | + this.msg=response.msg; | ||
200 | + this.$router.push({path:'/queryConfirmatory',query:{flightNo:this.confirmatory.flightNo,flightDate:this.confirmatory.flightDate}}); | ||
201 | + }else{ | ||
202 | + this.msg=response.msg; | ||
203 | + } | ||
204 | + }); | ||
205 | + } else { | ||
206 | + console.log('error submit!!'); | ||
207 | + return false; | ||
208 | + } | ||
209 | + }); | ||
210 | + }, | ||
191 | //加载默认值 | 211 | //加载默认值 |
192 | defaultData(){ | 212 | defaultData(){ |
193 | if(this.$route.query!=null){ | 213 | if(this.$route.query!=null){ |
@@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
61 | </el-row> | 61 | </el-row> |
62 | <el-row style="margin-left: 120px"> | 62 | <el-row style="margin-left: 120px"> |
63 | <el-col :span="24"> <el-button type="primary" @click="submitForm('declare')">保 存</el-button> | 63 | <el-col :span="24"> <el-button type="primary" @click="submitForm('declare')">保 存</el-button> |
64 | - <el-button type="success">保存并发送</el-button></el-col> | 64 | + <el-button type="success" @click="sendForm('declare')">保存并发送</el-button></el-col> |
65 | </el-row> | 65 | </el-row> |
66 | <!--对话提示框--> | 66 | <!--对话提示框--> |
67 | <el-row> | 67 | <el-row> |
@@ -99,7 +99,7 @@ | @@ -99,7 +99,7 @@ | ||
99 | .el-col{margin-right: 0px;} | 99 | .el-col{margin-right: 0px;} |
100 | </style> | 100 | </style> |
101 | <script> | 101 | <script> |
102 | - import {addConfirm} from "../../api/transport"; | 102 | + import {addConfirm, sendConfirmOut} from "../../api/transport"; |
103 | 103 | ||
104 | export default { | 104 | export default { |
105 | data(){ | 105 | data(){ |
@@ -162,6 +162,26 @@ | @@ -162,6 +162,26 @@ | ||
162 | } | 162 | } |
163 | }); | 163 | }); |
164 | }, | 164 | }, |
165 | + //新增出港确报申报(保存按钮) | ||
166 | + sendForm(formName) { | ||
167 | + this.$refs[formName].validate((valid) => { | ||
168 | + if (valid) { | ||
169 | + sendConfirmOut(this.declare).then(res=>{ | ||
170 | + let response=res.data; | ||
171 | + if(response.code=='200'){ | ||
172 | + this.centerDialogVisible=true; | ||
173 | + this.msg=response.msg; | ||
174 | + this.$router.push({path:'/queryDeclare',query:{flightNo:this.declare.flightNo,flightDate:this.declare.flightDate}}); | ||
175 | + }else{ | ||
176 | + this.msg=response.msg; | ||
177 | + } | ||
178 | + }); | ||
179 | + } else { | ||
180 | + console.log('error submit!!'); | ||
181 | + return false; | ||
182 | + } | ||
183 | + }); | ||
184 | + }, | ||
165 | //加载默认值 | 185 | //加载默认值 |
166 | defaultData(){ | 186 | defaultData(){ |
167 | if(this.$route.query!=null){ | 187 | if(this.$route.query!=null){ |
@@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
72 | </el-row> | 72 | </el-row> |
73 | <el-row style="margin-left: 120px"> | 73 | <el-row style="margin-left: 120px"> |
74 | <el-col :span="24"> <el-button type="primary" @click="submitForm('departure')">保 存</el-button> | 74 | <el-col :span="24"> <el-button type="primary" @click="submitForm('departure')">保 存</el-button> |
75 | - <el-button type="success">保存并发送</el-button></el-col> | 75 | + <el-button type="success" @click="sendForm('departure')">保存并发送</el-button></el-col> |
76 | </el-row> | 76 | </el-row> |
77 | <!--对话提示框--> | 77 | <!--对话提示框--> |
78 | <el-row> | 78 | <el-row> |
@@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
110 | .el-col{margin-right: 0px;} | 110 | .el-col{margin-right: 0px;} |
111 | </style> | 111 | </style> |
112 | <script> | 112 | <script> |
113 | - import {addPrediction} from "../../api/transport"; | 113 | + import {addPrediction, sendPredictionOut} from "../../api/transport"; |
114 | 114 | ||
115 | export default { | 115 | export default { |
116 | data(){ | 116 | data(){ |
@@ -181,6 +181,26 @@ | @@ -181,6 +181,26 @@ | ||
181 | } | 181 | } |
182 | }); | 182 | }); |
183 | }, | 183 | }, |
184 | + //新增出港预报申报(保存并发送按钮) | ||
185 | + sendForm(formName) { | ||
186 | + this.$refs[formName].validate((valid) => { | ||
187 | + if (valid) { | ||
188 | + sendPredictionOut(this.departure).then(res=>{ | ||
189 | + let response=res.data; | ||
190 | + if(response.code=='200'){ | ||
191 | + this.centerDialogVisible=true; | ||
192 | + this.msg=response.msg; | ||
193 | + this.$router.push({path:'/queryDeparture',query:{flightNo:this.departure.flightNo,flightDate:this.departure.flightDate}}); | ||
194 | + }else{ | ||
195 | + this.msg=response.msg; | ||
196 | + } | ||
197 | + }); | ||
198 | + } else { | ||
199 | + console.log('error submit!!'); | ||
200 | + return false; | ||
201 | + } | ||
202 | + }); | ||
203 | + }, | ||
184 | //加载默认值 | 204 | //加载默认值 |
185 | defaultData(){ | 205 | defaultData(){ |
186 | if(this.$route.query!=null){ | 206 | if(this.$route.query!=null){ |
@@ -30,8 +30,8 @@ | @@ -30,8 +30,8 @@ | ||
30 | </el-form-item> | 30 | </el-form-item> |
31 | </el-col> | 31 | </el-col> |
32 | <el-col :span="6"> | 32 | <el-col :span="6"> |
33 | - <el-form-item label="航空器国籍" prop="areoNationality" label-width="130px"> | ||
34 | - <el-input v-model="aircraft.areoNationality" placeholder="请输入"></el-input> | 33 | + <el-form-item label="航空器国籍" prop="aeroNationality" label-width="130px"> |
34 | + <el-input v-model="aircraft.aeroNationality" placeholder="请输入"></el-input> | ||
35 | </el-form-item> | 35 | </el-form-item> |
36 | </el-col> | 36 | </el-col> |
37 | <el-col :span="6"> | 37 | <el-col :span="6"> |
@@ -46,8 +46,8 @@ | @@ -46,8 +46,8 @@ | ||
46 | </el-col> | 46 | </el-col> |
47 | 47 | ||
48 | <el-col :span="6"> | 48 | <el-col :span="6"> |
49 | - <el-form-item label="机型" prop="areoModel" label-width="130px"> | ||
50 | - <el-input v-model="aircraft.areoModel" placeholder="请输入"></el-input> | 49 | + <el-form-item label="机型" prop="aeroModel" label-width="130px"> |
50 | + <el-input v-model="aircraft.aeroModel" placeholder="请输入"></el-input> | ||
51 | </el-form-item> | 51 | </el-form-item> |
52 | </el-col> | 52 | </el-col> |
53 | <el-col :span="6"> | 53 | <el-col :span="6"> |
@@ -145,8 +145,8 @@ | @@ -145,8 +145,8 @@ | ||
145 | airwayNameEn:undefined, | 145 | airwayNameEn:undefined, |
146 | airwayNameCn:undefined, | 146 | airwayNameCn:undefined, |
147 | aircraftNo:undefined, | 147 | aircraftNo:undefined, |
148 | - areoModel:undefined, | ||
149 | - areoNationality:undefined, | 148 | + aeroModel:undefined, |
149 | + aeroNationality:undefined, | ||
150 | certNo:undefined, | 150 | certNo:undefined, |
151 | grossWeight:undefined, | 151 | grossWeight:undefined, |
152 | passengerLimit:undefined, | 152 | passengerLimit:undefined, |
@@ -169,13 +169,16 @@ | @@ -169,13 +169,16 @@ | ||
169 | airwayCode: [ | 169 | airwayCode: [ |
170 | {required: true, message: '请输入', trigger: 'blur'} | 170 | {required: true, message: '请输入', trigger: 'blur'} |
171 | ], | 171 | ], |
172 | + meno: [ | ||
173 | + {required: true, message: '请输入', trigger: 'blur'} | ||
174 | + ], | ||
172 | airwayNameEn: [ | 175 | airwayNameEn: [ |
173 | {required: true, message: '请输入', trigger: 'blur'} | 176 | {required: true, message: '请输入', trigger: 'blur'} |
174 | ], | 177 | ], |
175 | airwayNameCn: [ | 178 | airwayNameCn: [ |
176 | {required: true, message: '请输入', trigger: 'blur'} | 179 | {required: true, message: '请输入', trigger: 'blur'} |
177 | ], | 180 | ], |
178 | - areoNationality: [ | 181 | + aeroNationality: [ |
179 | {required: true, message: '请输入', trigger: 'blur'} | 182 | {required: true, message: '请输入', trigger: 'blur'} |
180 | ], | 183 | ], |
181 | aircraftNo: [ | 184 | aircraftNo: [ |
@@ -187,7 +190,7 @@ | @@ -187,7 +190,7 @@ | ||
187 | credentialNo: [ | 190 | credentialNo: [ |
188 | {required: true, message: '请输入', trigger: 'blur'} | 191 | {required: true, message: '请输入', trigger: 'blur'} |
189 | ], | 192 | ], |
190 | - areoModel: [ | 193 | + aeroModel: [ |
191 | {required: true, message: '请输入', trigger: 'blur'} | 194 | {required: true, message: '请输入', trigger: 'blur'} |
192 | ], | 195 | ], |
193 | grossWeight: [ | 196 | grossWeight: [ |
-
请 注册 或 登录 后发表评论