zhaoke 1 жил өмнө
parent
commit
3f9b2630f4

+ 3 - 3
src/views/newBagDetails/components/baggageView.vue

@@ -190,8 +190,8 @@ export default {
             item.bagStatus = _.cloneDeep(this.stepNodes)
             item.bagStatus = _.cloneDeep(this.stepNodes)
           })
           })
           this.tableDataCopy.push(...returnData);
           this.tableDataCopy.push(...returnData);
-          this.tableDataCopy = _.uniqBy(this.tableDataCopy, 'carrierFlights')
-          this.tableDataCopy = this.tableDataCopy.sort((a, b) => Date.parse(a.carrierFlightsDate) - Date.parse(b.carrierFlightsDate))
+          //this.tableDataCopy = _.uniqBy(this.tableDataCopy, 'carrierFlights')
+          // this.tableDataCopy = this.tableDataCopy.sort((a, b) => Date.parse(a.carrierFlightsDate) - Date.parse(b.carrierFlightsDate))
           this.tableDataCopy.forEach(item => {
           this.tableDataCopy.forEach(item => {
             item.bagStatus.map(p => {
             item.bagStatus.map(p => {
               const { timeProp, loclProp, stateProp } = p
               const { timeProp, loclProp, stateProp } = p
@@ -259,7 +259,7 @@ export default {
           }
           }
         }
         }
       })
       })
-      this.tableData = _.orderBy([...newArr], ["takeTime"], ["asc", "desc"]);
+      this.tableData = _.orderBy([...newArr], ["carrierFlightsDate", "takeTime"], ["asc"]);
     }
     }
   }
   }
 }
 }