Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9d743201 1 parent a944e768

航班维度校验增加

Inline Side-by-side
Showing 1 changed file with 69 additions and 40 deletions
......@@ -56,7 +56,8 @@
<span class="fontWeight">{{ routeItem.route }}</span>
</template>
<template v-for="(val, idx) in infoForm.list">
<el-card shadow="always" style="min-height:350px" v-if="val.flightRoute === routeItem.route" :key="idx">
<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)">新增规则
......@@ -64,16 +65,26 @@
</el-empty>
<el-row class="rowPadding" v-else>
<el-button type="primary" size="mini" @click="submit(idx)">保 存</el-button>
<el-button type="primary" v-if="val.status === '1'" size="mini" icon="el-icon-video-pause"
@click="changeStatus(idx)">
<el-button type="primary" v-if="val.status === '1'" size="mini"
icon="el-icon-video-pause" @click="changeStatus(idx)">
停 用</el-button>
<el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
@click="changeStatus(idx)">
<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>
<el-divider></el-divider>
<el-col :span="24">
<el-form-item label="始发站">
......@@ -84,13 +95,13 @@
</el-radio-group>
</el-col>
<el-col :span="10">
<el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
:rows="4" resize="none" style="width: 500px" placeholder="始发站之间用分号分隔"
@change="change" @input="change($event)">
<el-input v-if="val.isLocation == '1'" v-model="val.location"
type="textarea" :rows="4" resize="none" style="width: 500px"
placeholder="始发站之间用回车符分隔" @change="change" @input="change($event)">
</el-input>
<el-input v-else v-model="val.notLocation" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="始发站之间用分号分隔" @change="change"
@input="change($event)">
resize="none" style="width: 500px" placeholder="始发站之间用回车符分隔"
@change="change" @input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -104,13 +115,13 @@
</el-radio-group>
</el-col>
<el-col :span="10">
<el-input v-if="val.isDestinationSite == '1'" v-model="val.destinationSite" type="textarea"
:rows="4" resize="none" style="width: 500px" placeholder="目的站之间用分号分隔"
@change="change" @input="change($event)">
<el-input v-if="val.isDestinationSite == '1'" v-model="val.destinationSite"
type="textarea" :rows="4" resize="none" style="width: 500px"
placeholder="目的站之间用回车符分隔" @change="change" @input="change($event)">
</el-input>
<el-input v-else v-model="val.notDestinationSite" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="目的站之间用分号分隔" @change="change"
@input="change($event)">
resize="none" style="width: 500px" placeholder="目的站之间用回车符分隔"
@change="change" @input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -126,8 +137,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="URSA不包含">
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none"
placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4"
resize="none" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
@input="change($event)">
</el-input>
</el-form-item>
......@@ -174,7 +185,8 @@
<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">
......@@ -209,7 +221,8 @@
<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.id">
<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)"
:label="item.chineseName" :name="item.chineseName"
......@@ -325,7 +338,14 @@
<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
v-else>普通规则</span>
</div>
<el-divider></el-divider>
<el-col :span="24">
<el-form-item label="始发站">
......@@ -337,11 +357,11 @@
</el-col>
<el-col :span="10">
<el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="始发站之间用分号分隔" @change="change"
resize="none" style="width: 500px" placeholder="始发站之间用回车符分隔" @change="change"
@input="change($event)">
</el-input>
<el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none"
style="width: 500px" placeholder="始发站之间用分号分隔" @change="change"
style="width: 500px" placeholder="始发站之间用回车符分隔" @change="change"
@input="change($event)">
</el-input>
</el-col>
......@@ -356,12 +376,12 @@
</el-radio-group>
</el-col>
<el-col :span="10">
<el-input v-if="val.isDestinationSite == '1'" v-model="val.destinationSite" type="textarea"
:rows="4" resize="none" style="width: 500px" placeholder="目的站之间用分号分隔"
@change="change" @input="change($event)">
<el-input v-if="val.isDestinationSite == '1'" v-model="val.destinationSite"
type="textarea" :rows="4" resize="none" style="width: 500px"
placeholder="目的站之间用回车符分隔" @change="change" @input="change($event)">
</el-input>
<el-input v-else v-model="val.notDestinationSite" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="目的站之间用分号分隔" @change="change"
resize="none" style="width: 500px" placeholder="目的站之间用回车符分隔" @change="change"
@input="change($event)">
</el-input>
</el-col>
......@@ -371,16 +391,14 @@
<el-col :span="12">
<el-form-item label="URSA包含">
<el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none"
placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
@input="change($event)">
placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change" @input="change($event)">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="URSA不包含">
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none"
placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
@input="change($event)">
placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change" @input="change($event)">
</el-input>
</el-form-item>
</el-col>
......@@ -460,7 +478,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.code">
<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"
......@@ -605,6 +623,7 @@ export default {
}
},
created() {
// console.log(this.$route.params)
this.dictData()
this.status = this.$route.params.handle
this.$route.params.handle === 'detail' ? this.disabled = true : this.disabled = false
......@@ -719,6 +738,7 @@ export default {
this.infoForm.fltDate = res.data.list.ruleDate
this.infoForm.route = res.data.list.flightRoute
this.infoForm.list.push(this.dataHandle(res.data.list))
console.log('A：', this.infoForm.list)
} else {
this.isEmpty = true
}
......@@ -758,6 +778,7 @@ export default {
res.data.list.forEach(item => {
this.infoForm.list.push(this.dataHandle(item))
})
console.log('B：', this.infoForm.list)
} else {
//航班类型为Purple Tail则显示所有航线维度
this.routeList.forEach(route => {
......@@ -779,6 +800,7 @@ export default {
})
}
})
console.log('C：', this.infoForm.list)
}
} else {
//航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
......@@ -801,6 +823,7 @@ export default {
})
}
})
console.log('D：', this.infoForm.list)
}
} else {
//未请求到数据
......@@ -828,6 +851,7 @@ export default {
})
this.infoForm.list.push(this.dataHandle(item))
})
console.log('E：', this.infoForm.list)
} else {
//航班类型Purple Tail展示全部航线维度
let routesStatus = 1
......@@ -851,6 +875,7 @@ export default {
})
}
})
console.log('F：', this.infoForm.list)
}
} else {
//未查询到,插入占位基础数据使用户新建
......@@ -866,6 +891,7 @@ export default {
})
}
})
console.log('G：', this.infoForm.list)
} else {
//航班类型Purple Tail展示全部航线维度
// this.isEmpty = true
......@@ -877,6 +903,7 @@ export default {
routePriority: route.routePriority,
})
})
console.log('H：', this.infoForm.list)
}
}
}).catch(err => {
......@@ -919,6 +946,7 @@ export default {
})
}
})
console.log('I：', this.infoForm.list)
} else {
this.routeList.forEach((route) => {
this.infoForm.list.push({
......@@ -928,6 +956,7 @@ export default {
routePriority: route.routePriority,
})
})
console.log('J：', this.infoForm.list)
}
}).catch(err => {
this.isEmpty = true
......@@ -942,6 +971,7 @@ export default {
routePriority: route.routePriority,
})
})
console.log('K：', this.infoForm.list)
}
}
}
......@@ -973,6 +1003,7 @@ export default {
routePriority: item.ordinal
})
})
console.log('L：', this.infoForm.list)
} else {
this.msgWarning('未查询到航线信息！')
this.routeList = []
......@@ -995,9 +1026,10 @@ export default {
this.msgWarning('件数前区间不能大于后区间')
} 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 || data.location == '') && data.notLocation == '' && (!data.destinationSite || data.destinationSite == '') && data.notDestinationSite == '' && (data.includeUrsa == null || data.notIncludeUrsa == null) && (!data.minNumOfPieces || data.minNumOfPieces == '') && (!data.maxNumOfPieces || data.maxNumOfPieces == '') && (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
} else if (data.handlingCode == '' && data.serviceCode == '' && data.subCategory == '' && data.typeOfGoods == '' && data.puporpuxCode == '' && (!data.location || data.location == '') && data.notLocation == '' && (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
this.routeList.forEach((item, idx) => {
routeArr.push(item.route)
})
......@@ -1019,9 +1051,9 @@ export default {
this.loading = false
if (res.code === 200) {
this.fltNoDisabled = true
this.$forceUpdate()
this.msgSuccess('保存成功！')
this.infoForm.list[val] = this.dataHandle(res.data)
this.$forceUpdate()
} else {
this.msgWarning(res.msg)
}
......@@ -1175,15 +1207,12 @@ export default {
},
//数据处理
dataHandle(val) {
val.isLocation = '1' // 始发站 radio
val.isLocation = '1'
val.location ? val.isLocation = '1' : ''
val.notLocation ? val.isLocation = '2' : ''
val.isDestinationSite = '1' // 目的站 radio
val.destinationSite ? val.isDestinationSite = '1' : ''
val.notDestinationSite ? val.isDestinationSite = '2' : ''
val.isDestinationSite = '1'
val.notDestinationSite ? val.isDestinationSite = '1' : ''
val.notLocation ? val.isDestinationSite = '2' : ''
val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数
val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
......