离岗视图

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

@@ -142,9 +142,8 @@
           :prop="item.statCode"
           :label="item.statName"
           :width="item.width"
-          :formatter="tableFormat"
-          :filters="item.filters"
-          :filter-method="item.filterMethod"
+          :filters="flightBaggageTableFilters[item.statCode]"
+          :filter-method="flightBaggageTableFilters[item.statCode] && filterHandler"
         />
       </el-table>
     </div>
@@ -205,89 +204,75 @@ export default {
         {
           statCode: 'FlightNO',
           statName: '航班号',
-          width: 132,
-          filters:this.bagLocationItem,
-          filterMethod:this.filterHandler
+          width: 100,
         },
         {
           statCode: 'FlightDate',
           statName: '执飞日期',
           width: 105,
-          filters:this.FlightDateItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'PlanDepartureTime',
           statName: '预计起飞时间',
-          width: 115,
-          filters:this.PlanDepartureTimeItemArr,
-          filterMethod:this.filterHandler
+          width: 135,
         },
         {
-          statCode: 'PlanLandingApt',
+          statCode: 'TargetAirport',
           statName: '目的站',
           width: 71,
-          filters:this.PlanLandingAptItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'DepartureBuild',
           statName: '航站楼',
           width: 65,
-          filters:this.DepartureBuildItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'BordingGate',
           statName: '登机口',
           width: 68,
-          filters:this.BordingGateItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'StandForDepartrue',
           statName: '停机位',
           width: 60,
-          filters:this.StandForDepartrueItemArr,
-          filterMethod:this.filterHandler
         },
         {
-          statCode: 'passagernum',
+          statCode: 'checkInTravellerNumber',
           statName: '托运旅客',
           width: 88
         },
         {
-          statCode: 'checkin',
-          statName: '值机',
+          statCode: 'checkInNumber',
+          statName: '值机数',
           width: 72
         },
         {
-          statCode: 'not_actived',
+          statCode: 'unActive',
           statName: '未激活',
           width: 76
         },
         {
-          statCode: 'expect_load',
+          statCode: 'preLoad',
           statName: '预计装载',
           width: 101
         },
         {
-          statCode: 'security_all',
+          statCode: 'checkNumber',
           statName: '安检',
           width: 88
         },
         {
-          statCode: 'fenj',
+          statCode: 'sortNumber',
           statName: '分拣',
           width: 83
         },
         {
-          statCode: 'loadcar',
+          statCode: 'loadNumber',
           statName: '装车',
           width: 83
         },
         {
-          statCode: 'loadflight',
+          statCode: 'loadNumber',
           statName: '装机',
           width: 80
         },
@@ -297,17 +282,17 @@ export default {
           width: 79
         },
         {
-          statCode: 'hasfanj',
+          statCode: 'unLoad',
           statName: '已翻减',
           width: 82
         },
         {
-          statCode: 'delbag',
+          statCode: 'noCheckInNumber',
           statName: '取消托运',
           width: 89
         },
         {
-          statCode: 'no_bsm',
+          statCode: 'noBSM',
           statName: '无BSM',
           width: 68
         },
@@ -322,16 +307,20 @@ export default {
           width: 72
         },
         {
-          statCode: 'transfer_all',
+          statCode: 'midIn',
           statName: '中转进行李'
         }
       ],
       AirportList:[],
-      FlightNOItem: [],
-      PlanDepartureTimeItemArr:[],
-      PlanLandingAptItemArr:[],
-      BordingGateItemArr:[],
-      StandForDepartrueItemArr:[]
+      flightBaggageTableFilters:{
+        FlightNO: [],
+        FlightDate:[],
+        PlanDepartureTime:[],
+        TargetAirport:[],
+        BordingGate:[],
+        StandForDepartrue:[]
+      }
+
     }
   },
   created(){
@@ -384,13 +373,15 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
+      let arr = [this.formData.currentAirport,this.formData.startDate,this.formData.endDate]
       try {
         const res = await getQuery({
           id: 66,
-          dataContent:[this.formData.currentAirport,this.formData.startDate,this.formData.endDate]
+          dataContent:[...arr,...arr,...arr,...arr]
         })
         if (res.code == 0) {
          console.log(res)
+         this.initTableData(res.returnData);
         } else {
           this.$message.error(res.message)
         }
@@ -400,9 +391,23 @@ export default {
     },
     initTableData(tableData) {
       tableData.forEach(item => {
-        item['wantfanj'] = item['delbag'] - item['hasfanj']
+        item['waitfanj'] = item['noCheckInNumber'] - item['unLoad']
       })
       this.tableData = this._.sortBy(tableData, ['FlightDate', 'PlanDepartureTime'])
+      this.setTableFilters()
+    },
+    // 表格添加过滤条件
+    setTableFilters() {
+      this.tableData.forEach(item => {
+        Object.keys(this.flightBaggageTableFilters).forEach(key => {
+          if ((item[key] ?? '') !== '' && this.flightBaggageTableFilters[key].every(obj => obj.value !== item[key])) {
+            this.flightBaggageTableFilters[key].push({
+              text: item[key],
+              value: item[key]
+            })
+          }
+        })
+      })
     },
     filterHandler(value, row, column) {
       const property = column['property']

src/views/baggageManagement/mixins/form.js

@@ -172,7 +172,7 @@ export default {
     },
     // 日期限制
     setStartDate(val) {
-      this.formClear('all')
+      // this.formClear('all')
       if (!val) {
         return
       }
@@ -181,13 +181,13 @@ export default {
         this.$message.error('结束时间不能小于开始时间，请重新选择')
         return false
       } else {
-        // this.getFormData(params)
-        this.currentAirportQuery()
+        this.getTableData()
+        // this.currentAirportQuery()
         return true
       }
     },
     setEndDate(val) {
-      this.formClear('all')
+      // this.formClear('all')
       if (!val) {
         return
       }
@@ -196,8 +196,8 @@ export default {
         this.$message.error('结束时间不能小于开始时间，请重新选择')
         return false
       } else {
-        // this.getFormData(params)
-        this.currentAirportQuery()
+        this.getTableData()
+        // this.currentAirportQuery()
         return true
       }
     },

src/views/baggageManagement/mixins/terminal.js

@@ -98,17 +98,16 @@ export default {
             // 需要计算的列
             [
               'passagernum',
-              'checkin',
+              'checkNumber',
               'not_actived',
               'expect_load',
               'security_all',
-              'fenj',
-              'loadcar',
-              'loadflight',
+              'sortNumber',
+              'loadNumber',
               'waitfanj',
-              'hasfanj',
+              'unLoad',
               'delbag',
-              'no_bsm',
+              'noBSM',
               'transfer_all',
               'reach',
               'did_not_arrive',
@@ -121,7 +120,15 @@ export default {
               'delivered',
               'not_shipped',
               'container',
-              'bulk'
+              'bulk',
+              'checkInTravellerNumber',
+              'checkInNumber',
+              'unActive',
+              'preLoad',
+              'noCheckInNumber',
+              'midIn',
+
+
             ].includes(column.property)
           ) {
             const values = data.map(item => Number(item[column.property]))