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 89 additions and 49 deletions
......@@ -34,8 +34,8 @@
params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' },
})
">添加</el-button>
<el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1" inactive-value="2" active-color="#13ce66"
inactive-color="#909399" @change="switchChange"></el-switch>
<el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1"
inactive-value="2" active-color="#13ce66" inactive-color="#909399" @change="switchChange"></el-switch>
</div>
</el-form>
<Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true"
......@@ -152,7 +152,7 @@ export default {
fltDate: fltDate != null ? fltDate : ' ',
route: ' ',
routeStatus: 'FlightAllocConfig',
status: status,
status: status == '3' ? '3' : ' ',
createStatus: 1
}
this.$router.push({
......
......@@ -51,7 +51,8 @@
v-if="routeSatus != 'flightInformationMaintenanceWhite Tail' && routeSatus != 'dmLog'"
class="backgroundCollapse" :value="infoForm.list.length > 0 ? routeList[0].route : ''"
style="min-height:500px;width:95%;margin:0 auto 50px" accordion v-loading="loading">
<el-collapse-item v-for="(routeItem, index) in routeList" :key="index" :name="routeItem.route">
<el-collapse-item v-for="(routeItem, index) in routeList" :key="index" :name="routeItem.route"
v-if="($route.params.status == '3' && infoRouteList.includes(routeItem.route)) || $route.params.status != '3'">
<template slot="title">
<span class="fontWeight">{{ routeItem.route }}</span>
</template>
......@@ -581,6 +582,7 @@ export default {
},
]
},
infoRouteList: [],
status: '',
routeSatus: '',
isEmpty: false,
......@@ -599,15 +601,14 @@ export default {
this.fltNoDisabled = true
this.infoForm.fltNo = this.$route.params.fltNo
this.infoForm.fltDate = this.$route.params.fltDate
this.infoForm.route = this.$route.params.route
if (this.$route.params.status) {
if (this.routeSatus == 'dmLog') {
this.infoForm.route = this.$route.params.route
this.getIdDimension(this.$route.params.id)
} else {
this.getRouteDimension(this.getSreachData())
}
}
} else {
this.infoForm.fltNo = ''
this.infoForm.fltDate = null
......@@ -746,6 +747,8 @@ export default {
infoRouteList.push(JSON.parse(JSON.stringify(dateItem.flightRoute)))
}
})
//非停用展示
if (val.status != '3') {
//判断是否有日期，看是否需要查询无日期维度
if (obj.flightDate != null && obj.flightDate != '' && obj.flightDate != ' ') {
findDestinationFltRuleByFlightNo({
......@@ -850,6 +853,15 @@ export default {
})
}
} else {
//停用展示
res.data.list.forEach(dateItem => {
this.infoRouteList.push(dateItem.flightRoute)
this.infoForm.list.push(
this.dataHandle(JSON.parse(JSON.stringify(dateItem)))
)
})
}
} else {
//航班维护跳转编辑
let params = {
purposeOfFlightNo: this.infoForm.fltNo,
......@@ -858,43 +870,73 @@ export default {
status: this.$route.params.status
}
findDestinationFltRuleByFlightNo(params).then(response => {
if (response.data.list.length > 0) {
let infoRouteList = []
res.data.list.forEach(item => {
//航线对应插入数据
infoRouteList.push(item.flightRoute)
})
// 航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
this.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
//日期下无维度的，查询是否存在无日期维度，有则占位展示，无则使用新增占位
response.data.list.forEach(item => {
let obj = JSON.parse(JSON.stringify(item))
if (obj.flightRoute == route.route) {
obj.id = undefined
obj.status = undefined
routeStatus = 2
// item.id = undefined
// item.status = undefined
this.infoForm.list.push(this.dataHandle(item))
// obj.flightRoute = this.infoForm.route
// this.routeList.forEach(route => {
// if (route.route === this.infoForm.route) {
// obj.routePriority = route.routePriority
// }
// })
this.infoForm.list.push(this.dataHandle(obj))
}
})
if (routeStatus == 1) {
//日期下无维度的，查询是否存在无日期维度，有则占位展示，无则使用新增占位
response.data.list.forEach(item => {
if (route.route === item.flightRoute) {
item.id = undefined
item.status = undefined
item.flightRoute = this.infoForm.route
this.routeList.forEach(route => {
if (route.route === this.infoForm.route) {
item.routePriority = route.routePriority
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
this.newRoute(sub, route.route)
}
} else {
infoRouteList.forEach((item, index) => {
if (item == route.route) {
this.infoForm.list.push(
this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
)
}
})
this.infoForm.list.push(this.dataHandle(item))
}
})
//否则插入占位基础数据
} else {
this.routeList.forEach((route) => {
let routeStatus = 1
infoRouteList.forEach((item, index) => {
if (item == route.route) {
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
)
}
})
if (routeStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
this.newRoute(sub, route.route)
}
})
}
})
}
}
......@@ -1234,7 +1276,6 @@ export default {
},
//新增
newRoute(val, route) {
console.log(route)
this.infoForm.list[val].purposeOfFlightNo = this.infoForm.fltNo
this.infoForm.list[val].ruleDate = this.infoForm.fltDate
this.infoForm.list[val].flightRoute = route
......
......@@ -47,8 +47,7 @@
</el-form-item>
</el-col>
</el-row>
<el-button class="mt10" type="primary" icon="el-icon-search" size="mini" :loading="loading"
@click="handleQuery">搜索
<el-button class="mt10" type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="handleQuery">搜索
</el-button>
<el-button class="mt10" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button class="mt10" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
......@@ -81,8 +80,8 @@
<Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
:order="true" :selection="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limitSize"
:page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]"
@tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange"
@sortChange="sortChange" @sizeChange="sizeChange">
@tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"
@sizeChange="sizeChange">
<template slot="optionColumn">
<el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
class-name="small-padding fixed-width" :fixed="tableHeader.length > 10 ? 'right' : false" width="160">
......@@ -116,8 +115,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="航班日期" prop="fltDate">
<el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small"
v-model="form.fltDate" type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
<el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small" v-model="form.fltDate"
type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -143,15 +142,15 @@
</el-tooltip>
</div>
</template>
<el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading"
:multiple='true' :key="routeMultiple">
<el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route"
:disabled="formdisabled.route" placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange"
:loading="routeLoading" :multiple='true' :key="routeMultiple">
<el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route">
</el-option>
</el-select>
<el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading"
:multiple='false' :key="routeMultiple">
<el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route"
:disabled="formdisabled.route" placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange"
:loading="routeLoading" :multiple='false' :key="routeMultiple">
<el-option v-for="item in routeList" :key="item.id" :label="item.route" :value="item.route">
</el-option>
</el-select>
......@@ -617,7 +616,7 @@ export default {
this.routeLoading = false
if (res.code === 200) {
this.routeList = res.data.list
if(res.data.list.length == 0){
if (res.data.list.length == 0) {
this.form.route = "";
this.msgError("该航班没有设置航线");
}
......@@ -628,7 +627,7 @@ export default {
this.routeLoading = false
console.log(err)
})
}else{
} else {
this.form.route = "";
this.routeList = [];
}
......@@ -729,7 +728,7 @@ export default {
this.formdisabled.typeId = false;
//原始重量
this.formdisabled.originalWeight = false;
this.$nextTick(()=>{
this.$nextTick(() => {
this.$refs.form.clearValidate()
})
},
......@@ -898,11 +897,11 @@ export default {
})
},
// 航班状态
flightState(multipleSelection, statusName){
let flightState = multipleSelection.some(item=>item.statusName == statusName);
if(flightState){
flightState(multipleSelection, statusName) {
let flightState = multipleSelection.some(item => item.statusName == statusName);
if (flightState) {
this.msgError(`勾选的航班，航班状态为${statusName}，不可操作该按钮`);
}else{
} else {
flightState = false
}
return flightState
......@@ -914,7 +913,7 @@ export default {
fIds.push(item.id)
});
// 航班状态
if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
this.$confirm("是否确认删除所选数据?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1022,7 +1021,7 @@ export default {
//批量开启/关闭航班
handleFlightStatus(status) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let handle = status == "flightStatus80" ? "关闭" : "开启";
let data = {
updateIds: [],
......@@ -1053,7 +1052,7 @@ export default {
//自动推送开关
autoPushBatch(status) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let msg = status == "open" ? "开启" : "关闭";
let data = {
updateIds: [],
......@@ -1092,7 +1091,7 @@ export default {
//白名单配舱开关
whiteListSwitchStatus(val) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let obj = {
updateIds: []
}
......@@ -1114,7 +1113,7 @@ export default {
//黑名单配舱开关
BlackListSwitchStatus(val) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let obj = {
updateIds: []
}
......