Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
09b6f75a 2 parents 5b37b7ba df2a1eb7

Merge branch 'et86' into fix-issues

Inline Side-by-side
Showing 4 changed files with 373 additions and 233 deletions
......@@ -136,7 +136,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号(回车分割)" :maxlength="12000"
<el-input class="formItem" type="textarea" :rows="1" placeholder="请输入运单号(回车分割)" :maxlength="12000"
v-model="formData.waybillNo" clearable></el-input>
</el-form-item>
</el-col>
......
......@@ -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"
......@@ -114,7 +114,7 @@ export default {
// })
},
mounted() {
this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200
this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200
},
activated() {
this.getList()
......@@ -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,16 +51,17 @@
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)) || (routeSatus == 'flightInformationMaintenancePurple Tail' && infoRouteList.includes(routeItem.route)) || ($route.params.status != '3' && routeSatus != 'flightInformationMaintenancePurple Tail')">
<template slot="title">
<span class="fontWeight">{{ routeItem.route }}</span>
</template>
<template v-for="(val, idx) in infoForm.list">
<template v-for="( val, idx ) in infoForm.list ">
<el-card shadow="always" style="min-height:350px" v-if="val.flightRoute === routeItem.route"
:key="idx">
<div>
<el-empty description="未设置规则！" v-if="!val.isLocation">
<el-button type="primary" size="small" @click="newRoute(idx)">新增规则
<el-button type="primary" size="small" @click="newRoute(idx, val.flightRoute)">新增规则
</el-button>
</el-empty>
<el-row class="rowPadding" v-else>
......@@ -149,7 +150,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMinPieces($event)">
@input="change($event)">
</el-input>
<span ref="minNumOfPieces" class="el-form-item__error"></span>
</el-col>
......@@ -157,7 +158,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMaxPieces($event)">
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -167,7 +168,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMinWeight($event)">
@input="change($event)">
</el-input>
<span ref="minWeight" class="el-form-item__error"></span>
</el-col>
......@@ -175,7 +176,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMaxWeight($event)">
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -186,7 +187,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.typeOfGoods" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.cargoType" :span="2"
<el-col v-for=" item in checkBoxItem.cargoType " :span="2"
:key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" :key="item.code">
......@@ -204,7 +205,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.declarationCategory" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.cargoStatus" :span="3"
<el-col v-for=" item in checkBoxItem.cargoStatus " :span="3"
:key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" :key="item.code" disabled>
......@@ -222,7 +223,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.puporpuxCode" @change="change">
<el-row>
<el-col :span="2" v-for="item in checkBoxItem.puporpux"
<el-col :span="2" v-for=" item in checkBoxItem.puporpux "
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
......@@ -243,7 +244,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.serviceCode" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.serviceCode" :span="2"
<el-col v-for=" item in checkBoxItem.serviceCode " :span="2"
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.serviceCode.includes(item.chineseName)"
......@@ -263,7 +264,7 @@
<el-form-item label="Handling Code">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.handlingCode" @change="change">
<div class="checkboxItem" v-for="item in checkBoxItem.handlingCode"
<div class="checkboxItem" v-for=" item in checkBoxItem.handlingCode "
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
......@@ -282,7 +283,7 @@
<el-form-item label="Sub Category">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.subCategory" @change="change">
<div class="checkboxItem" v-for="item in checkBoxItem.subCategory"
<div class="checkboxItem" v-for=" item in checkBoxItem.subCategory "
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
......@@ -303,10 +304,10 @@
</template>
</el-collapse-item>
</el-collapse>
<el-card v-else shadow="always" v-for="(val, idx) in infoForm.list" :key="idx" style="min-height:350px">
<el-card v-else shadow="always" v-for="( val, idx ) in infoForm.list " :key="idx" style="min-height:350px">
<div>
<el-empty description="未设置规则！" v-if="!val.isLocation">
<el-button type="primary" size="small" @click="newRoute(idx)">新增规则
<el-button type="primary" size="small" @click="newRoute(idx, routeList[idx].route)">新增规则
</el-button>
</el-empty>
<el-row class="rowPadding" v-else>
......@@ -391,7 +392,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMinPieces($event)">
@input="change($event)">
</el-input>
<span ref="minNumOfPieces" class="el-form-item__error"></span>
</el-col>
......@@ -399,7 +400,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMaxPieces($event)">
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -409,7 +410,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMinWeight($event)">
@input="change($event)">
</el-input>
<span ref="minWeight" class="el-form-item__error"></span>
</el-col>
......@@ -417,7 +418,7 @@
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)" @blur="inputBlurMaxWeight($event)">
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -428,7 +429,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.typeOfGoods" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.cargoType" :span="2" :key="item.id">
<el-col v-for=" item in checkBoxItem.cargoType " :span="2" :key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" :key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
......@@ -445,7 +446,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.declarationCategory" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.cargoStatus" :span="3" :key="item.id">
<el-col v-for=" item in checkBoxItem.cargoStatus " :span="3" :key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" disabled :key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
......@@ -462,7 +463,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.puporpuxCode" @change="change">
<el-row>
<el-col :span="2" v-for="item in checkBoxItem.puporpux" :key="item">
<el-col :span="2" v-for=" item in checkBoxItem.puporpux " :key="item">
<el-checkbox
v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
......@@ -482,7 +483,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.serviceCode" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.serviceCode" :span="2" :key="item.id">
<el-col v-for=" item in checkBoxItem.serviceCode " :span="2" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.serviceCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
......@@ -501,7 +502,8 @@
<el-form-item label="Handling Code">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.handlingCode" @change="change">
<div class="checkboxItem" v-for="item in checkBoxItem.handlingCode" :key="item.id">
<div class="checkboxItem" v-for=" item in checkBoxItem.handlingCode "
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
......@@ -519,7 +521,8 @@
<el-form-item label="Sub Category">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.subCategory" @change="change">
<div class="checkboxItem" v-for="item in checkBoxItem.subCategory" :key="item.id">
<div class="checkboxItem" v-for=" item in checkBoxItem.subCategory "
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
......@@ -551,10 +554,10 @@ import {
findByFlightId,
queryRouteByFltNo
} from "@/api/destinationFlight";
import { inputBlurValidate } from "@/utils/mixins";
// import { inputBlurValidate } from "@/utils/mixins";
export default {
name: 'FlightAllocConfigInfo',
mixins: [inputBlurValidate],
// mixins: [inputBlurValidate],
data() {
return {
infoForm: {
......@@ -581,6 +584,7 @@ export default {
},
]
},
infoRouteList: [],
status: '',
routeSatus: '',
isEmpty: false,
......@@ -599,32 +603,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 {
let obj = {
fltNo: this.$route.params.fltNo,
fltDate: this.$route.params.fltDate,
status: this.$route.params.status ? this.$route.params.status : ''
}
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
this.infoForm.route = this.$route.params.route
obj.route = this.$route.params.route
obj.flightRouteListStr = this.$route.params.route
} else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
this.infoForm.route = ''
obj.route = ''
obj.flightRouteListStr = this.$route.params.route
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj)
this.getRouteDimension(this.getSreachData())
}
}
} else {
this.infoForm.fltNo = ''
this.infoForm.fltDate = null
......@@ -646,22 +632,7 @@ export default {
if (this.routeSatus == 'dmLog') {
this.getIdDimension(this.$route.params.id)
} else {
let obj = {
fltNo: this.$route.params.fltNo,
fltDate: this.$route.params.fltDate,
status: this.$route.params.status ? this.$route.params.status : ''
}
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
obj.route = this.$route.params.route
obj.flightRouteListStr = this.$route.params.route
} else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
obj.route = ''
obj.flightRouteListStr = this.$route.params.route
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj) // 修改时 & 详情时
this.getRouteDimension(this.getSreachData()) // 修改时 & 详情时
}
}
},
......@@ -748,24 +719,79 @@ export default {
})
} else {
//航班类型为Purple Tail则显示所有航线维度
this.routeList.forEach((route, sub) => {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
routeStatus = 2
this.infoForm.list.push(this.dataHandle(item))
}
let arr = this.$route.params.route.split(';')
this.infoRouteList = arr
let params = {
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}
findDestinationFltRuleByFlightNo(params).then(response => {
let infoRouteList = []
response.data.list.forEach(item => {
//航线对应插入数据
infoRouteList.push(item.flightRoute)
})
if (routeStatus == 1) {
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
if (response.data.list.length > 0) {
this.routeList.forEach((route, sub) => {
if (arr.includes(route.route)) {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
routeStatus = 2
this.infoForm.list.push(this.dataHandle(item))
}
})
if (routeStatus == 1) {
if (infoRouteList.includes(route.route)) {
response.data.list.forEach(item => {
if (item.flightRoute == route.route) {
item.id = undefined
item.status = undefined
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(item)
)
}
})
} else {
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
this.newRoute(sub, route.route)
}
}
}
})
} else {
this.routeList.forEach((route, sub) => {
if (arr.includes(route.route)) {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
routeStatus = 2
this.infoForm.list.push(this.dataHandle(item))
}
})
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)
}
}
})
this.newRoute(sub)
}
})
}
......@@ -774,71 +800,122 @@ export default {
if (this.routeSatus == 'FlightAllocConfig') {
let infoRouteList = []
res.data.list.forEach(dateItem => {
this.infoForm.list.push(
this.dataHandle(dateItem)
)
infoRouteList.push(dateItem.flightRoute)
if (!infoRouteList.includes(JSON.parse(JSON.stringify(dateItem.flightRoute)))) {
infoRouteList.push(JSON.parse(JSON.stringify(dateItem.flightRoute)))
}
})
//判断是否有日期，看是否需要查询无日期维度
if (obj.flightDate != null && obj.flightDate != '' && obj.flightDate != ' ') {
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
fltDate: '',
flightRoute: this.infoForm.route,
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}).then(resData => {
if (resData.data.list.length > 0) {
this.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
//非停用展示
if (val.status != '3') {
//判断是否有日期，看是否需要查询无日期维度
if (obj.flightDate != null && obj.flightDate != '' && obj.flightDate != ' ') {
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
fltDate: '',
flightRoute: this.infoForm.route,
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}).then(resData => {
if (resData.data.list.length > 0) {
this.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
let routeStatus = 1
resData.data.list.forEach(item => {
if (item.flightRoute == route.route) {
item.id = undefined
item.status = undefined
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(item)
)
}
})
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)
}
} else {
infoRouteList.forEach((item, index) => {
if (item == route.route) {
this.infoForm.list.push(
this.dataHandle(JSON.parse(JSON.stringify(res.data.list[index])))
)
}
})
}
})
} else {
this.routeList.forEach((route) => {
let routeStatus = 1
resData.data.list.forEach(item => {
if (item.flightRoute == route.route) {
item.id = undefined
item.status = undefined
infoRouteList.forEach((item, index) => {
if (item == route.route) {
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(item)
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)
}
}
})
}
else {
this.routeList.forEach((route) => {
})
}
}).catch(err => {
this.isEmpty = true
console.log(err)
})
} else {
// 航班配舱设置普通规则
this.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
})
}
}).catch(err => {
this.isEmpty = true
console.log(err)
})
} else {
let routeStatus = 1
res.data.list.forEach(item => {
if (item.flightRoute == route.route) {
// item.id = undefined
// item.status = undefined
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(item)
)
}
})
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)
}
}
})
}
} else {
this.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
//停用展示
res.data.list.forEach(dateItem => {
this.infoRouteList.push(dateItem.flightRoute)
this.infoForm.list.push(
this.dataHandle(JSON.parse(JSON.stringify(dateItem)))
)
})
}
} else {
......@@ -850,43 +927,73 @@ export default {
status: this.$route.params.status
}
findDestinationFltRuleByFlightNo(params).then(response => {
// 航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
this.routeList.forEach((route, sub) => {
let routeStatus = 1
if (response.data.list.length > 0) {
let infoRouteList = []
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
routeStatus = 2
// item.id = undefined
// item.status = undefined
this.infoForm.list.push(this.dataHandle(item))
}
//航线对应插入数据
infoRouteList.push(item.flightRoute)
})
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.routeList.forEach((route, sub) => {
if (!infoRouteList.includes(route.route)) {
let routeStatus = 1
//日期下无维度的，查询是否存在无日期维度，有则占位展示，无则使用新增占位
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
// 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) {
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
this.infoForm.list.push(this.dataHandle(item))
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])))
)
}
})
}
})
} 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])))
)
}
})
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
this.newRoute(sub)
}
})
if (routeStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
})
}
}
......@@ -922,26 +1029,31 @@ export default {
this.infoForm.list.push(this.dataHandle(item))
})
} else {
let arr = this.$route.params.route.split(';')
this.infoRouteList = arr
//航班类型Purple Tail展示全部航线维度
let routesStatus = 1
this.routeList.forEach(route => {
response.data.list.forEach(item => {
if (route.route === item.flightRoute) {
routesStatus = 2
item.id = undefined
item.status = undefined
item.flightRoute = this.infoForm.route
item.routePriority = route.routePriority
this.infoForm.list.push(this.dataHandle(item))
}
})
if (routesStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
if (arr.includes(route.route)) {
let routesStatus = 1
response.data.list.forEach(item => {
let obj = JSON.parse(JSON.stringify(item))
if (route.route === item.flightRoute) {
routesStatus = 2
obj.id = undefined
obj.status = undefined
obj.flightRoute = route.route
obj.routePriority = route.routePriority
this.infoForm.list.push(this.dataHandle(obj))
}
})
if (routesStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
}
})
}
......@@ -960,15 +1072,19 @@ export default {
}
})
} else {
let arr = this.$route.params.route.split(';')
this.infoRouteList = arr
//航班类型Purple Tail展示全部航线维度
// this.isEmpty = true
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
if (arr.includes(route.route)) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
}
......@@ -1037,11 +1153,6 @@ export default {
findDestinationFltRuleByFlightNo(query).then(result => {
const { code, data } = result;
if (code == 200) {
let newRoute = JSON.parse(JSON.stringify(this.routeList.concat(data.routeList)))
const resRoute = newRoute.filter((item, index, self) => {
return self.findIndex(t => JSON.stringify(t) === JSON.stringify(item)) === index;
});
this.routeList = Array.from(new Set(resRoute));
if (data.routeList.length) {
this.routeList.forEach(route => {
let routesStatus = 1
......@@ -1113,6 +1224,25 @@ export default {
}
}
},
//查询参数获取
getSreachData() {
let obj = {
fltNo: this.$route.params.fltNo,
fltDate: this.$route.params.fltDate,
status: this.$route.params.status ? this.$route.params.status : ''
}
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
obj.route = this.$route.params.route
obj.flightRouteListStr = this.$route.params.route
} else if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
obj.route = ''
obj.flightRouteListStr = this.$route.params.route
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
return obj
},
//保存
submit(val) {
let routeArr = []
......@@ -1146,7 +1276,7 @@ export default {
data.routePriority = item.routePriority
}
})
data.flightRoute = this.infoForm.route
// data.flightRoute = this.infoForm.route
} else {
data.flightRoute = this.routeList[val].route
data.routePriority = this.routeList[val].routePriority
......@@ -1158,6 +1288,7 @@ export default {
this.$forceUpdate()
this.msgSuccess('保存成功！')
this.infoForm.list[val] = this.dataHandle(res.data)
// this.getRouteDimension(this.getSreachData())
} else {
this.msgWarning(res.msg)
}
......@@ -1198,7 +1329,9 @@ export default {
}).catch(() => {
this.loading = false
});
});
}).catch(() => {
this.loading = false
});;
}
} else {
this.infoForm.list[val] = {
......@@ -1210,10 +1343,10 @@ export default {
}
},
//新增
newRoute(val) {
newRoute(val, route, list) {
this.infoForm.list[val].purposeOfFlightNo = this.infoForm.fltNo
this.infoForm.list[val].ruleDate = this.infoForm.fltDate
this.infoForm.list[val].flightRoute = this.routeList[val].route
this.infoForm.list[val].flightRoute = route
this.infoForm.list[val].routePriority = this.routeList[val].routePriority
this.infoForm.list[val].isLocation = '1'
this.infoForm.list[val].isDestinationSite = '1'
......
......@@ -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>
......@@ -188,8 +187,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="额外增重百分比" prop="extraWeightPercent">
<el-input-number class="wid80" @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比"
v-model="form.extraWeightPercent"></el-input-number>
<el-input-number class="wid80" @change="LowHighAvailable" :min="0" :precision="0" placeholder="请输入额外增重百分比"
v-model="form.extraWeightPercent" v-input-filter></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -359,7 +358,7 @@ export default {
route: [
{
required: true,
message: "航班路线不能为空呀",
message: "航班路线不能为空",
trigger: "change",
},
// {
......@@ -482,7 +481,7 @@ export default {
shiftKey: false,
};
},
directives: {
directives: {
// 处理加减天数
"input-filter": {
bind: function (el, binding, { context }) {
......@@ -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 = [];
}
......@@ -639,15 +638,12 @@ export default {
if (item.id == val) {
if (item.chineseName.indexOf('White') >= 0) {
this.routeMultiple = false
// this.rules.route[0].type = 'string'
this.form.route = ''
// this.rules.route[0].required = true;
} else if (item.chineseName.indexOf('Purple') >= 0) {
this.routeMultiple = true
// this.rules.route[0].type = 'array'
this.form.route = []
// this.rules.route[0].required = true;
}
this.validateFieldForm()
}
})
// this.$refs.routeSelect.$forceUpdate()
......@@ -730,9 +726,9 @@ export default {
this.formdisabled.typeId = false;
//原始重量
this.formdisabled.originalWeight = false;
this.$nextTick(()=>{
this.$refs.form.clearValidate()
})
this.$nextTick(() => {
this.$refs.form.clearValidate()
})
},
//计算高低价可配
LowHighAvailable() {
......@@ -899,14 +895,14 @@ export default {
})
},
// 航班状态
flightState(multipleSelection, statusName){
let flightState = multipleSelection.some(item=>item.statusName == statusName);
if(flightState){
this.msgError(`勾选的航班，航班状态为${statusName}，不可操作该按钮`);
}else{
flightState = false
}
return flightState
flightState(multipleSelection, statusName) {
let flightState = multipleSelection.some(item => item.statusName == statusName);
if (flightState) {
this.msgError(`勾选的航班，航班状态为${statusName}，不可操作该按钮`);
} else {
flightState = false
}
return flightState
},
/** 删除按钮操作 */
handleDelete(row) {
......@@ -914,8 +910,8 @@ export default {
this.ids.forEach(item => {
fIds.push(item.id)
});
// 航班状态
if(this.flightState(this.ids, "已删除")) return
// 航班状态
if (this.flightState(this.ids, "已删除")) return
this.$confirm("是否确认删除所选数据?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -946,6 +942,7 @@ export default {
},
/** 提交按钮 */
submitForm: function () {
this.validateFieldForm()
this.$refs["form"].validate((valid) => {
if (valid) {
let formdata = JSON.parse(JSON.stringify(this.form));
......@@ -1023,7 +1020,7 @@ export default {
//批量开启/关闭航班
handleFlightStatus(status) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let handle = status == "flightStatus80" ? "关闭" : "开启";
let data = {
updateIds: [],
......@@ -1054,7 +1051,7 @@ export default {
//自动推送开关
autoPushBatch(status) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let msg = status == "open" ? "开启" : "关闭";
let data = {
updateIds: [],
......@@ -1093,7 +1090,7 @@ export default {
//白名单配舱开关
whiteListSwitchStatus(val) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let obj = {
updateIds: []
}
......@@ -1115,7 +1112,7 @@ export default {
//黑名单配舱开关
BlackListSwitchStatus(val) {
// 航班状态
      if(this.flightState(this.ids, "已删除")) return
if (this.flightState(this.ids, "已删除")) return
let obj = {
updateIds: []
}
......@@ -1134,12 +1131,22 @@ export default {
console.log(err)
})
},
// 对部分表单字段进行校验的方法
validateFieldForm(){
this.$refs.form.validateField(['route'], (flag) => {})
if(this.form.route.length){
this.$nextTick(()=>{
this.$refs.form.clearValidate()
})
}
},
//航线修改
routeChange(val) {
this.validateFieldForm()
if(val.length){
this.rules.route[0].required = false;
}else{
// this.rules.route[0].required = true;
this.$nextTick(()=>{
this.$refs.form.clearValidate()
})
}
this.$forceUpdate()
},
......