正在显示
3 个修改的文件
包含
47 行增加
和
19 行删除
| @@ -156,6 +156,9 @@ export const sendPredictionOut = params => { return http.post(`${baseUrlPredicti | @@ -156,6 +156,9 @@ export const sendPredictionOut = params => { return http.post(`${baseUrlPredicti | ||
| 156 | //保存并发送 | 156 | //保存并发送 |
| 157 | export const sendConfirmOut = params => { return http.post(`${baseUrlConfirm}/sendConfirmOut`, params); }; | 157 | export const sendConfirmOut = params => { return http.post(`${baseUrlConfirm}/sendConfirmOut`, params); }; |
| 158 | 158 | ||
| 159 | +// 查询是否预报审核通过 | ||
| 160 | +export const selectPredictionInterface = params => { return http.get(`${baseUrlPrediction}/selectPredictionInterface`, params)} | ||
| 161 | + | ||
| 159 | 162 | ||
| 160 | //进港航班配置 | 163 | //进港航班配置 |
| 161 | //新增方法 | 164 | //新增方法 |
| @@ -168,7 +168,7 @@ let routes = [ | @@ -168,7 +168,7 @@ let routes = [ | ||
| 168 | }, | 168 | }, |
| 169 | { | 169 | { |
| 170 | path: '/', | 170 | path: '/', |
| 171 | - component: Home, | 171 | + component: HomeNew, |
| 172 | name: '海关货物流转', | 172 | name: '海关货物流转', |
| 173 | iconCls: 'el-icon-delete-location', | 173 | iconCls: 'el-icon-delete-location', |
| 174 | children: [ | 174 | children: [ |
| @@ -190,7 +190,7 @@ let routes = [ | @@ -190,7 +190,7 @@ let routes = [ | ||
| 190 | 190 | ||
| 191 | { | 191 | { |
| 192 | path: '/domdep', | 192 | path: '/domdep', |
| 193 | - component: Home, | 193 | + component: HomeNew, |
| 194 | name: '订舱系统', | 194 | name: '订舱系统', |
| 195 | iconCls: 'el-icon-delete-location', | 195 | iconCls: 'el-icon-delete-location', |
| 196 | children: [ | 196 | children: [ |
| @@ -234,7 +234,7 @@ let routes = [ | @@ -234,7 +234,7 @@ let routes = [ | ||
| 234 | }, | 234 | }, |
| 235 | { | 235 | { |
| 236 | path: '/guestService', | 236 | path: '/guestService', |
| 237 | - component: Home, | 237 | + component: HomeNew, |
| 238 | name: '客服系统', | 238 | name: '客服系统', |
| 239 | iconCls: 'fa fa-id-card-o', | 239 | iconCls: 'fa fa-id-card-o', |
| 240 | children: [ | 240 | children: [ |
| @@ -260,7 +260,7 @@ let routes = [ | @@ -260,7 +260,7 @@ let routes = [ | ||
| 260 | }, | 260 | }, |
| 261 | { | 261 | { |
| 262 | path: '/radioMsgImport', | 262 | path: '/radioMsgImport', |
| 263 | - component: Home, | 263 | + component: HomeNew, |
| 264 | name: '航空报文导入', | 264 | name: '航空报文导入', |
| 265 | iconCls:'el-icon-goods', | 265 | iconCls:'el-icon-goods', |
| 266 | children:[ | 266 | children:[ |
| @@ -271,7 +271,7 @@ let routes = [ | @@ -271,7 +271,7 @@ let routes = [ | ||
| 271 | }, | 271 | }, |
| 272 | { | 272 | { |
| 273 | path: '/sec', | 273 | path: '/sec', |
| 274 | - component: Home, | 274 | + component: HomeNew, |
| 275 | name: '国际安检清单申报管理', | 275 | name: '国际安检清单申报管理', |
| 276 | iconCls: 'el-icon-collection', | 276 | iconCls: 'el-icon-collection', |
| 277 | children: [ | 277 | children: [ |
| @@ -281,7 +281,7 @@ let routes = [ | @@ -281,7 +281,7 @@ let routes = [ | ||
| 281 | 281 | ||
| 282 | { | 282 | { |
| 283 | path: '/output', | 283 | path: '/output', |
| 284 | - component: Home, | 284 | + component: HomeNew, |
| 285 | name: '国内出港业务申报', | 285 | name: '国内出港业务申报', |
| 286 | iconCls: 'el-icon-collection', | 286 | iconCls: 'el-icon-collection', |
| 287 | children: [ | 287 | children: [ |
| @@ -311,7 +311,7 @@ let routes = [ | @@ -311,7 +311,7 @@ let routes = [ | ||
| 311 | }, | 311 | }, |
| 312 | { | 312 | { |
| 313 | path: '/sec', | 313 | path: '/sec', |
| 314 | - component: Home, | 314 | + component: HomeNew, |
| 315 | name: '国内安检清单申报管理', | 315 | name: '国内安检清单申报管理', |
| 316 | iconCls: 'el-icon-collection', | 316 | iconCls: 'el-icon-collection', |
| 317 | children: [ | 317 | children: [ |
| @@ -348,7 +348,7 @@ let routes = [ | @@ -348,7 +348,7 @@ let routes = [ | ||
| 348 | }, | 348 | }, |
| 349 | { | 349 | { |
| 350 | path: '/lost', | 350 | path: '/lost', |
| 351 | - component: Home, | 351 | + component: HomeNew, |
| 352 | name: '落装改配申报', | 352 | name: '落装改配申报', |
| 353 | iconCls:'el-icon-goods', | 353 | iconCls:'el-icon-goods', |
| 354 | children:[ | 354 | children:[ |
| @@ -461,7 +461,7 @@ let routes = [ | @@ -461,7 +461,7 @@ let routes = [ | ||
| 461 | }, | 461 | }, |
| 462 | { | 462 | { |
| 463 | path: '/express-system', | 463 | path: '/express-system', |
| 464 | - component: Home, | 464 | + component: HomeNew, |
| 465 | name: '快邮舱单申报', | 465 | name: '快邮舱单申报', |
| 466 | iconCls:'el-icon-wind-power', | 466 | iconCls:'el-icon-wind-power', |
| 467 | children:[ | 467 | children:[ |
| @@ -471,7 +471,7 @@ let routes = [ | @@ -471,7 +471,7 @@ let routes = [ | ||
| 471 | 471 | ||
| 472 | { | 472 | { |
| 473 | path: '/', | 473 | path: '/', |
| 474 | - component: Home, | 474 | + component: HomeNew, |
| 475 | name: '场站管理', | 475 | name: '场站管理', |
| 476 | iconCls: 'el-icon-setting',//图标样式class | 476 | iconCls: 'el-icon-setting',//图标样式class |
| 477 | children: [ | 477 | children: [ |
| @@ -483,7 +483,7 @@ let routes = [ | @@ -483,7 +483,7 @@ let routes = [ | ||
| 483 | 483 | ||
| 484 | { | 484 | { |
| 485 | path: '/empt', | 485 | path: '/empt', |
| 486 | - component: Home, | 486 | + component: HomeNew, |
| 487 | name: '能源管理', | 487 | name: '能源管理', |
| 488 | iconCls: 'fa fa-id-card-o', | 488 | iconCls: 'fa fa-id-card-o', |
| 489 | children: [ | 489 | children: [ |
| @@ -493,7 +493,7 @@ let routes = [ | @@ -493,7 +493,7 @@ let routes = [ | ||
| 493 | }, | 493 | }, |
| 494 | { | 494 | { |
| 495 | path: '/satff', | 495 | path: '/satff', |
| 496 | - component: Home, | 496 | + component: HomeNew, |
| 497 | name: '生活保障部门', | 497 | name: '生活保障部门', |
| 498 | iconCls: 'fa fa-id-card-o', | 498 | iconCls: 'fa fa-id-card-o', |
| 499 | children: [ | 499 | children: [ |
| @@ -506,7 +506,7 @@ let routes = [ | @@ -506,7 +506,7 @@ let routes = [ | ||
| 506 | }, | 506 | }, |
| 507 | { | 507 | { |
| 508 | path: '/water_heating_chamber', | 508 | path: '/water_heating_chamber', |
| 509 | - component: Home, | 509 | + component: HomeNew, |
| 510 | name: '水暖室', | 510 | name: '水暖室', |
| 511 | iconCls: 'fa fa-address-card', | 511 | iconCls: 'fa fa-address-card', |
| 512 | // leaf: true,//只有一个节点 | 512 | // leaf: true,//只有一个节点 |
| @@ -177,7 +177,7 @@ | @@ -177,7 +177,7 @@ | ||
| 177 | 177 | ||
| 178 | <div class="btnFoot"> | 178 | <div class="btnFoot"> |
| 179 | <el-row> | 179 | <el-row> |
| 180 | - <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined | preData.length >0" | 180 | + <el-button type="primary" size="mini" v-if="preQuery.flightno !== undefined || preData.length >0" |
| 181 | @click="handleAddpreInfo">新增预配舱单 | 181 | @click="handleAddpreInfo">新增预配舱单 |
| 182 | </el-button> | 182 | </el-button> |
| 183 | <el-button type="primary" size="mini" @click="handelBackStep" | 183 | <el-button type="primary" size="mini" @click="handelBackStep" |
| @@ -250,9 +250,10 @@ | @@ -250,9 +250,10 @@ | ||
| 250 | <el-row class="flight-info" style="padding-left: 90px;padding-right: 90px"> | 250 | <el-row class="flight-info" style="padding-left: 90px;padding-right: 90px"> |
| 251 | <el-col :span="6"> | 251 | <el-col :span="6"> |
| 252 | <el-form-item label="航班号" prop="flightno"> | 252 | <el-form-item label="航班号" prop="flightno"> |
| 253 | - <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" style="width: 140px" clearable> | 253 | + <el-input v-model="flightno" @blur="transportQuery()" :disabled="fenStatus === 'addAwbh'" style="width: 140px" clearable> |
| 254 | </el-input> | 254 | </el-input> |
| 255 | </el-form-item> | 255 | </el-form-item> |
| 256 | + <span id="message"></span> | ||
| 256 | </el-col> | 257 | </el-col> |
| 257 | <el-col :span="6"> | 258 | <el-col :span="6"> |
| 258 | <el-form-item label="航班日期" prop="flightdate"> | 259 | <el-form-item label="航班日期" prop="flightdate"> |
| @@ -261,6 +262,7 @@ | @@ -261,6 +262,7 @@ | ||
| 261 | style="width: 140px" | 262 | style="width: 140px" |
| 262 | v-model="preModel.flightdate" align="left" | 263 | v-model="preModel.flightdate" align="left" |
| 263 | class="flight-date-tianbo" | 264 | class="flight-date-tianbo" |
| 265 | + @blur="transportQuery()" | ||
| 264 | type="date" placeholder="请输入航班日期" clearable/> | 266 | type="date" placeholder="请输入航班日期" clearable/> |
| 265 | </el-form-item> | 267 | </el-form-item> |
| 266 | </el-col> | 268 | </el-col> |
| @@ -791,7 +793,8 @@ | @@ -791,7 +793,8 @@ | ||
| 791 | import {getResponseForParam} from '@/api/responseDetail' | 793 | import {getResponseForParam} from '@/api/responseDetail' |
| 792 | import { getList} from '../../api/consigner/consigner'; | 794 | import { getList} from '../../api/consigner/consigner'; |
| 793 | import { getList as neeList} from '../../api/consigner/consignee'; | 795 | import { getList as neeList} from '../../api/consigner/consignee'; |
| 794 | - import {getListHzTypeList} from '../../api/shipper/shipper' | 796 | + import {getListHzTypeList} from '../../api/shipper/shipper'; |
| 797 | + import {selectPredictionInterface} from '../../api/transport'; | ||
| 795 | import { | 798 | import { |
| 796 | validAwb, | 799 | validAwb, |
| 797 | validAlphabets, | 800 | validAlphabets, |
| @@ -1412,8 +1415,9 @@ | @@ -1412,8 +1415,9 @@ | ||
| 1412 | Message.error("获取货主列表失败") | 1415 | Message.error("获取货主列表失败") |
| 1413 | } | 1416 | } |
| 1414 | }) | 1417 | }) |
| 1415 | - this.preModel.carrier = this.preQuery.carrier | ||
| 1416 | - this.preModel.flightno = this.preQuery.flightno | 1418 | + if (this.preQuery.carrier !== undefined){ |
| 1419 | + this.preModel.flightno = this.preQuery.carrier+this.preQuery.flightno | ||
| 1420 | + } | ||
| 1417 | this.preModel.flightdate = this.preQuery.flightdate | 1421 | this.preModel.flightdate = this.preQuery.flightdate |
| 1418 | this.preModel.originstation = this.preQuery.originstation | 1422 | this.preModel.originstation = this.preQuery.originstation |
| 1419 | this.preModel.destinationstation = this.preQuery.destinationstation | 1423 | this.preModel.destinationstation = this.preQuery.destinationstation |
| @@ -1935,7 +1939,7 @@ | @@ -1935,7 +1939,7 @@ | ||
| 1935 | form.append('enterpriseId', loginUserInfo.companyId); | 1939 | form.append('enterpriseId', loginUserInfo.companyId); |
| 1936 | form.append("username", loginUserInfo.username); | 1940 | form.append("username", loginUserInfo.username); |
| 1937 | uploadFileExcel(form).then(res =>{ | 1941 | uploadFileExcel(form).then(res =>{ |
| 1938 | - if(res.data.count >0){ | 1942 | + if(res.data.code =='200'){ |
| 1939 | Message.success(res.data.respMessage) | 1943 | Message.success(res.data.respMessage) |
| 1940 | this.getList(); | 1944 | this.getList(); |
| 1941 | }else { | 1945 | }else { |
| @@ -1951,6 +1955,27 @@ | @@ -1951,6 +1955,27 @@ | ||
| 1951 | userId(){ | 1955 | userId(){ |
| 1952 | this.preModel.userId = loginUserInfo.userId; | 1956 | this.preModel.userId = loginUserInfo.userId; |
| 1953 | this.preModel.enterpriseId = loginUserInfo.companyId; | 1957 | this.preModel.enterpriseId = loginUserInfo.companyId; |
| 1958 | + }, | ||
| 1959 | + | ||
| 1960 | + // 远程查询运输工具申报是否成功 | ||
| 1961 | + transportQuery(){ | ||
| 1962 | + if (this.preModel.flightno !== undefined && this.preModel.flightno !== '' | ||
| 1963 | + && this.preModel.flightdate !== undefined && this.preModel.flightdate !== ''){ | ||
| 1964 | + const params = { | ||
| 1965 | + flightNo: this.preModel.flightno, | ||
| 1966 | + flightDate: this.preModel.flightdate | ||
| 1967 | + } | ||
| 1968 | + selectPredictionInterface(params).then(res =>{ | ||
| 1969 | + console.log(res.data.data+"-------------"); | ||
| 1970 | + if(res.data.data != undefined && res.data.data != ""){ | ||
| 1971 | + const span = document.getElementById("message"); | ||
| 1972 | + span.innerHTML = res.data.data[0].statusMsg; | ||
| 1973 | + }else { | ||
| 1974 | + const span = document.getElementById("message"); | ||
| 1975 | + span.innerHTML = "" | ||
| 1976 | + } | ||
| 1977 | + }) | ||
| 1978 | + } | ||
| 1954 | } | 1979 | } |
| 1955 | } | 1980 | } |
| 1956 | } | 1981 | } |
-
请 注册 或 登录 后发表评论