Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
d8e2a58b 1 parent 0020b10c

修复数据处理异常

Inline Side-by-side
Showing 3 changed files with 10 additions and 9 deletions
...@@ -74,7 +74,7 @@ export const constantRoutes = [ ...@@ -74,7 +74,7 @@ export const constantRoutes = [
74 redirect: 'noredirect', 74 redirect: 'noredirect',
75 children: [ 75 children: [
76 { 76 {
77 - path: '/info/:handle/:id~:routeStatus~:fltNo~:route~:fltDate', 77 + path: '/info/:handle/:id|:routeStatus|:fltNo|:route|:fltDate',
78 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 78 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
79 name: 'FlightAllocConfigInfo', 79 name: 'FlightAllocConfigInfo',
80 meta: { title: '航班配舱', icon: 'user' } 80 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>
...@@ -876,7 +876,7 @@ export default { ...@@ -876,7 +876,7 @@ export default {
876 data.routeSpecifyDateSeq = routeArr.join(';') 876 data.routeSpecifyDateSeq = routeArr.join(';')
877 data.ruleDate = this.infoForm.fltDate 877 data.ruleDate = this.infoForm.fltDate
878 this.infoForm.list[val].routePriority = this.routeList[val].routePriority 878 this.infoForm.list[val].routePriority = this.routeList[val].routePriority
879 - if (this.infoForm.route != null && this.infoForm.route != '') { 879 + if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
880 this.routeList.forEach(item => { 880 this.routeList.forEach(item => {
881 if (item.route == this.infoForm.route) { 881 if (item.route == this.infoForm.route) {
882 data.routePriority = item.routePriority 882 data.routePriority = item.routePriority
...@@ -1053,12 +1053,12 @@ export default { ...@@ -1053,12 +1053,12 @@ export default {
1053 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量 1053 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
1054 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数 1054 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
1055 val.minWeight == null ? val.minWeight = undefined : val.minWeight = val.minWeight//最小件数 1055 val.minWeight == null ? val.minWeight = undefined : val.minWeight = val.minWeight//最小件数
1056 - val.typeOfGoods != null ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型 1056 + val.typeOfGoods != null && val.typeOfGoods != '' ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型
1057 - val.declarationCategory != null ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型 1057 + val.declarationCategory != null && val.declarationCategory != '' ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型
1058 - val.puporpuxCode != null ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码 1058 + val.puporpuxCode != null && val.puporpuxCode != '' ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码
1059 - val.serviceCode != null ? val.serviceCode = val.serviceCode.split(';') : val.serviceCode = []//serviceCode 1059 + val.serviceCode != null && val.serviceCode != '' ? val.serviceCode = val.serviceCode.split(';') : val.serviceCode = []//serviceCode
1060 - val.handlingCode != null ? val.handlingCode = val.handlingCode.split(';') : val.handlingCode = []//handlingCode 1060 + val.handlingCode != null && val.handlingCode != '' ? val.handlingCode = val.handlingCode.split(';') : val.handlingCode = []//handlingCode
1061 - val.subCategory != null ? val.subCategory = val.subCategory.split(';') : val.subCategory = []//subCategory 1061 + val.subCategory != null && val.subCategory != '' ? val.subCategory = val.subCategory.split(';') : val.subCategory = []//subCategory
1062 return val 1062 return val
1063 }, 1063 },
1064 //提交数据处理 1064 //提交数据处理
......
...@@ -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 : ' ',
......