zhaoke 2 years ago
parent
commit
24a644a46c

+ 7 - 3
src/views/baggageManagement/components/transferArrival/index.vue

@@ -308,7 +308,7 @@ export default {
               sortable: true,
               sortable: true,
             },
             },
             {
             {
-              prop: "outTransferBaggageCount",
+              prop: "inTransferBaggageCount",
               label: "中转行李数",
               label: "中转行李数",
               desc: "指航班在本航站预计需要中转至对应航班的行李数量",
               desc: "指航班在本航站预计需要中转至对应航班的行李数量",
             },
             },
@@ -319,7 +319,7 @@ export default {
           label: "离港航班",
           label: "离港航班",
           children: [
           children: [
             {
             {
-              prop: "outTransferredBaggageCount",
+              prop: "inTransferredBaggageCount",
               label: "已中转行李数",
               label: "已中转行李数",
               desc: "指航班在本航站实际已经中转至对应航班的行李数量",
               desc: "指航班在本航站实际已经中转至对应航班的行李数量",
               width: 100,
               width: 100,
@@ -653,10 +653,14 @@ export default {
       this.arrivalCount = 0;
       this.arrivalCount = 0;
       this.baggageCount = 0;
       this.baggageCount = 0;
       tableData.forEach((item) => {
       tableData.forEach((item) => {
+        const o1 = item["inTransferBaggageCount"];
+        const o2 = item["inTransferredBaggageCount"];
+        const out1 = o1 != undefined || o1 != null ? o1 : 0;
+        const out2 = o2 != undefined || o2 != null ? o2 : 0;
         if (this.hasArrived(item)) {
         if (this.hasArrived(item)) {
           this.arrivalCount++;
           this.arrivalCount++;
         }
         }
-        if (!item["hasArrived"] && item["outTransferBaggageCount"] - item["outTransferredBaggageCount"] > 0) {
+        if (item["hasArrived"] && out1 - out2 > 0) {
           this.WarningData.forEach((p) => {
           this.WarningData.forEach((p) => {
             const startTime = this.formatTime(timeInZone((p.startDate ?? "").replace("T", " "), this.timeZone), 2);
             const startTime = this.formatTime(timeInZone((p.startDate ?? "").replace("T", " "), this.timeZone), 2);
             const endTime = this.formatTime(timeInZone((p.endDate ?? "").replace("T", " "), this.timeZone), 2);
             const endTime = this.formatTime(timeInZone((p.endDate ?? "").replace("T", " "), this.timeZone), 2);

+ 9 - 9
src/views/baggageManagement/mixins/terminal.js

@@ -249,15 +249,15 @@ export default {
       if (column.property === "outTransferBaggageCount" && row["sharpSign"]) {
       if (column.property === "outTransferBaggageCount" && row["sharpSign"]) {
         classes.push("cell-tounLoadNew");
         classes.push("cell-tounLoadNew");
       }
       }
-      // if (column.property === "inTransferredBaggageCount" && row["warningState"] && row["warningState"] == 2) {
-      //   classes.push("cell-tounLoad");
-      // }
-      // if (column.property === "inTransferredBaggageCount" && row["warningState"] && row["warningState"] == 1) {
-      //   classes.push("cell-tounLoadNew");
-      // }
-      // if (column.property === "inTransferBaggageCount" && row["sharpSign"]) {
-      //   classes.push("cell-tounLoadNew");
-      // }
+      if (column.property === "inTransferredBaggageCount" && row["warningState"] && row["warningState"] == 2) {
+        classes.push("cell-tounLoad");
+      }
+      if (column.property === "inTransferredBaggageCount" && row["warningState"] && row["warningState"] == 1) {
+        classes.push("cell-tounLoadNew");
+      }
+      if (column.property === "inTransferBaggageCount" && row["sharpSign"]) {
+        classes.push("cell-tounLoadNew");
+      }
       return classes.join(" ");
       return classes.join(" ");
     },
     },
     cellClickHandler(row, column, cell, event) {
     cellClickHandler(row, column, cell, event) {