Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
0020b10c 1 parent 03b3df2c

维度页面跳转修正，导入错误提示修正

Inline Side-by-side
Showing 5 changed files with 40 additions and 42 deletions
...@@ -74,7 +74,7 @@ export const constantRoutes = [ ...@@ -74,7 +74,7 @@ export const constantRoutes = [
74 redirect: 'noredirect', 74 redirect: 'noredirect',
75 children: [ 75 children: [
76 { 76 {
77 - path: '/info/:handle/:fltNo-:fltDate', 77 + path: '/info/:handle/:id~:routeStatus~:fltNo~:route~:fltDate',
78 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 78 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
79 name: 'FlightAllocConfigInfo', 79 name: 'FlightAllocConfigInfo',
80 meta: { title: '航班配舱', icon: 'user' } 80 meta: { title: '航班配舱', icon: 'user' }
...@@ -85,6 +85,12 @@ export const constantRoutes = [ ...@@ -85,6 +85,12 @@ export const constantRoutes = [
85 name: 'weatherTable', 85 name: 'weatherTable',
86 meta: { title: '流水表', icon: 'user' } 86 meta: { title: '流水表', icon: 'user' }
87 }, 87 },
88 + {
89 + path: '/upDateResult->:from',
90 + component: (resolve) => require(['@/views/preMdeConfig/upDateResult'], resolve),
91 + name: 'UpDateResult',
92 + meta: { title: '导入信息', icon: 'user' }
93 + },
88 ] 94 ]
89 } 95 }
90 ] 96 ]
......
...@@ -142,10 +142,11 @@ export default { ...@@ -142,10 +142,11 @@ export default {
142 //跳转到查看，修改页面 142 //跳转到查看，修改页面
143 handleClick(fltNo, handle, fltDate, status) { 143 handleClick(fltNo, handle, fltDate, status) {
144 let obj = { 144 let obj = {
145 + id: ' ',
145 handle: handle, 146 handle: handle,
146 fltNo: fltNo, 147 fltNo: fltNo,
147 - fltDate: fltDate != null ? fltDate : '', 148 + fltDate: fltDate != null ? fltDate : ' ',
148 - route: null, 149 + route: ' ',
149 routeStatus: 'FlightAllocConfig', 150 routeStatus: 'FlightAllocConfig',
150 status: status 151 status: status
151 } 152 }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-date-picker> 22 </el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 - <el-col :span="6" v-if="infoForm.route != null"> 25 + <el-col :span="6" v-if="infoForm.route != null && infoForm.route != ' ' && infoForm.route!=''">
26 <el-form-item label="航线"> 26 <el-form-item label="航线">
27 <el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled> 27 <el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled>
28 </el-input> 28 </el-input>
...@@ -189,7 +189,8 @@ ...@@ -189,7 +189,8 @@
189 <el-card shadow="never" style="width: 95%"> 189 <el-card shadow="never" style="width: 95%">
190 <el-checkbox-group v-model="val.puporpuxCode" @change="change"> 190 <el-checkbox-group v-model="val.puporpuxCode" @change="change">
191 <el-row> 191 <el-row>
192 - <el-col :span="2" v-for="item in checkBoxItem.puporpux"> 192 + <el-col :span="2" v-for="item in checkBoxItem.puporpux"
193 + :key="item.id">
193 <el-checkbox 194 <el-checkbox
194 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)" 195 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
195 :label="item.chineseName" :name="item.chineseName" 196 :label="item.chineseName" :name="item.chineseName"
...@@ -543,49 +544,39 @@ export default { ...@@ -543,49 +544,39 @@ export default {
543 this.infoForm.fltNo = this.$route.params.fltNo 544 this.infoForm.fltNo = this.$route.params.fltNo
544 this.infoForm.fltDate = this.$route.params.fltDate 545 this.infoForm.fltDate = this.$route.params.fltDate
545 this.infoForm.route = this.$route.params.route 546 this.infoForm.route = this.$route.params.route
546 - if (this.routeSatus == 'dmLog') { 547 + if (this.$route.params.status) {
547 - this.getIdDimension(this.$route.params.id) 548 + if (this.routeSatus == 'dmLog') {
548 - } else { 549 + this.getIdDimension(this.$route.params.id)
549 - this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: this.$route.params.status }) 550 + } else {
551 + this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: this.$route.params.status ? this.$route.params.status : '' })
552 + }
550 } 553 }
551 } else { 554 } else {
552 this.infoForm.fltNo = '' 555 this.infoForm.fltNo = ''
553 this.infoForm.fltDate = null 556 this.infoForm.fltDate = null
554 this.infoForm.route = null 557 this.infoForm.route = null
555 } 558 }
559 +
556 }, 560 },
557 mounted() { 561 mounted() {
558 this.loading = false 562 this.loading = false
559 }, 563 },
560 - watch: { 564 + activated() {
561 - $route: { 565 + this.routeSatus = this.$route.params.routeStatus
562 - handler(to, from) { 566 + if (!this.$route.params.status) {
563 - let route = '' 567 + if (this.$route.params.handle == 'add') {
564 - if (from.name == 'FlightInformationMaintenance') { 568 + if (this.infoForm.fltNo && this.infoForm.fltNo != null && this.infoForm.fltNo != '') {
565 - this.routeSatus = 'flightInformationMaintenance' 569 + this.getRoutes(this.infoForm.fltNo)
566 - if (this.infoForm.list.length > 0) {
567 - route = this.infoForm.list[0].flightRoute
568 - }
569 - } else if (from.name == 'DmLog') {
570 - this.routeSatus = 'dmLog'
571 - if (this.infoForm.list.length > 0) {
572 - route = this.infoForm.list[0].flightRoute
573 - this.getIdDimension(this.infoForm.list[0].id)
574 - }
575 - } else {
576 - this.routeSatus = null
577 - }
578 - if (to.name == 'FlightAllocConfigInfo' && from.name != 'DmLog') {
579 - this.getRouteDimension({ fltNo: this.infoForm.fltNo, fltDate: this.infoForm.fltDate, route: route ? route : '', status: this.$route.params.status })
580 } 570 }
581 - if (this.$route.params.handle == 'add') { 571 + }
582 - if (this.infoForm.fltNo && this.infoForm.fltNo != null && this.infoForm.fltNo != '') { 572 + if (this.routeSatus == 'dmLog') {
583 - this.getRoutes(this.infoForm.fltNo) 573 + this.getIdDimension(this.$route.params.id)
584 - } 574 + } else {
585 - } 575 + this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: '' })
586 - }, 576 + }
587 - deep: true 577 + }
588 - }, 578 + },
579 + watch: {
589 }, 580 },
590 methods: { 581 methods: {
591 //页面选项 582 //页面选项
...@@ -651,7 +642,7 @@ export default { ...@@ -651,7 +642,7 @@ export default {
651 this.routeList = res.data.routeList 642 this.routeList = res.data.routeList
652 if (res.data.list.length > 0) { 643 if (res.data.list.length > 0) {
653 //请求到数据 644 //请求到数据
654 - if (this.infoForm.route != null && this.infoForm.route != null) { 645 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
655 //航线不为空，对应到这条航线下的这条维度(直接处理插入数据) 646 //航线不为空，对应到这条航线下的这条维度(直接处理插入数据)
656 if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') { 647 if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
657 //如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度 648 //如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度
...@@ -704,7 +695,7 @@ export default { ...@@ -704,7 +695,7 @@ export default {
704 } 695 }
705 } else { 696 } else {
706 //未请求到数据 697 //未请求到数据
707 - if (this.infoForm.route != null && this.infoForm.route != '') { 698 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
708 //航线不为空，获取该航线下无日期通用维度设置 699 //航线不为空，获取该航线下无日期通用维度设置
709 findDestinationFltRuleByFlightNo({ 700 findDestinationFltRuleByFlightNo({
710 purposeOfFlightNo: this.infoForm.fltNo, 701 purposeOfFlightNo: this.infoForm.fltNo,
...@@ -967,7 +958,6 @@ export default { ...@@ -967,7 +958,6 @@ export default {
967 this.infoForm.list[val].serviceCode = [] 958 this.infoForm.list[val].serviceCode = []
968 this.infoForm.list[val].handlingCode = [] 959 this.infoForm.list[val].handlingCode = []
969 this.infoForm.list[val].subCategory = [] 960 this.infoForm.list[val].subCategory = []
970 - console.log(this.infoForm)
971 this.$forceUpdate() 961 this.$forceUpdate()
972 }, 962 },
973 //启用，停用 963 //启用，停用
......
...@@ -785,10 +785,11 @@ export default { ...@@ -785,10 +785,11 @@ export default {
785 //查看航班维度 785 //查看航班维度
786 goFlightAllocConfig(val) { 786 goFlightAllocConfig(val) {
787 let obj = { 787 let obj = {
788 + id: ' ',
788 handle: 'update', 789 handle: 'update',
789 fltNo: val.fltNo, 790 fltNo: val.fltNo,
790 fltDate: val.fltDate ? val.fltDate : null, 791 fltDate: val.fltDate ? val.fltDate : null,
791 - route: val.flightKindName != 'Purple Tail' ? val.route : '', 792 + route: val.flightKindName != 'Purple Tail' ? val.route : ' ',
792 routeStatus: 'flightInformationMaintenance' + val.flightKindName, 793 routeStatus: 'flightInformationMaintenance' + val.flightKindName,
793 status: '1' 794 status: '1'
794 } 795 }
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </template> 69 </template>
70 <template v-slot:flightFltNo="scope"> 70 <template v-slot:flightFltNo="scope">
71 <el-link v-if="scope.row.allocDimId" type="primary" 71 <el-link v-if="scope.row.allocDimId" type="primary"
72 - @click="$router.push({ name: 'FlightAllocConfigInfo', params: { id: scope.row.allocDimId, handle: 'detail', fltNo: scope.row.flightFltNo, fltDate: scope.row.flightFltDate ? scope.row.flightFltDate : ' ', routeStatus: 'dmLog', route: scope.row.currentFlightRoute } })"> 72 + @click="$router.push({ name: 'FlightAllocConfigInfo', params: { id: scope.row.allocDimId, handle: 'detail', fltNo: scope.row.flightFltNo, fltDate: scope.row.flightFltDate ? scope.row.flightFltDate : ' ', routeStatus: 'dmLog', route: scope.row.currentFlightRoute? scope.row.currentFlightRoute:' ' } })">
73 {{ 73 {{
74 scope.row.flightFltNo 74 scope.row.flightFltNo
75 }}<i class="el-icon-link"></i> </el-link> 75 }}<i class="el-icon-link"></i> </el-link>
......