Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
cb93f19a 1 parent 15e668bc

修复数据处理异常

Inline Side-by-side
Showing 3 changed files with 11 additions and 10 deletions
...@@ -73,7 +73,7 @@ export const constantRoutes = [ ...@@ -73,7 +73,7 @@ export const constantRoutes = [
73 hidden: true, 73 hidden: true,
74 children: [ 74 children: [
75 { 75 {
76 - path: '/info/:handle/:id~:routeStatus~:fltNo~:route~:fltDate', 76 + path: '/info/:handle/:id|:routeStatus|:fltNo|:route|:fltDate',
77 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 77 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
78 name: 'FlightAllocConfigInfo', 78 name: 'FlightAllocConfigInfo',
79 meta: { title: '航班配舱', icon: 'user' } 79 meta: { title: '航班配舱', icon: 'user' }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-date-picker> 22 </el-date-picker>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 - <el-col :span="6" v-if="infoForm.route != null && infoForm.route != ' ' && infoForm.route!=''"> 25 + <el-col :span="6" v-if="infoForm.route != null && infoForm.route != ' ' && infoForm.route != ''">
26 <el-form-item label="航线"> 26 <el-form-item label="航线">
27 <el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled> 27 <el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled>
28 </el-input> 28 </el-input>
...@@ -877,7 +877,7 @@ export default { ...@@ -877,7 +877,7 @@ export default {
877 data.routeSpecifyDateSeq = routeArr.join(';') 877 data.routeSpecifyDateSeq = routeArr.join(';')
878 data.ruleDate = this.infoForm.fltDate 878 data.ruleDate = this.infoForm.fltDate
879 this.infoForm.list[val].routePriority = this.routeList[val].routePriority 879 this.infoForm.list[val].routePriority = this.routeList[val].routePriority
880 - if (this.infoForm.route != null && this.infoForm.route != '') { 880 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
881 this.routeList.forEach(item => { 881 this.routeList.forEach(item => {
882 if (item.route == this.infoForm.route) { 882 if (item.route == this.infoForm.route) {
883 data.routePriority = item.routePriority 883 data.routePriority = item.routePriority
...@@ -1055,12 +1055,12 @@ export default { ...@@ -1055,12 +1055,12 @@ export default {
1055 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量 1055 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
1056 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数 1056 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
1057 val.minWeight == null ? val.minWeight = undefined : val.minWeight = val.minWeight//最小件数 1057 val.minWeight == null ? val.minWeight = undefined : val.minWeight = val.minWeight//最小件数
1058 - val.typeOfGoods != null ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型 1058 + val.typeOfGoods != null && val.typeOfGoods != "" ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型
1059 - val.declarationCategory != null ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型 1059 + val.declarationCategory != null && val.declarationCategory != "" ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型
1060 - val.puporpuxCode != null ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码 1060 + val.puporpuxCode != null && val.puporpuxCode != "" ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码
1061 - val.serviceCode != null ? val.serviceCode = val.serviceCode.split(';') : val.serviceCode = []//serviceCode 1061 + val.serviceCode != null && val.serviceCode != "" ? val.serviceCode = val.serviceCode.split(';') : val.serviceCode = []//serviceCode
1062 - val.handlingCode != null ? val.handlingCode = val.handlingCode.split(';') : val.handlingCode = []//handlingCode 1062 + val.handlingCode != null && val.handlingCode != "" ? val.handlingCode = val.handlingCode.split(';') : val.handlingCode = []//handlingCode
1063 - val.subCategory != null ? val.subCategory = val.subCategory.split(';') : val.subCategory = []//subCategory 1063 + val.subCategory != null && val.subCategory != "" ? val.subCategory = val.subCategory.split(';') : val.subCategory = []//subCategory
1064 return val 1064 return val
1065 }, 1065 },
1066 //提交数据处理 1066 //提交数据处理
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> 67 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
68 <template slot-scope="scope"> 68 <template slot-scope="scope">
69 <el-button size="mini" type="text" icon="el-icon-edit" 69 <el-button size="mini" type="text" icon="el-icon-edit"
70 - @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate,scope.row.route)">查看配置维度 70 + @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, scope.row.route)">查看配置维度
71 </el-button> 71 </el-button>
72 </template> 72 </template>
73 </el-table-column> 73 </el-table-column>
...@@ -271,6 +271,7 @@ export default { ...@@ -271,6 +271,7 @@ export default {
271 handleClick(fltNo, handle, fltDate, route) { 271 handleClick(fltNo, handle, fltDate, route) {
272 this.openFlightDate = false; 272 this.openFlightDate = false;
273 let obj = { 273 let obj = {
274 + id: ' ',
274 handle: handle, 275 handle: handle,
275 fltNo: fltNo, 276 fltNo: fltNo,
276 fltDate: fltDate != null ? fltDate : ' ', 277 fltDate: fltDate != null ? fltDate : ' ',
......