jinhui.wang

增加白名单开关按钮,接口,航班维护增加白名单状态字段

...@@ -72,3 +72,17 @@ export function updateAutoPushBatch(data) { ...@@ -72,3 +72,17 @@ export function updateAutoPushBatch(data) {
72 data: data 72 data: data
73 }) 73 })
74 } 74 }
75 +
76 +//白名单自动配舱开关
77 +/**
78 + * @param updateIds idList *
79 + * @param status 状态 * 1开 0关
80 + */
81 +export function updateWhiteListSwitchBatch(data) {
82 + return request({
83 + url: '/FlightPreserveController/updateWhiteListSwitchBatch',
84 + method: 'post',
85 + data: data
86 + })
87 +}
88 +
......
...@@ -521,6 +521,12 @@ let tableHeaders = { ...@@ -521,6 +521,12 @@ let tableHeaders = {
521 status: 1 521 status: 1
522 }, 522 },
523 { 523 {
524 + columnChineseName: "白名单是否自动配舱",
525 + columnName: "whiteListSwitch",
526 + columnWidth: "160",
527 + status: 1
528 + },
529 + {
524 columnChineseName: "总重量", 530 columnChineseName: "总重量",
525 columnName: "totalWeight", 531 columnName: "totalWeight",
526 columnWidth: "90", 532 columnWidth: "90",
......
...@@ -79,7 +79,7 @@ service.interceptors.response.use(res => { ...@@ -79,7 +79,7 @@ service.interceptors.response.use(res => {
79 type: 'error' 79 type: 'error'
80 }) 80 })
81 return Promise.reject(new Error(msg)) 81 return Promise.reject(new Error(msg))
82 - } else if (code !== 200 && code !== 201 && code !== 202) { 82 + } else if (code !== 200 && code !== 201 && code !== 202 && code != 203) {
83 Message({ 83 Message({
84 message: msg, 84 message: msg,
85 type: 'error' 85 type: 'error'
......
...@@ -60,6 +60,12 @@ ...@@ -60,6 +60,12 @@
60 @click="autoPushBatch('open')" v-hasPermi="['base:flightInfo:autoPushOpen']">自动推送开启</el-button> 60 @click="autoPushBatch('open')" v-hasPermi="['base:flightInfo:autoPushOpen']">自动推送开启</el-button>
61 <el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0" 61 <el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
62 @click="autoPushBatch('close')" v-hasPermi="['base:flightInfo:autoPushClose']">自动推送关闭</el-button> 62 @click="autoPushBatch('close')" v-hasPermi="['base:flightInfo:autoPushClose']">自动推送关闭</el-button>
63 + <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
64 + @click="whiteListSwitchStatus(1)" v-hasPermi="['base:flightInfo:whiteOpen']">白名单自动配舱开启
65 + </el-button>
66 + <el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
67 + @click="whiteListSwitchStatus(0)" v-hasPermi="['base:flightInfo:whiteClose']">白名单自动配舱关闭
68 + </el-button>
63 <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0" @click="handleDelete" 69 <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0" @click="handleDelete"
64 v-hasPermi="['base:flightInfo:delete']">删除 70 v-hasPermi="['base:flightInfo:delete']">删除
65 </el-button> 71 </el-button>
...@@ -111,7 +117,7 @@ ...@@ -111,7 +117,7 @@
111 <el-form-item label="航班种类" prop="kindId"> 117 <el-form-item label="航班种类" prop="kindId">
112 <el-select class="wid80" v-model="form.kindId" :disabled="formdisabled.kindId" placeholder="请选择航班种类" 118 <el-select class="wid80" v-model="form.kindId" :disabled="formdisabled.kindId" placeholder="请选择航班种类"
113 @change="kindChange"> 119 @change="kindChange">
114 - <el-option v-for="item in selectOption.flightKindlist" :key="item.id" :label="item.chineseName" 120 + <el-option v-for="item in selectOption.flightKindlist" :key="item.id" :label="item.chineseName"
115 :value="item.id"> 121 :value="item.id">
116 </el-option> 122 </el-option>
117 </el-select> 123 </el-select>
...@@ -132,7 +138,7 @@ ...@@ -132,7 +138,7 @@
132 <el-select ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route" 138 <el-select ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
133 placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :multiple='routeMultiple' 139 placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :multiple='routeMultiple'
134 :key="routeMultiple"> 140 :key="routeMultiple">
135 - <el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route"> 141 + <el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route">
136 </el-option> 142 </el-option>
137 </el-select> 143 </el-select>
138 </el-form-item> 144 </el-form-item>
...@@ -140,7 +146,7 @@ ...@@ -140,7 +146,7 @@
140 <el-col :span="12"> 146 <el-col :span="12">
141 <el-form-item label="航班类型" prop="typeId"> 147 <el-form-item label="航班类型" prop="typeId">
142 <el-select class="wid80" v-model="form.typeId" placeholder="请选择航班类型"> 148 <el-select class="wid80" v-model="form.typeId" placeholder="请选择航班类型">
143 - <el-option v-for="item in selectOption.flightTypelist" :key="item.id" :label="item.chineseName" 149 + <el-option v-for="item in selectOption.flightTypelist" :key="item.id" :label="item.chineseName"
144 :value="item.id"> 150 :value="item.id">
145 </el-option> 151 </el-option>
146 </el-select> 152 </el-select>
...@@ -151,7 +157,7 @@ ...@@ -151,7 +157,7 @@
151 <el-col :span="12"> 157 <el-col :span="12">
152 <el-form-item label="航班状态" prop="statusId"> 158 <el-form-item label="航班状态" prop="statusId">
153 <el-select class="wid80" :disabled="true" v-model="form.statusId" placeholder="请选择航班状态"> 159 <el-select class="wid80" :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
154 - <el-option v-for="item in selectOption.flightStatuslist" :key="item.id" :label="item.chineseName" 160 + <el-option v-for="item in selectOption.flightStatuslist" :key="item.id" :label="item.chineseName"
155 :value="item.id"> 161 :value="item.id">
156 </el-option> 162 </el-option>
157 </el-select> 163 </el-select>
...@@ -278,6 +284,7 @@ import { ...@@ -278,6 +284,7 @@ import {
278 findFltCommonConf, 284 findFltCommonConf,
279 updateStatusBatch, 285 updateStatusBatch,
280 updateAutoPushBatch, 286 updateAutoPushBatch,
287 + updateWhiteListSwitchBatch
281 } from "@/api/findAllFltData"; 288 } from "@/api/findAllFltData";
282 import { getpreAudit } from '@/api/system/preReview.js' 289 import { getpreAudit } from '@/api/system/preReview.js'
283 import { queryRouteByFltNo } from '@/api/destinationFlight.js' 290 import { queryRouteByFltNo } from '@/api/destinationFlight.js'
...@@ -775,9 +782,9 @@ export default { ...@@ -775,9 +782,9 @@ export default {
775 // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false; 782 // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false;
776 //是否预审 783 //是否预审
777 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false; 784 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
778 - this.ishighPriceWeightPercent = this.form.highLowPriceFlg === 1 ? false : true
779 // 计算高低价可配 785 // 计算高低价可配
780 // this.LowHighAvailable(); 786 // this.LowHighAvailable();
787 + this.ishighPriceWeightPercent = this.form.highLowPriceFlg === 1 ? false : true
781 } else { 788 } else {
782 this.msgError(response.msg); 789 this.msgError(response.msg);
783 } 790 }
...@@ -974,6 +981,26 @@ export default { ...@@ -974,6 +981,26 @@ export default {
974 this.findAllFltData(); 981 this.findAllFltData();
975 } 982 }
976 }, 983 },
984 + //白名单配舱开关
985 + whiteListSwitchStatus(val) {
986 + let obj = {
987 + updateIds: []
988 + }
989 + obj.status = val
990 + this.ids.forEach(item => {
991 + obj.updateIds.push(item.id)
992 + })
993 + updateWhiteListSwitchBatch(obj).then(res => {
994 + if (res.code === 200) {
995 + this.msgSuccess(res.msg)
996 + this.findAllFltData()
997 + } else {
998 + this.msgWarning(res.msg)
999 + }
1000 + }).catch(err => {
1001 + console.log(err)
1002 + })
1003 + },
977 //航线修改 1004 //航线修改
978 routeChange(val) { 1005 routeChange(val) {
979 this.$forceUpdate() 1006 this.$forceUpdate()
......