chenjun 2 سال پیش
والد
کامیت
fe7dc83241
1فایلهای تغییر یافته به همراه12 افزوده شده و 12 حذف شده
  1. 12 12
      src/views/advancedQuery/views/advancedHome.vue

+ 12 - 12
src/views/advancedQuery/views/advancedHome.vue

@@ -619,14 +619,14 @@ export default {
         bagLocationItemArr = [],
         TransferFlightNOItemArr = []
       this.tableData.forEach(item => {
-        if (PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 && item.PassengerNameUpcase != '') {
+        if (PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 && item.PassengerNameUpcase != ''&& item.PassengerNameUpcase != null) {
           PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
           this.PassengerNameUpcaseItem.push({
             text: item.PassengerNameUpcase,
             value: item.PassengerNameUpcase
           })
         }
-        if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != '') {
+        if (FlightNOItemArr.indexOf(item.FlightNO) == -1 && item.FlightNO != ''&& item.FlightNO != null) {
           FlightNOItemArr.push(item.FlightNO)
           this.FlightNOItem.push({
             text: item.FlightNO,
@@ -634,28 +634,28 @@ export default {
           })
         }
 
-        if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != '') {
+        if (FlightDateItemArr.indexOf(item.FlightDate) == -1 && item.FlightDate != ''&& item.FlightDate != null) {
           FlightDateItemArr.push(item.FlightDate)
           this.FlightDateItem.push({
             text: item.FlightDate,
             value: item.FlightDate
           })
         }
-        if (SourceAirportItemArr.indexOf(item.SourceAirport) == -1 && item.SourceAirport != '') {
+        if (SourceAirportItemArr.indexOf(item.SourceAirport) == -1 && item.SourceAirport != ''&& item.SourceAirport != null) {
           SourceAirportItemArr.push(item.SourceAirport)
           this.SourceAirportItem.push({
             text: item.SourceAirport,
             value: item.SourceAirport
           })
         }
-        if (TargetAirportItemArr.indexOf(item.TargetAirport) == -1 && item.TargetAirport != '') {
+        if (TargetAirportItemArr.indexOf(item.TargetAirport) == -1 && item.TargetAirport != ''&& item.TargetAirport != null) {
           TargetAirportItemArr.push(item.TargetAirport)
           this.TargetAirportItem.push({
             text: item.TargetAirport,
             value: item.TargetAirport
           })
         }
-        if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != '') {
+        if (SpecialTypeItemArr.indexOf(item.SpecialType) == -1 && item.SpecialType != ''&& item.SpecialType != null) {
           SpecialTypeItemArr.push(item.SpecialType)
           this.SpecialTypeItem.push({
             text: item.SpecialType,
@@ -663,42 +663,42 @@ export default {
           })
         }
 
-        if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != '') {
+        if (checkInItemArr.indexOf(item.checkIn) == -1 && item.checkIn != ''&& item.checkIn != null) {
           checkInItemArr.push(item.checkIn)
           this.checkInItem.push({
             text: item.checkIn,
             value: item.checkIn
           })
         }
-        if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != '') {
+        if (deletedItemArr.indexOf(item.deleted) == -1 && item.deleted != ''&& item.deleted != null) {
           deletedItemArr.push(item.deleted)
           this.deletedItem.push({
             text: item.deleted,
             value: item.deleted
           })
         }
-        if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != '') {
+        if (activatedItemArr.indexOf(item.activated) == -1 && item.activated != ''&& item.activated != null) {
           activatedItemArr.push(item.activated)
           this.activatedItem.push({
             text: item.activated,
             value: item.activated
           })
         }
-        if (latestStatusItemArr.indexOf(item.latestStatus) == -1 && item.latestStatus != '') {
+        if (latestStatusItemArr.indexOf(item.latestStatus) == -1 && item.latestStatus != ''&& item.latestStatus != null) {
           latestStatusItemArr.push(item.latestStatus)
           this.latestStatusItem.push({
             text: item.latestStatus,
             value: item.latestStatus
           })
         }
-        if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != '') {
+        if (bagLocationItemArr.indexOf(item.bagLocation) == -1 && item.bagLocation != ''&& item.bagLocation != null) {
           bagLocationItemArr.push(item.bagLocation)
           this.bagLocationItem.push({
             text: item.bagLocation,
             value: item.bagLocation
           })
         }
-        if (TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 && item.TransferFlightNO != '') {
+        if (TransferFlightNOItemArr.indexOf(item.TransferFlightNO) == -1 && item.TransferFlightNO != ''&& item.TransferFlightNO != null) {
           TransferFlightNOItemArr.push(item.TransferFlightNO)
           this.TransferFlightNOItem.push({
             text: item.TransferFlightNO,