Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
073d936f 1 parent 0bd0a969

航线合并，新增航线取值修正

Inline Side-by-side
Showing 1 changed file with 20 additions and 1 deletions
......@@ -307,7 +307,7 @@
<el-card v-else shadow="always" v-for="( val, idx ) in infoForm.list " :key="idx" style="min-height:350px">
<div>
<el-empty description="未设置规则！" v-if="!val.isLocation">
<el-button type="primary" size="small" @click="newRoute(idx, routeList[idx].route)">新增规则
<el-button type="primary" size="small" @click="newRoute(idx, infoForm.route)">新增规则
</el-button>
</el-empty>
<el-row class="rowPadding" v-else>
......@@ -708,6 +708,10 @@ export default {
this.msgWarning('未查询到航线信息！')
} else {
this.routeList = res.data.routeList
let routes = []
this.routeList.forEach(item => {
routes.push(item.route)
})
if (res.data.list.length > 0) {
//请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
......@@ -728,6 +732,11 @@ export default {
status: this.$route.params.status
}
findDestinationFltRuleByFlightNo(params).then(response => {
response.data.routeList.forEach(item => {
if (!routes.includes(item.route)) {
this.routeList.push(item)
}
})
let infoRouteList = []
response.data.list.forEach(item => {
//航线对应插入数据
......@@ -815,6 +824,11 @@ export default {
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}).then(resData => {
resData.data.routeList.forEach(item => {
if (!routes.includes(item.route)) {
this.routeList.push(item)
}
})
if (resData.data.list.length > 0) {
this.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
......@@ -927,6 +941,11 @@ export default {
status: this.$route.params.status
}
findDestinationFltRuleByFlightNo(params).then(response => {
response.data.routeList.forEach(item => {
if (!routes.includes(item.route)) {
this.routeList.push(item)
}
})
if (response.data.list.length > 0) {
let infoRouteList = []
res.data.list.forEach(item => {
......