jinhui.wang

修复数据处理异常

......@@ -73,7 +73,7 @@ export const constantRoutes = [
hidden: true,
children: [
{
path: '/info/:handle/:id~:routeStatus~:fltNo~:route~:fltDate',
path: '/info/:handle/:id|:routeStatus|:fltNo|:route|:fltDate',
component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
name: 'FlightAllocConfigInfo',
meta: { title: '航班配舱', icon: 'user' }
......
......@@ -22,7 +22,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6" v-if="infoForm.route != null && infoForm.route != ' ' && infoForm.route!=''">
<el-col :span="6" v-if="infoForm.route != null && infoForm.route != ' ' && infoForm.route != ''">
<el-form-item label="航线">
<el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled>
</el-input>
......@@ -877,7 +877,7 @@ export default {
data.routeSpecifyDateSeq = routeArr.join(';')
data.ruleDate = this.infoForm.fltDate
this.infoForm.list[val].routePriority = this.routeList[val].routePriority
if (this.infoForm.route != null && this.infoForm.route != '') {
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
this.routeList.forEach(item => {
if (item.route == this.infoForm.route) {
data.routePriority = item.routePriority
......@@ -1055,12 +1055,12 @@ export default {
val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
val.minWeight == null ? val.minWeight = undefined : val.minWeight = val.minWeight//最小件数
val.typeOfGoods != null ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型
val.declarationCategory != null ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型
val.puporpuxCode != null ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码
val.serviceCode != null ? val.serviceCode = val.serviceCode.split(';') : val.serviceCode = []//serviceCode
val.handlingCode != null ? val.handlingCode = val.handlingCode.split(';') : val.handlingCode = []//handlingCode
val.subCategory != null ? val.subCategory = val.subCategory.split(';') : val.subCategory = []//subCategory
val.typeOfGoods != null && val.typeOfGoods != "" ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型
val.declarationCategory != null && val.declarationCategory != "" ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型
val.puporpuxCode != null && val.puporpuxCode != "" ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码
val.serviceCode != null && val.serviceCode != "" ? val.serviceCode = val.serviceCode.split(';') : val.serviceCode = []//serviceCode
val.handlingCode != null && val.handlingCode != "" ? val.handlingCode = val.handlingCode.split(';') : val.handlingCode = []//handlingCode
val.subCategory != null && val.subCategory != "" ? val.subCategory = val.subCategory.split(';') : val.subCategory = []//subCategory
return val
},
//提交数据处理
......
......@@ -67,7 +67,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit"
@click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate,scope.row.route)">查看配置维度
@click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, scope.row.route)">查看配置维度
</el-button>
</template>
</el-table-column>
......@@ -271,6 +271,7 @@ export default {
handleClick(fltNo, handle, fltDate, route) {
this.openFlightDate = false;
let obj = {
id: ' ',
handle: handle,
fltNo: fltNo,
fltDate: fltDate != null ? fltDate : ' ',
......