Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9ba509c5 1 parent 0fb7a035

航班维度日期维度设置修改

Inline Side-by-side
Showing 1 changed file with 109 additions and 113 deletions
......@@ -71,18 +71,19 @@
<el-button type="primary" v-if="val.status === '3'" size="mini"
icon="el-icon-video-pause" @click="changeStatus(idx)">
启 用</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete"
@click="del(idx)">
删 除</el-button>
<div v-if="(routeSatus.indexOf('flightInformationMaintenance') >= 0)"
style="display: inline-block;">
<span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
</div>
<div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)"
style="display: inline-block;">
<span
v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
v-else>普通规则</span>
</div>
style="display: inline-block;">
<span
v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
v-else>普通规则</span>
</div>
<el-divider></el-divider>
<el-col :span="24">
<el-form-item label="始发站">
......@@ -148,9 +149,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)" @blur="inputBlurMinPieces($event)">
</el-input>
<span ref="minNumOfPieces" class="el-form-item__error"></span>
</el-col>
......@@ -158,9 +157,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)" @blur="inputBlurMaxPieces($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -170,9 +167,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)" @blur="inputBlurMinWeight($event)">
</el-input>
<span ref="minWeight" class="el-form-item__error"></span>
</el-col>
......@@ -180,9 +175,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)" @blur="inputBlurMaxWeight($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -324,13 +317,15 @@
<el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
@click="changeStatus(idx)">
启 用</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px" @click="del(idx)">
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px"
@click="del(idx)">
删 除</el-button>
<div v-if="routeSatus.indexOf('flightInformationMaintenance') >= 0" style="display: inline-block;">
<span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
</div>
<div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)" style="display: inline-block;">
<span v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
<span
v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
v-else>普通规则</span>
</div>
<el-divider></el-divider>
......@@ -396,9 +391,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)" @blur="inputBlurMinPieces($event)">
</el-input>
<span ref="minNumOfPieces" class="el-form-item__error"></span>
</el-col>
......@@ -406,9 +399,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)" @blur="inputBlurMaxPieces($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -418,9 +409,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)" @blur="inputBlurMinWeight($event)">
</el-input>
<span ref="minWeight" class="el-form-item__error"></span>
</el-col>
......@@ -428,9 +417,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)" @blur="inputBlurMaxWeight($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -739,7 +726,7 @@ export default {
flightRouteListStr: val.flightRouteListStr,
status: val.status ? val.status : ''
}
if(this.$route.params.handle == "updated"){
if (this.$route.params.handle == "updated") {
delete obj.flightRoute
}
// 修改时 & 详情时
......@@ -782,9 +769,14 @@ export default {
})
}
} else {
//
if (this.routeSatus == 'FlightAllocConfig') {
findDestinationFltRuleByFlightNo({
//
if (this.routeSatus == 'FlightAllocConfig') {
res.data.list.forEach(dateItem => {
this.infoForm.list.push(
this.dataHandle(dateItem)
)
})
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
fltDate: '',
flightRoute: this.infoForm.route,
......@@ -795,22 +787,26 @@ export default {
this.routeList.forEach((route) => {
let routeStatus = 1
resData.data.list.forEach(item => {
if (item.flightRoute == route.route) {
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(item)
)
console.log(route.route)
if (res.data.list[0].flightRoute != item.flightRoute) {
if (item.flightRoute == route.route) {
item.id = undefined
item.status = undefined
routeStatus = 2
this.infoForm.list.push(
this.dataHandle(item)
)
console.log(route.route)
} else {
// this.infoForm.list.push({
// purposeOfFlightNo: this.infoForm.fltNo,
// ruleDate: this.infoForm.fltDate,
// flightRoute: route.route,
// routePriority: route.routePriority,
// })
}
}
})
if (routeStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
else {
......@@ -827,45 +823,45 @@ export default {
this.isEmpty = true
console.log(err)
})
}else{
// 航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
this.routeList.forEach((route, sub) => {
let routeStatus = 1
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))
}
})
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, sub) => {
let routeStatus = 1
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))
}
})
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 {
//未请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
let params = {
let params = {
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
flightRouteListStr: this.$route.params.route,
status: this.$route.params.status
}
if(this.$route.params.handle == "updated"){
delete params.flightRoute
}
}
if (this.$route.params.handle == "updated") {
delete params.flightRoute
}
//航线不为空，获取该航线下无日期通用维度设置
findDestinationFltRuleByFlightNo(params).then(response => {
this.routeList = response.data.routeList
......@@ -998,33 +994,33 @@ export default {
}
//航班类型Purple Tail展示全部航线维度
findDestinationFltRuleByFlightNo(query).then(result => {
const { code, data } = result;
if(code == 200){
this.routeList = data.routeList;
let routesStatus = 1
if(data.routeList.length){
this.routeList.forEach(route => {
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))
const { code, data } = result;
if (code == 200) {
this.routeList = data.routeList;
let routesStatus = 1
if (data.routeList.length) {
this.routeList.forEach(route => {
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 (routesStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
}
}
})
}
}
......@@ -1080,15 +1076,15 @@ export default {
} else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
this.msgWarning('重量前区间不能大于后区间')
} else if (
data.handlingCode == '' && data.serviceCode == ''
&& data.subCategory == '' && data.typeOfGoods == ''
&& data.puporpuxCode == '' && (data.location == null || data.location == '')
&& data.notLocation == '' && (data.destinationSite == null || data.destinationSite == '')
&& data.notDestinationSite == '' && (data.includeUrsa == null || data.includeUrsa == '')
&& (data.notIncludeUrsa == null || data.notIncludeUrsa == '')
&& (!data.minNumOfPieces || data.minNumOfPieces == '')
&& (!data.maxNumOfPieces || data.maxNumOfPieces == '') &&
(!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
data.handlingCode == '' && data.serviceCode == ''
&& data.subCategory == '' && data.typeOfGoods == ''
&& data.puporpuxCode == '' && (data.location == null || data.location == '')
&& data.notLocation == '' && (data.destinationSite == null || data.destinationSite == '')
&& data.notDestinationSite == '' && (data.includeUrsa == null || data.includeUrsa == '')
&& (data.notIncludeUrsa == null || data.notIncludeUrsa == '')
&& (!data.minNumOfPieces || data.minNumOfPieces == '')
&& (!data.maxNumOfPieces || data.maxNumOfPieces == '') &&
(!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
this.msgWarning('未添加规则信息，请添加后再保存!')
} else {
// this.loading = true
......