Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
15e668bc 1 parent 3470282b

bug修复

Inline Side-by-side
Showing 5 changed files with 40 additions and 42 deletions
...@@ -73,7 +73,7 @@ export const constantRoutes = [ ...@@ -73,7 +73,7 @@ export const constantRoutes = [
73 hidden: true, 73 hidden: true,
74 children: [ 74 children: [
75 { 75 {
76 - path: '/info/:handle/:fltNo-:fltDate', 76 + path: '/info/:handle/:id~:routeStatus~:fltNo~:route~:fltDate',
77 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 77 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
78 name: 'FlightAllocConfigInfo', 78 name: 'FlightAllocConfigInfo',
79 meta: { title: '航班配舱', icon: 'user' } 79 meta: { title: '航班配舱', icon: 'user' }
......
...@@ -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 }
......
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
11 <el-row class="mb20"> 11 <el-row class="mb20">
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="航班号" prop="fltNo"> 13 <el-form-item label="航班号" prop="fltNo">
14 - <el-input v-model.trim="infoForm.fltNo" @change="getRoutes" :disabled="fltNoDisabled" 14 + <el-input v-model.tirm="infoForm.fltNo" @change="getRoutes" :disabled="fltNoDisabled">
15 - maxlength="20">
16 </el-input> 15 </el-input>
17 </el-form-item> 16 </el-form-item>
18 </el-col> 17 </el-col>
...@@ -23,10 +22,9 @@ ...@@ -23,10 +22,9 @@
23 </el-date-picker> 22 </el-date-picker>
24 </el-form-item> 23 </el-form-item>
25 </el-col> 24 </el-col>
26 - <el-col :span="6" 25 + <el-col :span="6" v-if="infoForm.route != null && infoForm.route != ' ' && infoForm.route!=''">
27 - v-if="infoForm.route != null && routeSatus != 'flightInformationMaintenancePurple Tail'">
28 <el-form-item label="航线"> 26 <el-form-item label="航线">
29 - <el-input v-model.trim="infoForm.route" @change="getRoutes" disabled> 27 + <el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled>
30 </el-input> 28 </el-input>
31 </el-form-item> 29 </el-form-item>
32 </el-col> 30 </el-col>
...@@ -191,7 +189,8 @@ ...@@ -191,7 +189,8 @@
191 <el-card shadow="never" style="width: 95%"> 189 <el-card shadow="never" style="width: 95%">
192 <el-checkbox-group v-model="val.puporpuxCode" @change="change"> 190 <el-checkbox-group v-model="val.puporpuxCode" @change="change">
193 <el-row> 191 <el-row>
194 - <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">
195 <el-checkbox 194 <el-checkbox
196 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)" 195 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
197 :label="item.chineseName" :name="item.chineseName" 196 :label="item.chineseName" :name="item.chineseName"
...@@ -545,45 +544,39 @@ export default { ...@@ -545,45 +544,39 @@ export default {
545 this.infoForm.fltNo = this.$route.params.fltNo 544 this.infoForm.fltNo = this.$route.params.fltNo
546 this.infoForm.fltDate = this.$route.params.fltDate 545 this.infoForm.fltDate = this.$route.params.fltDate
547 this.infoForm.route = this.$route.params.route 546 this.infoForm.route = this.$route.params.route
548 - if (this.routeSatus == 'dmLog') { 547 + if (this.$route.params.status) {
549 - this.getIdDimension(this.$route.params.id) 548 + if (this.routeSatus == 'dmLog') {
550 - } else { 549 + this.getIdDimension(this.$route.params.id)
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 }) 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 + }
552 } 553 }
553 } else { 554 } else {
554 this.infoForm.fltNo = '' 555 this.infoForm.fltNo = ''
555 this.infoForm.fltDate = null 556 this.infoForm.fltDate = null
556 this.infoForm.route = null 557 this.infoForm.route = null
557 } 558 }
559 +
558 }, 560 },
559 mounted() { 561 mounted() {
560 this.loading = false 562 this.loading = false
561 }, 563 },
562 - watch: { 564 + activated() {
563 - $route: { 565 + this.routeSatus = this.$route.params.routeStatus
564 - handler(to, from) { 566 + if (!this.$route.params.status) {
565 - let route = '' 567 + if (this.$route.params.handle == 'add') {
566 - if (from.name == 'FlightInformationMaintenance') { 568 + if (this.infoForm.fltNo && this.infoForm.fltNo != null && this.infoForm.fltNo != '') {
567 - this.routeSatus = 'flightInformationMaintenance' 569 + this.getRoutes(this.infoForm.fltNo)
568 - route = this.infoForm.list[0].flightRoute
569 - } else if (from.name == 'DmLog') {
570 - this.routeSatus = 'dmLog'
571 - route = this.infoForm.list[0].flightRoute
572 - this.getIdDimension(this.infoForm.list[0].id)
573 - } else {
574 - this.routeSatus = null
575 - }
576 - if (to.name == 'FlightAllocConfigInfo' && from.name != 'DmLog') {
577 - this.getRouteDimension({ fltNo: this.infoForm.fltNo, fltDate: this.infoForm.fltDate, route: route ? route : '', status: this.$route.params.status })
578 - }
579 - if (this.$route.params.handle == 'add') {
580 - if (this.infoForm.fltNo && this.infoForm.fltNo != null && this.infoForm.fltNo != '') {
581 - this.getRoutes(this.infoForm.fltNo)
582 - }
583 } 570 }
584 - }, 571 + }
585 - deep: true 572 + if (this.routeSatus == 'dmLog') {
586 - }, 573 + this.getIdDimension(this.$route.params.id)
574 + } else {
575 + this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: '' })
576 + }
577 + }
578 + },
579 + watch: {
587 }, 580 },
588 methods: { 581 methods: {
589 //页面选项 582 //页面选项
...@@ -621,6 +614,7 @@ export default { ...@@ -621,6 +614,7 @@ export default {
621 this.infoForm.fltDate = res.data.list.ruleDate 614 this.infoForm.fltDate = res.data.list.ruleDate
622 this.infoForm.route = res.data.list.flightRoute 615 this.infoForm.route = res.data.list.flightRoute
623 this.infoForm.list.push(this.dataHandle(res.data.list)) 616 this.infoForm.list.push(this.dataHandle(res.data.list))
617 + console.log(this.infoForm)
624 } else { 618 } else {
625 this.isEmpty = true 619 this.isEmpty = true
626 } 620 }
...@@ -649,7 +643,7 @@ export default { ...@@ -649,7 +643,7 @@ export default {
649 this.routeList = res.data.routeList 643 this.routeList = res.data.routeList
650 if (res.data.list.length > 0) { 644 if (res.data.list.length > 0) {
651 //请求到数据 645 //请求到数据
652 - if (this.infoForm.route != null && this.infoForm.route != null) { 646 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
653 //航线不为空，对应到这条航线下的这条维度(直接处理插入数据) 647 //航线不为空，对应到这条航线下的这条维度(直接处理插入数据)
654 if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') { 648 if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
655 //如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度 649 //如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度
...@@ -702,7 +696,7 @@ export default { ...@@ -702,7 +696,7 @@ export default {
702 } 696 }
703 } else { 697 } else {
704 //未请求到数据 698 //未请求到数据
705 - if (this.infoForm.route != null && this.infoForm.route != '') { 699 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
706 //航线不为空，获取该航线下无日期通用维度设置 700 //航线不为空，获取该航线下无日期通用维度设置
707 findDestinationFltRuleByFlightNo({ 701 findDestinationFltRuleByFlightNo({
708 purposeOfFlightNo: this.infoForm.fltNo, 702 purposeOfFlightNo: this.infoForm.fltNo,
...@@ -764,6 +758,7 @@ export default { ...@@ -764,6 +758,7 @@ export default {
764 }) 758 })
765 } else { 759 } else {
766 //航班类型Purple Tail展示全部航线维度 760 //航班类型Purple Tail展示全部航线维度
761 + // this.isEmpty = true
767 this.routeList.forEach((route) => { 762 this.routeList.forEach((route) => {
768 this.infoForm.list.push({ 763 this.infoForm.list.push({
769 purposeOfFlightNo: this.infoForm.fltNo, 764 purposeOfFlightNo: this.infoForm.fltNo,
...@@ -781,7 +776,6 @@ export default { ...@@ -781,7 +776,6 @@ export default {
781 } else { 776 } else {
782 //航线为空，提示未找到维度数据 777 //航线为空，提示未找到维度数据
783 if (this.routeSatus == 'flightInformationMaintenancePurple Tail') { 778 if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
784 - console.log(this.infoForm.fltNo, this.infoForm.route, this.$route.params.status)
785 findDestinationFltRuleByFlightNo({ 779 findDestinationFltRuleByFlightNo({
786 purposeOfFlightNo: this.infoForm.fltNo, 780 purposeOfFlightNo: this.infoForm.fltNo,
787 flightRoute: this.infoForm.route, 781 flightRoute: this.infoForm.route,
...@@ -811,7 +805,7 @@ export default { ...@@ -811,7 +805,7 @@ export default {
811 } 805 }
812 }) 806 })
813 } else { 807 } else {
814 - this.routeList.forEach(route => { 808 + this.routeList.forEach((route) => {
815 this.infoForm.list.push({ 809 this.infoForm.list.push({
816 purposeOfFlightNo: this.infoForm.fltNo, 810 purposeOfFlightNo: this.infoForm.fltNo,
817 ruleDate: this.infoForm.fltDate, 811 ruleDate: this.infoForm.fltDate,
...@@ -965,6 +959,7 @@ export default { ...@@ -965,6 +959,7 @@ export default {
965 this.infoForm.list[val].serviceCode = [] 959 this.infoForm.list[val].serviceCode = []
966 this.infoForm.list[val].handlingCode = [] 960 this.infoForm.list[val].handlingCode = []
967 this.infoForm.list[val].subCategory = [] 961 this.infoForm.list[val].subCategory = []
962 + console.log(this.infoForm)
968 this.$forceUpdate() 963 this.$forceUpdate()
969 }, 964 },
970 //启用，停用 965 //启用，停用
......
...@@ -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 }
...@@ -888,6 +889,7 @@ export default { ...@@ -888,6 +889,7 @@ export default {
888 //取消按钮 889 //取消按钮
889 cancel() { 890 cancel() {
890 this.routeList = [] 891 this.routeList = []
892 + this.routeMultiple = false
891 this.open = false; 893 this.open = false;
892 this.findAllFltData(); 894 this.findAllFltData();
893 this.findFltConditionData(); 895 this.findFltConditionData();
......
...@@ -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>
......