Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
e5dbbb83 2 parents b68633a7 e2f1a48a

Merge branch 'test' into uat

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
...@@ -1211,8 +1211,8 @@ export default { ...@@ -1211,8 +1211,8 @@ export default {
1211 val.location ? val.isLocation = '1' : '' 1211 val.location ? val.isLocation = '1' : ''
1212 val.notLocation ? val.isLocation = '2' : '' 1212 val.notLocation ? val.isLocation = '2' : ''
1213 val.isDestinationSite = '1' 1213 val.isDestinationSite = '1'
1214 - val.notDestinationSite ? val.isDestinationSite = '1' : '' 1214 + val.destinationSite ? val.isDestinationSite = '1' : ''
1215 - val.notLocation ? val.isDestinationSite = '2' : '' 1215 + val.notDestinationSite ? val.isDestinationSite = '2' : ''
1216 val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数 1216 val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数
1217 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量 1217 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
1218 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数 1218 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
......