Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9747b003 1 parent 7ca96c4a

航班展示修正

Inline Side-by-side
Showing 3 changed files with 184 additions and 144 deletions
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
34 params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' }, 34 params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' },
35 }) 35 })
36 ">添加</el-button> 36 ">添加</el-button>
37 - <el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1" inactive-value="2" active-color="#13ce66" 37 + <el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1"
38 - inactive-color="#909399" @change="switchChange"></el-switch> 38 + inactive-value="2" active-color="#13ce66" inactive-color="#909399" @change="switchChange"></el-switch>
39 </div> 39 </div>
40 </el-form> 40 </el-form>
41 <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true" 41 <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true"
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
114 // }) 114 // })
115 }, 115 },
116 mounted() { 116 mounted() {
117 - this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200 117 + this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200
118 }, 118 },
119 activated() { 119 activated() {
120 this.getList() 120 this.getList()
...@@ -152,7 +152,7 @@ export default { ...@@ -152,7 +152,7 @@ export default {
152 fltDate: fltDate != null ? fltDate : ' ', 152 fltDate: fltDate != null ? fltDate : ' ',
153 route: ' ', 153 route: ' ',
154 routeStatus: 'FlightAllocConfig', 154 routeStatus: 'FlightAllocConfig',
155 - status: status, 155 + status: status == '3' ? '3' : ' ',
156 createStatus: 1 156 createStatus: 1
157 } 157 }
158 this.$router.push({ 158 this.$router.push({
......
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
51 v-if="routeSatus != 'flightInformationMaintenanceWhite Tail' && routeSatus != 'dmLog'" 51 v-if="routeSatus != 'flightInformationMaintenanceWhite Tail' && routeSatus != 'dmLog'"
52 class="backgroundCollapse" :value="infoForm.list.length > 0 ? routeList[0].route : ''" 52 class="backgroundCollapse" :value="infoForm.list.length > 0 ? routeList[0].route : ''"
53 style="min-height:500px;width:95%;margin:0 auto 50px" accordion v-loading="loading"> 53 style="min-height:500px;width:95%;margin:0 auto 50px" accordion v-loading="loading">
54 - <el-collapse-item v-for="(routeItem, index) in routeList" :key="index" :name="routeItem.route"> 54 + <el-collapse-item v-for="(routeItem, index) in routeList" :key="index" :name="routeItem.route"
55 + v-if="($route.params.status == '3' && infoRouteList.includes(routeItem.route)) || $route.params.status != '3'">
55 <template slot="title"> 56 <template slot="title">
56 <span class="fontWeight">{{ routeItem.route }}</span> 57 <span class="fontWeight">{{ routeItem.route }}</span>
57 </template> 58 </template>
...@@ -581,6 +582,7 @@ export default { ...@@ -581,6 +582,7 @@ export default {
581 }, 582 },
582 ] 583 ]
583 }, 584 },
585 + infoRouteList: [],
584 status: '', 586 status: '',
585 routeSatus: '', 587 routeSatus: '',
586 isEmpty: false, 588 isEmpty: false,
...@@ -599,15 +601,14 @@ export default { ...@@ -599,15 +601,14 @@ export default {
599 this.fltNoDisabled = true 601 this.fltNoDisabled = true
600 this.infoForm.fltNo = this.$route.params.fltNo 602 this.infoForm.fltNo = this.$route.params.fltNo
601 this.infoForm.fltDate = this.$route.params.fltDate 603 this.infoForm.fltDate = this.$route.params.fltDate
604 + this.infoForm.route = this.$route.params.route
602 if (this.$route.params.status) { 605 if (this.$route.params.status) {
603 if (this.routeSatus == 'dmLog') { 606 if (this.routeSatus == 'dmLog') {
604 - this.infoForm.route = this.$route.params.route
605 this.getIdDimension(this.$route.params.id) 607 this.getIdDimension(this.$route.params.id)
606 } else { 608 } else {
607 this.getRouteDimension(this.getSreachData()) 609 this.getRouteDimension(this.getSreachData())
608 } 610 }
609 } 611 }
610 -
611 } else { 612 } else {
612 this.infoForm.fltNo = '' 613 this.infoForm.fltNo = ''
613 this.infoForm.fltDate = null 614 this.infoForm.fltDate = null
...@@ -746,107 +747,118 @@ export default { ...@@ -746,107 +747,118 @@ export default {
746 infoRouteList.push(JSON.parse(JSON.stringify(dateItem.flightRoute))) 747 infoRouteList.push(JSON.parse(JSON.stringify(dateItem.flightRoute)))
747 } 748 }
748 }) 749 })
749 - //判断是否有日期，看是否需要查询无日期维度 750 + //非停用展示
750 - if (obj.flightDate != null && obj.flightDate != '' && obj.flightDate != ' ') { 751 + if (val.status != '3') {
751 - findDestinationFltRuleByFlightNo({ 752 + //判断是否有日期，看是否需要查询无日期维度
752 - purposeOfFlightNo: this.infoForm.fltNo, 753 + if (obj.flightDate != null && obj.flightDate != '' && obj.flightDate != ' ') {
753 - fltDate: '', 754 + findDestinationFltRuleByFlightNo({
754 - flightRoute: this.infoForm.route, 755 + purposeOfFlightNo: this.infoForm.fltNo,
755 - flightRouteListStr: this.$route.params.route, 756 + fltDate: '',
756 - status: this.$route.params.status 757 + flightRoute: this.infoForm.route,
757 - }).then(resData => { 758 + flightRouteListStr: this.$route.params.route,
758 - if (resData.data.list.length > 0) { 759 + status: this.$route.params.status
759 - this.routeList.forEach((route, sub) => { 760 + }).then(resData => {
760 - if (!infoRouteList.includes(route.route)) { 761 + if (resData.data.list.length > 0) {
762 + this.routeList.forEach((route, sub) => {
763 + if (!infoRouteList.includes(route.route)) {
764 + let routeStatus = 1
765 + resData.data.list.forEach(item => {
766 + if (item.flightRoute == route.route) {
767 + item.id = undefined
768 + item.status = undefined
769 + routeStatus = 2
770 + this.infoForm.list.push(
771 + this.dataHandle(item)
772 + )
773 + }
774 + })
775 + if (routeStatus == 1) {
776 + // 否则插入占位基础数据
777 + this.infoForm.list.push({
778 + purposeOfFlightNo: this.infoForm.fltNo,
779 + ruleDate: this.infoForm.fltDate,
780 + flightRoute: route.route,
781 + routePriority: route.routePriority,
782 + })
783 + this.newRoute(sub, route.route)
784 + }
785 + } else {
786 + infoRouteList.forEach((item, index) => {
787 + if (item == route.route) {
788 + this.infoForm.list.push(
789 + this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
790 + )
791 + }
792 + })
793 + }
794 + })
795 + } else {
796 + this.routeList.forEach((route) => {
761 let routeStatus = 1 797 let routeStatus = 1
762 - resData.data.list.forEach(item => { 798 + infoRouteList.forEach((item, index) => {
763 - if (item.flightRoute == route.route) { 799 + if (item == route.route) {
764 - item.id = undefined
765 - item.status = undefined
766 routeStatus = 2 800 routeStatus = 2
767 this.infoForm.list.push( 801 this.infoForm.list.push(
768 - this.dataHandle(item) 802 + this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
769 ) 803 )
770 } 804 }
771 }) 805 })
772 if (routeStatus == 1) { 806 if (routeStatus == 1) {
773 - // 否则插入占位基础数据
774 this.infoForm.list.push({ 807 this.infoForm.list.push({
775 purposeOfFlightNo: this.infoForm.fltNo, 808 purposeOfFlightNo: this.infoForm.fltNo,
776 ruleDate: this.infoForm.fltDate, 809 ruleDate: this.infoForm.fltDate,
777 flightRoute: route.route, 810 flightRoute: route.route,
778 routePriority: route.routePriority, 811 routePriority: route.routePriority,
779 }) 812 })
780 - this.newRoute(sub, route.route)
781 } 813 }
782 - } else { 814 + })
783 - infoRouteList.forEach((item, index) => { 815 + }
784 - if (item == route.route) { 816 + }).catch(err => {
785 - this.infoForm.list.push( 817 + this.isEmpty = true
786 - this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index]))) 818 + console.log(err)
787 - ) 819 + })
788 - } 820 + } else {
789 - }) 821 + // 航班配舱设置普通规则
790 - } 822 + this.routeList.forEach((route, sub) => {
791 - }) 823 + if (!infoRouteList.includes(route.route)) {
792 - } else { 824 + this.infoForm.list.push({
793 - this.routeList.forEach((route) => { 825 + purposeOfFlightNo: this.infoForm.fltNo,
826 + ruleDate: this.infoForm.fltDate,
827 + flightRoute: route.route,
828 + routePriority: route.routePriority,
829 + })
830 + } else {
794 let routeStatus = 1 831 let routeStatus = 1
795 - infoRouteList.forEach((item, index) => { 832 + res.data.list.forEach(item => {
796 - if (item == route.route) { 833 + if (item.flightRoute == route.route) {
834 + // item.id = undefined
835 + // item.status = undefined
797 routeStatus = 2 836 routeStatus = 2
798 this.infoForm.list.push( 837 this.infoForm.list.push(
799 - this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index]))) 838 + this.dataHandle(item)
800 ) 839 )
801 } 840 }
802 }) 841 })
803 if (routeStatus == 1) { 842 if (routeStatus == 1) {
843 + // 否则插入占位基础数据
804 this.infoForm.list.push({ 844 this.infoForm.list.push({
805 purposeOfFlightNo: this.infoForm.fltNo, 845 purposeOfFlightNo: this.infoForm.fltNo,
806 ruleDate: this.infoForm.fltDate, 846 ruleDate: this.infoForm.fltDate,
807 flightRoute: route.route, 847 flightRoute: route.route,
808 routePriority: route.routePriority, 848 routePriority: route.routePriority,
809 }) 849 })
850 + this.newRoute(sub, route.route)
810 } 851 }
811 - })
812 - }
813 - }).catch(err => {
814 - this.isEmpty = true
815 - console.log(err)
816 - })
817 - } else {
818 - // 航班配舱设置普通规则
819 - this.routeList.forEach((route, sub) => {
820 - if (!infoRouteList.includes(route.route)) {
821 - this.infoForm.list.push({
822 - purposeOfFlightNo: this.infoForm.fltNo,
823 - ruleDate: this.infoForm.fltDate,
824 - flightRoute: route.route,
825 - routePriority: route.routePriority,
826 - })
827 - } else {
828 - let routeStatus = 1
829 - res.data.list.forEach(item => {
830 - if (item.flightRoute == route.route) {
831 - // item.id = undefined
832 - // item.status = undefined
833 - routeStatus = 2
834 - this.infoForm.list.push(
835 - this.dataHandle(item)
836 - )
837 - }
838 - })
839 - if (routeStatus == 1) {
840 - // 否则插入占位基础数据
841 - this.infoForm.list.push({
842 - purposeOfFlightNo: this.infoForm.fltNo,
843 - ruleDate: this.infoForm.fltDate,
844 - flightRoute: route.route,
845 - routePriority: route.routePriority,
846 - })
847 - this.newRoute(sub, route.route)
848 } 852 }
849 - } 853 + })
854 + }
855 + } else {
856 + //停用展示
857 + res.data.list.forEach(dateItem => {
858 + this.infoRouteList.push(dateItem.flightRoute)
859 + this.infoForm.list.push(
860 + this.dataHandle(JSON.parse(JSON.stringify(dateItem)))
861 + )
850 }) 862 })
851 } 863 }
852 } else { 864 } else {
...@@ -858,43 +870,73 @@ export default { ...@@ -858,43 +870,73 @@ export default {
858 status: this.$route.params.status 870 status: this.$route.params.status
859 } 871 }
860 findDestinationFltRuleByFlightNo(params).then(response => { 872 findDestinationFltRuleByFlightNo(params).then(response => {
861 - // 航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度） 873 + if (response.data.list.length > 0) {
862 - this.routeList.forEach((route, sub) => { 874 + let infoRouteList = []
863 - let routeStatus = 1
864 res.data.list.forEach(item => { 875 res.data.list.forEach(item => {
865 - if (route.route === item.flightRoute) { 876 + //航线对应插入数据
866 - //航线对应插入数据 877 + infoRouteList.push(item.flightRoute)
867 - routeStatus = 2
868 - // item.id = undefined
869 - // item.status = undefined
870 - this.infoForm.list.push(this.dataHandle(item))
871 - }
872 }) 878 })
873 - if (routeStatus == 1) { 879 + // 航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
874 - //日期下无维度的，查询是否存在无日期维度，有则占位展示，无则使用新增占位 880 + this.routeList.forEach((route, sub) => {
875 - response.data.list.forEach(item => { 881 + if (!infoRouteList.includes(route.route)) {
876 - if (route.route === item.flightRoute) { 882 + let routeStatus = 1
877 - item.id = undefined 883 + //日期下无维度的，查询是否存在无日期维度，有则占位展示，无则使用新增占位
878 - item.status = undefined 884 + response.data.list.forEach(item => {
879 - item.flightRoute = this.infoForm.route 885 + let obj = JSON.parse(JSON.stringify(item))
880 - this.routeList.forEach(route => { 886 + if (obj.flightRoute == route.route) {
881 - if (route.route === this.infoForm.route) { 887 + obj.id = undefined
882 - item.routePriority = route.routePriority 888 + obj.status = undefined
883 - } 889 + routeStatus = 2
890 + // obj.flightRoute = this.infoForm.route
891 + // this.routeList.forEach(route => {
892 + // if (route.route === this.infoForm.route) {
893 + // obj.routePriority = route.routePriority
894 + // }
895 + // })
896 + this.infoForm.list.push(this.dataHandle(obj))
897 + }
898 + })
899 + if (routeStatus == 1) {
900 + //否则插入占位基础数据
901 + this.infoForm.list.push({
902 + purposeOfFlightNo: this.infoForm.fltNo,
903 + ruleDate: this.infoForm.fltDate,
904 + flightRoute: route.route,
905 + routePriority: route.routePriority,
884 }) 906 })
885 - this.infoForm.list.push(this.dataHandle(item)) 907 + this.newRoute(sub, route.route)
908 + }
909 + } else {
910 + infoRouteList.forEach((item, index) => {
911 + if (item == route.route) {
912 + this.infoForm.list.push(
913 + this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
914 + )
915 + }
916 + })
917 + }
918 + })
919 + } else {
920 + this.routeList.forEach((route) => {
921 + let routeStatus = 1
922 + infoRouteList.forEach((item, index) => {
923 + if (item == route.route) {
924 + routeStatus = 2
925 + this.infoForm.list.push(
926 + this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
927 + )
886 } 928 }
887 }) 929 })
888 - //否则插入占位基础数据 930 + if (routeStatus == 1) {
889 - this.infoForm.list.push({ 931 + this.infoForm.list.push({
890 - purposeOfFlightNo: this.infoForm.fltNo, 932 + purposeOfFlightNo: this.infoForm.fltNo,
891 - ruleDate: this.infoForm.fltDate, 933 + ruleDate: this.infoForm.fltDate,
892 - flightRoute: route.route, 934 + flightRoute: route.route,
893 - routePriority: route.routePriority, 935 + routePriority: route.routePriority,
894 - }) 936 + })
895 - this.newRoute(sub, route.route) 937 + }
896 - } 938 + })
897 - }) 939 + }
898 }) 940 })
899 } 941 }
900 } 942 }
...@@ -1234,7 +1276,6 @@ export default { ...@@ -1234,7 +1276,6 @@ export default {
1234 }, 1276 },
1235 //新增 1277 //新增
1236 newRoute(val, route) { 1278 newRoute(val, route) {
1237 - console.log(route)
1238 this.infoForm.list[val].purposeOfFlightNo = this.infoForm.fltNo 1279 this.infoForm.list[val].purposeOfFlightNo = this.infoForm.fltNo
1239 this.infoForm.list[val].ruleDate = this.infoForm.fltDate 1280 this.infoForm.list[val].ruleDate = this.infoForm.fltDate
1240 this.infoForm.list[val].flightRoute = route 1281 this.infoForm.list[val].flightRoute = route
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 </el-row> 49 </el-row>
50 - <el-button class="mt10" type="primary" icon="el-icon-search" size="mini" :loading="loading" 50 + <el-button class="mt10" type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="handleQuery">搜索
51 - @click="handleQuery">搜索
52 </el-button> 51 </el-button>
53 <el-button class="mt10" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 52 <el-button class="mt10" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
54 <el-button class="mt10" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" 53 <el-button class="mt10" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
...@@ -81,8 +80,8 @@ ...@@ -81,8 +80,8 @@
81 <Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader" 80 <Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
82 :order="true" :selection="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limitSize" 81 :order="true" :selection="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limitSize"
83 :page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]" 82 :page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]"
84 - @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange" 83 + @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"
85 - @sortChange="sortChange" @sizeChange="sizeChange"> 84 + @sizeChange="sizeChange">
86 <template slot="optionColumn"> 85 <template slot="optionColumn">
87 <el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center" 86 <el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
88 class-name="small-padding fixed-width" :fixed="tableHeader.length > 10 ? 'right' : false" width="160"> 87 class-name="small-padding fixed-width" :fixed="tableHeader.length > 10 ? 'right' : false" width="160">
...@@ -116,8 +115,8 @@ ...@@ -116,8 +115,8 @@
116 <el-row> 115 <el-row>
117 <el-col :span="12"> 116 <el-col :span="12">
118 <el-form-item label="航班日期" prop="fltDate"> 117 <el-form-item label="航班日期" prop="fltDate">
119 - <el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small" 118 + <el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small" v-model="form.fltDate"
120 - v-model="form.fltDate" type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期"> 119 + type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
121 </el-date-picker> 120 </el-date-picker>
122 </el-form-item> 121 </el-form-item>
123 </el-col> 122 </el-col>
...@@ -143,15 +142,15 @@ ...@@ -143,15 +142,15 @@
143 </el-tooltip> 142 </el-tooltip>
144 </div> 143 </div>
145 </template> 144 </template>
146 - <el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route" 145 + <el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route"
147 - placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading" 146 + :disabled="formdisabled.route" placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange"
148 - :multiple='true' :key="routeMultiple"> 147 + :loading="routeLoading" :multiple='true' :key="routeMultiple">
149 <el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route"> 148 <el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route">
150 </el-option> 149 </el-option>
151 </el-select> 150 </el-select>
152 - <el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route" 151 + <el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route"
153 - placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading" 152 + :disabled="formdisabled.route" placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange"
154 - :multiple='false' :key="routeMultiple"> 153 + :loading="routeLoading" :multiple='false' :key="routeMultiple">
155 <el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route"> 154 <el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route">
156 </el-option> 155 </el-option>
157 </el-select> 156 </el-select>
...@@ -482,7 +481,7 @@ export default { ...@@ -482,7 +481,7 @@ export default {
482 shiftKey: false, 481 shiftKey: false,
483 }; 482 };
484 }, 483 },
485 - directives: { 484 + directives: {
486 // 处理加减天数 485 // 处理加减天数
487 "input-filter": { 486 "input-filter": {
488 bind: function (el, binding, { context }) { 487 bind: function (el, binding, { context }) {
...@@ -617,7 +616,7 @@ export default { ...@@ -617,7 +616,7 @@ export default {
617 this.routeLoading = false 616 this.routeLoading = false
618 if (res.code === 200) { 617 if (res.code === 200) {
619 this.routeList = res.data.list 618 this.routeList = res.data.list
620 - if(res.data.list.length == 0){ 619 + if (res.data.list.length == 0) {
621 this.form.route = ""; 620 this.form.route = "";
622 this.msgError("该航班没有设置航线"); 621 this.msgError("该航班没有设置航线");
623 } 622 }
...@@ -628,7 +627,7 @@ export default { ...@@ -628,7 +627,7 @@ export default {
628 this.routeLoading = false 627 this.routeLoading = false
629 console.log(err) 628 console.log(err)
630 }) 629 })
631 - }else{ 630 + } else {
632 this.form.route = ""; 631 this.form.route = "";
633 this.routeList = []; 632 this.routeList = [];
634 } 633 }
...@@ -729,9 +728,9 @@ export default { ...@@ -729,9 +728,9 @@ export default {
729 this.formdisabled.typeId = false; 728 this.formdisabled.typeId = false;
730 //原始重量 729 //原始重量
731 this.formdisabled.originalWeight = false; 730 this.formdisabled.originalWeight = false;
732 - this.$nextTick(()=>{ 731 + this.$nextTick(() => {
733 - this.$refs.form.clearValidate() 732 + this.$refs.form.clearValidate()
734 - }) 733 + })
735 }, 734 },
736 //计算高低价可配 735 //计算高低价可配
737 LowHighAvailable() { 736 LowHighAvailable() {
...@@ -898,14 +897,14 @@ export default { ...@@ -898,14 +897,14 @@ export default {
898 }) 897 })
899 }, 898 },
900 // 航班状态 899 // 航班状态
901 - flightState(multipleSelection, statusName){ 900 + flightState(multipleSelection, statusName) {
902 - let flightState = multipleSelection.some(item=>item.statusName == statusName); 901 + let flightState = multipleSelection.some(item => item.statusName == statusName);
903 - if(flightState){ 902 + if (flightState) {
904 - this.msgError(`勾选的航班，航班状态为${statusName}，不可操作该按钮`); 903 + this.msgError(`勾选的航班，航班状态为${statusName}，不可操作该按钮`);
905 - }else{ 904 + } else {
906 - flightState = false 905 + flightState = false
907 - } 906 + }
908 - return flightState 907 + return flightState
909 }, 908 },
910 /** 删除按钮操作 */ 909 /** 删除按钮操作 */
911 handleDelete(row) { 910 handleDelete(row) {
...@@ -913,8 +912,8 @@ export default { ...@@ -913,8 +912,8 @@ export default {
913 this.ids.forEach(item => { 912 this.ids.forEach(item => {
914 fIds.push(item.id) 913 fIds.push(item.id)
915 }); 914 });
916 - // 航班状态 915 + // 航班状态
917 - if(this.flightState(this.ids, "已删除")) return 916 + if (this.flightState(this.ids, "已删除")) return
918 this.$confirm("是否确认删除所选数据?", "警告", { 917 this.$confirm("是否确认删除所选数据?", "警告", {
919 confirmButtonText: "确定", 918 confirmButtonText: "确定",
920 cancelButtonText: "取消", 919 cancelButtonText: "取消",
...@@ -1022,7 +1021,7 @@ export default { ...@@ -1022,7 +1021,7 @@ export default {
1022 //批量开启/关闭航班 1021 //批量开启/关闭航班
1023 handleFlightStatus(status) { 1022 handleFlightStatus(status) {
1024 // 航班状态 1023 // 航班状态
1025 -      if(this.flightState(this.ids, "已删除")) return 1024 + if (this.flightState(this.ids, "已删除")) return
1026 let handle = status == "flightStatus80" ? "关闭" : "开启"; 1025 let handle = status == "flightStatus80" ? "关闭" : "开启";
1027 let data = { 1026 let data = {
1028 updateIds: [], 1027 updateIds: [],
...@@ -1053,7 +1052,7 @@ export default { ...@@ -1053,7 +1052,7 @@ export default {
1053 //自动推送开关 1052 //自动推送开关
1054 autoPushBatch(status) { 1053 autoPushBatch(status) {
1055 // 航班状态 1054 // 航班状态
1056 -      if(this.flightState(this.ids, "已删除")) return 1055 + if (this.flightState(this.ids, "已删除")) return
1057 let msg = status == "open" ? "开启" : "关闭"; 1056 let msg = status == "open" ? "开启" : "关闭";
1058 let data = { 1057 let data = {
1059 updateIds: [], 1058 updateIds: [],
...@@ -1092,7 +1091,7 @@ export default { ...@@ -1092,7 +1091,7 @@ export default {
1092 //白名单配舱开关 1091 //白名单配舱开关
1093 whiteListSwitchStatus(val) { 1092 whiteListSwitchStatus(val) {
1094 // 航班状态 1093 // 航班状态
1095 -      if(this.flightState(this.ids, "已删除")) return 1094 + if (this.flightState(this.ids, "已删除")) return
1096 let obj = { 1095 let obj = {
1097 updateIds: [] 1096 updateIds: []
1098 } 1097 }
...@@ -1114,7 +1113,7 @@ export default { ...@@ -1114,7 +1113,7 @@ export default {
1114 //黑名单配舱开关 1113 //黑名单配舱开关
1115 BlackListSwitchStatus(val) { 1114 BlackListSwitchStatus(val) {
1116 // 航班状态 1115 // 航班状态
1117 -      if(this.flightState(this.ids, "已删除")) return 1116 + if (this.flightState(this.ids, "已删除")) return
1118 let obj = { 1117 let obj = {
1119 updateIds: [] 1118 updateIds: []
1120 } 1119 }
......