Browse Source

待翻减改成红色

zhongxiaoyu 2 years ago
parent
commit
2dbb62506f

+ 2 - 2
src/components/TableHeaderCell/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-05-25 14:09:35
- * @LastEditTime: 2022-06-13 11:18:50
+ * @LastEditTime: 2022-06-22 16:52:19
  * @LastEditors: your name
  * @Description: 表头下拉筛选
  * have a nice day!
@@ -97,7 +97,7 @@ export default {
       return this.filterValues?.length
     },
     filterable() {
-      return this.filterOptions?.length
+      return this.filterOptions
     }
   },
   watch: {

+ 1 - 0
src/views/advancedQuery/views/advancedHome.vue

@@ -420,6 +420,7 @@ export default {
           prop: 'BagSN',
           label: '行李牌号',
           width: 110,
+          filterable: true,
           sortable: true
         },
         {

+ 3 - 3
src/views/baggageManagement/components/departure/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-06-21 18:00:28
+ * @LastEditTime: 2022-06-22 17:39:49
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -740,7 +740,7 @@ export default {
         background: #f7babe;
       }
       td.cell-tounLoad {
-        background: #facaa0 !important;
+        background: lightcoral !important;
         position: relative;
         &::after {
           content: '';
@@ -750,7 +750,7 @@ export default {
           position: absolute;
           top: 0;
           left: 0;
-          border: 2px dashed #f58c31;
+          border: 2px dashed red;
         }
       }
       .el-table__cell.is-hidden > * {

+ 30 - 6
src/views/baggageManagement/components/flight/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-06-22 10:06:42
+ * @LastEditTime: 2022-06-22 17:52:18
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -335,7 +335,13 @@
           />
         </el-table>
       </div>
-      <div class="part4">
+      <div
+        class="part4"
+        :style="draggableStyle"
+      >
+        <!-- <div class="drag-line">
+          <i class="drag-icon el-icon-d-carer" />
+        </div> -->
         <div class="title">
           <!-- <el-cascader
             placeholder="全部行李"
@@ -374,7 +380,7 @@
           :data="dealedTableData"
           border
           style="width: 100%"
-          height="calc(100vh - 80px - 16px - 16px - 344px - 8px - 204px - 62px)"
+          height="calc(100% - 64px)"
           stripe
           size="mini"
           show-summary
@@ -545,7 +551,8 @@ export default {
       flightBaggageTableFilters: {},
       filterValues: {},
       tableDataSortRules: {},
-      warningContainers: []
+      warningContainers: [],
+      dragHeight: 0
     }
   },
   computed: {
@@ -572,6 +579,11 @@ export default {
         [[], []]
       )
       return this._.orderBy(filtered, sortRules[0], sortRules[1])
+    },
+    draggableStyle() {
+      return {
+        height: `calc(100vh - 80px - 16px - 16px - 344px - 8px - 204px + ${this.dragHeight}px)`
+      }
     }
   },
   watch: {
@@ -637,7 +649,7 @@ export default {
       if (this.warningContainers.includes(row['containerNumber']) || row['latestStatus'] === '待翻减') {
         classes.push('row-warning')
       }
-      if ((row['Status'] === 'DEL')) {
+      if (row['Status'] === 'DEL') {
         classes.push('bgl-deleted')
       }
       return classes.join(' ')
@@ -868,6 +880,7 @@ export default {
     justify-content: flex-start;
     flex-wrap: wrap;
     overflow: auto;
+    // position: relative;
     .part1 {
       width: 71.15%;
       height: 344px;
@@ -953,6 +966,17 @@ export default {
     }
     .part4 {
       width: 100%;
+      // position: fixed;
+      // bottom: 0;
+      // .drag-line {
+      //   position: absolute;
+      //   top: 0;
+      //   width: 100%;
+      //   .drag-icon {
+      //     margin: 0 auto;
+      //     font-size: 16px;
+      //   }
+      // }
       .title {
         padding: 16px 0;
         display: flex;
@@ -995,7 +1019,7 @@ export default {
         }
       }
       .row-warning .el-table__cell {
-        background: orange;
+        background: red;
       }
     }
   }