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 @@ ...@@ -307,7 +307,7 @@
307 <el-card v-else shadow="always" v-for="( val, idx ) in infoForm.list " :key="idx" style="min-height:350px"> 307 <el-card v-else shadow="always" v-for="( val, idx ) in infoForm.list " :key="idx" style="min-height:350px">
308 <div> 308 <div>
309 <el-empty description="未设置规则！" v-if="!val.isLocation"> 309 <el-empty description="未设置规则！" v-if="!val.isLocation">
310 - <el-button type="primary" size="small" @click="newRoute(idx, routeList[idx].route)">新增规则 310 + <el-button type="primary" size="small" @click="newRoute(idx, infoForm.route)">新增规则
311 </el-button> 311 </el-button>
312 </el-empty> 312 </el-empty>
313 <el-row class="rowPadding" v-else> 313 <el-row class="rowPadding" v-else>
...@@ -708,6 +708,10 @@ export default { ...@@ -708,6 +708,10 @@ export default {
708 this.msgWarning('未查询到航线信息！') 708 this.msgWarning('未查询到航线信息！')
709 } else { 709 } else {
710 this.routeList = res.data.routeList 710 this.routeList = res.data.routeList
711 + let routes = []
712 + this.routeList.forEach(item => {
713 + routes.push(item.route)
714 + })
711 if (res.data.list.length > 0) { 715 if (res.data.list.length > 0) {
712 //请求到数据 716 //请求到数据
713 if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') { 717 if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
...@@ -728,6 +732,11 @@ export default { ...@@ -728,6 +732,11 @@ export default {
728 status: this.$route.params.status 732 status: this.$route.params.status
729 } 733 }
730 findDestinationFltRuleByFlightNo(params).then(response => { 734 findDestinationFltRuleByFlightNo(params).then(response => {
735 + response.data.routeList.forEach(item => {
736 + if (!routes.includes(item.route)) {
737 + this.routeList.push(item)
738 + }
739 + })
731 let infoRouteList = [] 740 let infoRouteList = []
732 response.data.list.forEach(item => { 741 response.data.list.forEach(item => {
733 //航线对应插入数据 742 //航线对应插入数据
...@@ -815,6 +824,11 @@ export default { ...@@ -815,6 +824,11 @@ export default {
815 flightRouteListStr: this.$route.params.route, 824 flightRouteListStr: this.$route.params.route,
816 status: this.$route.params.status 825 status: this.$route.params.status
817 }).then(resData => { 826 }).then(resData => {
827 + resData.data.routeList.forEach(item => {
828 + if (!routes.includes(item.route)) {
829 + this.routeList.push(item)
830 + }
831 + })
818 if (resData.data.list.length > 0) { 832 if (resData.data.list.length > 0) {
819 this.routeList.forEach((route, sub) => { 833 this.routeList.forEach((route, sub) => {
820 if (!infoRouteList.includes(route.route)) { 834 if (!infoRouteList.includes(route.route)) {
...@@ -927,6 +941,11 @@ export default { ...@@ -927,6 +941,11 @@ export default {
927 status: this.$route.params.status 941 status: this.$route.params.status
928 } 942 }
929 findDestinationFltRuleByFlightNo(params).then(response => { 943 findDestinationFltRuleByFlightNo(params).then(response => {
944 + response.data.routeList.forEach(item => {
945 + if (!routes.includes(item.route)) {
946 + this.routeList.push(item)
947 + }
948 + })
930 if (response.data.list.length > 0) { 949 if (response.data.list.length > 0) {
931 let infoRouteList = [] 950 let infoRouteList = []
932 res.data.list.forEach(item => { 951 res.data.list.forEach(item => {
......