行合并

src/views/baggageManagement/components/transferArrival/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 14:30:52
+ * @LastEditTime: 2022-05-13 15:41:16
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -695,9 +695,7 @@ export default {
           'StandForDepartrue',
           'outTransferBaggageCount',
           'outTransferredBaggageCount',
-          'timeDifference',
-          'inTransferBaggageCount',
-          'inTransferredBaggageCount'
+          'timeDifference'
         ].includes(column['property'])
       ) {
         const _row = this.spanArr[rowIndex]
@@ -709,7 +707,7 @@ export default {
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      for (let i = 0; i < 5; i++) {
+      for (let i = 0; i < 9; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
           const _col = _row > 0 ? 1 : 0

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 14:31:17
+ * @LastEditTime: 2022-05-13 15:40:37
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -688,11 +688,11 @@ export default {
           'LandingBuild',
           'Carousel',
           'StandForLanding',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
           'positionDistribution',
           'expect_load',
-          'loadflight',
-          'outTransferBaggageCount',
-          'outTransferredBaggageCount'
+          'loadflight'
         ].includes(column['property'])
       ) {
         const _row = this.spanArr[rowIndex]
@@ -704,7 +704,7 @@ export default {
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      for (let i = 0; i < 7; i++) {
+      for (let i = 0; i < 9; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
           const _col = _row > 0 ? 1 : 0