chenrui  2 years ago
parent
commit
4c69d62786

+ 6 - 1
src/views/baggageManagement/components/transferArrival/index.vue

@@ -180,7 +180,6 @@
         class="table"
         max-height="100%"
         :height="computedTableHeight"
-        :span-method="tableSpanMethod"
         show-summary
         :summary-method="summaryMethod"
         border
@@ -533,6 +532,12 @@ export default {
         "FlightDate",
         "PlanDepartureTime",
       ]);
+      this.tableData.forEach((res) => {
+        res = {
+          arrivalInfo: res,
+          departureInfo: res,
+        };
+      });
       // this.setTableFilters();
       // this.toOrderNum(this.baggageCount);
       // setInterval(() => {

+ 22 - 3
src/views/baggageManagement/components/transferDeparture/index.vue

@@ -180,7 +180,6 @@
         class="table"
         max-height="100%"
         :height="computedTableHeight"
-        :span-method="tableSpanMethod"
         show-summary
         :summary-method="summaryMethod"
         border
@@ -477,12 +476,32 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
+      // let arr = [
+      //   this.formData.currentAirport,
+      //   this.formData.startDate,
+      //   this.formData.endDate,
+      //   this.formData.inboundCarrier,
+      //   this.formData.outgoingAirline,
+      // ];
+      let arrs = [
+        this.formData.inboundCarrier.length == 0
+          ? ""
+          : JSON.stringify(this.formData.inboundCarrier),
+        this.formData.outgoingAirline.length == 0
+          ? ""
+          : JSON.stringify(this.formData.outgoingAirline),
+      ];
       let arr = [
         this.formData.currentAirport,
         this.formData.startDate,
         this.formData.endDate,
-        this.formData.inboundCarrier,
-        this.formData.outgoingAirline,
+        ...arrs,
+        ...arrs,
+        ...arrs,
+        // this.formData.inboundCarrier,
+        // this.formData.outgoingAirline,
+        // JSON.stringify(this.formData.inboundCarrier),
+        // JSON.stringify(this.formData.outgoingAirline),
       ];
       try {
         const res = await getQuery({