Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
7d266b65 1 parent 8350e270

文本修正，航班维护跳转维度修改，目的地页面条件空状态修正

Inline Side-by-side
Showing 8 changed files with 72 additions and 19 deletions
...@@ -427,7 +427,7 @@ let tableHeaders = { ...@@ -427,7 +427,7 @@ let tableHeaders = {
427 status: 1 427 status: 1
428 }, 428 },
429 { 429 {
430 - columnChineseName: "航线", 430 + columnChineseName: "当前配载航线",
431 columnName: "flightRoute", 431 columnName: "flightRoute",
432 columnWidth: "140", 432 columnWidth: "140",
433 status: 1 433 status: 1
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 </el-tooltip> 30 </el-tooltip>
31 </div> 31 </div>
32 </template> 32 </template>
33 - <el-select class="formItem" v-model="formData.route" placeholder="不限" :disabled="routeList.length == 0"> 33 + <el-select class="formItem" v-model="formData.route" placeholder="请选择航线" :disabled="routeList.length == 0">
34 <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index"> 34 <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index">
35 <Tooltips :content="item.route" :refName="item.route"></Tooltips> 35 <Tooltips :content="item.route" :refName="item.route"></Tooltips>
36 </el-option> 36 </el-option>
......
...@@ -543,12 +543,30 @@ export default { ...@@ -543,12 +543,30 @@ export default {
543 this.fltNoDisabled = true 543 this.fltNoDisabled = true
544 this.infoForm.fltNo = this.$route.params.fltNo 544 this.infoForm.fltNo = this.$route.params.fltNo
545 this.infoForm.fltDate = this.$route.params.fltDate 545 this.infoForm.fltDate = this.$route.params.fltDate
546 - this.infoForm.route = this.$route.params.route
547 if (this.$route.params.status) { 546 if (this.$route.params.status) {
548 if (this.routeSatus == 'dmLog') { 547 if (this.routeSatus == 'dmLog') {
548 + this.infoForm.route = this.$route.params.route
549 this.getIdDimension(this.$route.params.id) 549 this.getIdDimension(this.$route.params.id)
550 } else { 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 : '' }) 551 + let obj = {
552 + fltNo: this.$route.params.fltNo,
553 + fltDate: this.$route.params.fltDate,
554 + status: this.$route.params.status ? this.$route.params.status : ''
555 + }
556 +
557 + if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
558 + this.infoForm.route = this.$route.params.route
559 + obj.route = this.$route.params.route
560 + obj.flightRouteListStr = this.$route.params.route
561 + } else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
562 + this.infoForm.route = ''
563 + obj.route = ''
564 + obj.flightRouteListStr = this.$route.params.route
565 + } else {
566 + obj.route = this.$route.params.route ? this.$route.params.route : ''
567 + }
568 +
569 + this.getRouteDimension(obj)
552 } 570 }
553 } 571 }
554 } else { 572 } else {
...@@ -572,7 +590,23 @@ export default { ...@@ -572,7 +590,23 @@ export default {
572 if (this.routeSatus == 'dmLog') { 590 if (this.routeSatus == 'dmLog') {
573 this.getIdDimension(this.$route.params.id) 591 this.getIdDimension(this.$route.params.id)
574 } else { 592 } else {
575 - this.getRouteDimension({ fltNo: this.$route.params.fltNo, fltDate: this.$route.params.fltDate, route: this.$route.params.route ? this.$route.params.route : '', status: '' }) 593 + let obj = {
594 + fltNo: this.$route.params.fltNo,
595 + fltDate: this.$route.params.fltDate,
596 + status: this.$route.params.status ? this.$route.params.status : ''
597 + }
598 +
599 + if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
600 + obj.route = this.$route.params.route
601 + obj.flightRouteListStr = this.$route.params.route
602 + } else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
603 + obj.route = ''
604 + obj.flightRouteListStr = this.$route.params.route
605 + } else {
606 + obj.route = this.$route.params.route ? this.$route.params.route : ''
607 + }
608 +
609 + this.getRouteDimension(obj)
576 } 610 }
577 } 611 }
578 }, 612 },
...@@ -614,6 +648,7 @@ export default { ...@@ -614,6 +648,7 @@ export default {
614 this.infoForm.fltDate = res.data.list.ruleDate 648 this.infoForm.fltDate = res.data.list.ruleDate
615 this.infoForm.route = res.data.list.flightRoute 649 this.infoForm.route = res.data.list.flightRoute
616 this.infoForm.list.push(this.dataHandle(res.data.list)) 650 this.infoForm.list.push(this.dataHandle(res.data.list))
651 + console.log(this.infoForm)
617 } else { 652 } else {
618 this.isEmpty = true 653 this.isEmpty = true
619 } 654 }
...@@ -634,6 +669,7 @@ export default { ...@@ -634,6 +669,7 @@ export default {
634 purposeOfFlightNo: val.fltNo, 669 purposeOfFlightNo: val.fltNo,
635 flightDate: val.fltDate, 670 flightDate: val.fltDate,
636 flightRoute: val.route, 671 flightRoute: val.route,
672 + flightRouteListStr: val.flightRouteListStr,
637 status: val.status ? val.status : '' 673 status: val.status ? val.status : ''
638 } 674 }
639 if (this.$route.params.handle != 'add') { 675 if (this.$route.params.handle != 'add') {
...@@ -703,8 +739,10 @@ export default { ...@@ -703,8 +739,10 @@ export default {
703 findDestinationFltRuleByFlightNo({ 739 findDestinationFltRuleByFlightNo({
704 purposeOfFlightNo: this.infoForm.fltNo, 740 purposeOfFlightNo: this.infoForm.fltNo,
705 flightRoute: this.infoForm.route, 741 flightRoute: this.infoForm.route,
742 + flightRouteListStr: this.$route.params.route,
706 status: this.$route.params.status 743 status: this.$route.params.status
707 }).then(response => { 744 }).then(response => {
745 + this.routeList = response.data.routeList
708 if (response.data.list.length > 0) { 746 if (response.data.list.length > 0) {
709 //查询到通用维度，去除id status，航线赋值，航线优先级赋值 747 //查询到通用维度，去除id status，航线赋值，航线优先级赋值
710 if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') { 748 if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
...@@ -776,16 +814,18 @@ export default { ...@@ -776,16 +814,18 @@ export default {
776 console.log(err) 814 console.log(err)
777 }) 815 })
778 } else { 816 } else {
779 - //航线为空，提示未找到维度数据 817 + //航线为空
780 - if (this.routeSatus == 'flightInformationMaintenancePurple Tail' || this.routeSatus == 'FlightRandConfig') { 818 + if (this.routeSatus == 'FlightRandConfig') {
781 if (this.routeSatus == 'FlightRandConfig') { 819 if (this.routeSatus == 'FlightRandConfig') {
782 this.infoForm.fltDate = '' 820 this.infoForm.fltDate = ''
783 } 821 }
784 findDestinationFltRuleByFlightNo({ 822 findDestinationFltRuleByFlightNo({
785 purposeOfFlightNo: this.infoForm.fltNo, 823 purposeOfFlightNo: this.infoForm.fltNo,
786 flightRoute: this.infoForm.route, 824 flightRoute: this.infoForm.route,
825 + flightRouteListStr: this.$route.params.route,
787 status: this.$route.params.status 826 status: this.$route.params.status
788 }).then(response => { 827 }).then(response => {
828 + this.routeList = response.data.routeList
789 if (response.data.list.length > 0) { 829 if (response.data.list.length > 0) {
790 this.routeList.forEach(route => { 830 this.routeList.forEach(route => {
791 let routeStatus = 1 831 let routeStatus = 1
...@@ -823,6 +863,15 @@ export default { ...@@ -823,6 +863,15 @@ export default {
823 this.isEmpty = true 863 this.isEmpty = true
824 console.log(err) 864 console.log(err)
825 }) 865 })
866 + } else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
867 + this.routeList.forEach((route) => {
868 + this.infoForm.list.push({
869 + purposeOfFlightNo: this.infoForm.fltNo,
870 + ruleDate: this.infoForm.fltDate,
871 + flightRoute: route.route,
872 + routePriority: route.routePriority,
873 + })
874 + })
826 } 875 }
827 } 876 }
828 } 877 }
......
...@@ -315,7 +315,7 @@ export default { ...@@ -315,7 +315,7 @@ export default {
315 fltNo: [ 315 fltNo: [
316 { 316 {
317 required: true, 317 required: true,
318 - message: "ACCS原航班号不能为空", 318 + message: "航班号不能为空",
319 trigger: "blur", 319 trigger: "blur",
320 }, 320 },
321 ], 321 ],
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
343 route: [ 343 route: [
344 { 344 {
345 required: true, 345 required: true,
346 - message: "航班线路不能为空", 346 + message: "航班路线不能为空",
347 trigger: "blur", 347 trigger: "blur",
348 }, 348 },
349 // { 349 // {
...@@ -828,7 +828,7 @@ export default { ...@@ -828,7 +828,7 @@ export default {
828 handle: 'update', 828 handle: 'update',
829 fltNo: val.fltNo, 829 fltNo: val.fltNo,
830 fltDate: val.fltDate ? val.fltDate : null, 830 fltDate: val.fltDate ? val.fltDate : null,
831 - route: val.flightKindName != 'Purple Tail' ? val.route : ' ', 831 + route: val.route,
832 routeStatus: 'flightInformationMaintenance' + val.flightKindName, 832 routeStatus: 'flightInformationMaintenance' + val.flightKindName,
833 status: ' ', 833 status: ' ',
834 createStatus: 1, 834 createStatus: 1,
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 </el-tooltip> 30 </el-tooltip>
31 </div> 31 </div>
32 </template> 32 </template>
33 - <el-select class="formItem" v-model="formData.route" placeholder="不限" :disabled="routeList.length == 0"> 33 + <el-select class="formItem" v-model="formData.route" placeholder="请选择航线" :disabled="routeList.length == 0">
34 <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index"> 34 <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" :key="index">
35 <Tooltips :content="item.route" :refName="item.route"></Tooltips> 35 <Tooltips :content="item.route" :refName="item.route"></Tooltips>
36 </el-option> 36 </el-option>
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
47 </div> 47 </div>
48 <Tables ref="flightToArea" ductName="flightToArea" :selection="false" :selectFixed="false" :order='true' 48 <Tables ref="flightToArea" ductName="flightToArea" :selection="false" :selectFixed="false" :order='true'
49 :height="tableHeight" :data="tableData" :headerData="tableHeaders" :page="formData.page" :pageSizes="[20]" 49 :height="tableHeight" :data="tableData" :headerData="tableHeaders" :page="formData.page" :pageSizes="[20]"
50 - :totalCount="total" :loading="tableLoading" @currentChange="currentChange" 50 + :totalCount="total" :loading="tableLoading" @currentChange="currentChange">">
51 - layout="total,prev, pager, next, jumper, ->">
52 </Tables> 51 </Tables>
53 </div> 52 </div>
54 </template> 53 </template>
...@@ -113,6 +112,9 @@ export default { ...@@ -113,6 +112,9 @@ export default {
113 page: this.formData.page, 112 page: this.formData.page,
114 size: 20 113 size: 20
115 } 114 }
115 + if (obj.area == '') {
116 + obj.area = null
117 + }
116 searchFlightDestination(obj).then(res => { 118 searchFlightDestination(obj).then(res => {
117 this.tableLoading = false 119 this.tableLoading = false
118 if (res.code === 200) { 120 if (res.code === 200) {
...@@ -185,7 +187,7 @@ export default { ...@@ -185,7 +187,7 @@ export default {
185 this.selection() 187 this.selection()
186 }, 188 },
187 upload() { 189 upload() {
188 - this.$refs.selectForm.validateField('beginDate') 190 + ield('beginDate')
189 } 191 }
190 }, 192 },
191 }; 193 };
......
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
48 </div> 48 </div>
49 <Tables ref="flightToArea" ductName="flightToArea" :selection="false" :selectFixed="false" :order='true' 49 <Tables ref="flightToArea" ductName="flightToArea" :selection="false" :selectFixed="false" :order='true'
50 :height="tableHeight" :data="tableData" :headerData="tableHeaders" :page="formData.page" :pageSizes="[20]" 50 :height="tableHeight" :data="tableData" :headerData="tableHeaders" :page="formData.page" :pageSizes="[20]"
51 - :totalCount="total" :loading="tableLoading" @currentChange="currentChange" 51 + :totalCount="total" :loading="tableLoading" @currentChange="currentChange" ->">
52 - layout="total,prev, pager, next, jumper, ->">
53 </Tables> 52 </Tables>
54 </div> 53 </div>
55 </template> 54 </template>
...@@ -117,6 +116,9 @@ export default { ...@@ -117,6 +116,9 @@ export default {
117 } else { 116 } else {
118 obj.ursa = null 117 obj.ursa = null
119 } 118 }
119 + if (obj.area == '') {
120 + obj.area = null
121 + }
120 searchUrsaDestination(obj).then(res => { 122 searchUrsaDestination(obj).then(res => {
121 this.tableLoading = false 123 this.tableLoading = false
122 if (res.code === 200) { 124 if (res.code === 200) {
...@@ -191,7 +193,7 @@ export default { ...@@ -191,7 +193,7 @@ export default {
191 this.selection() 193 this.selection()
192 }, 194 },
193 upload() { 195 upload() {
194 - this.$refs.selectForm.validateField('beginDate') 196 + Field('beginDate')
195 } 197 }
196 }, 198 },
197 }; 199 };
......
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
178 cancelButtonText: '取消', 178 cancelButtonText: '取消',
179 type: "warning", 179 type: "warning",
180 }).then(() => { 180 }).then(() => {
181 - this.statusChange({ id: val.id, status: status, tip: tip }) 181 + this.statusChange({ id: val.id, status: status })
182 }).catch(() => { }) 182 }).catch(() => { })
183 } else { 183 } else {
184 this.msgWarning(res.msg) 184 this.msgWarning(res.msg)
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
192 cancelButtonText: '取消', 192 cancelButtonText: '取消',
193 type: "warning", 193 type: "warning",
194 }).then(() => { 194 }).then(() => {
195 - this.statusChange({ id: val.id, status: status, tip: tip }) 195 + this.statusChange({ id: val.id, status: status })
196 }).catch(() => { }) 196 }).catch(() => { })
197 } 197 }
198 }, 198 },
......