进港视图-已卸载跳转高级查询

public/config.js

@@ -13,7 +13,7 @@ const DATACONTENT_ID = {
 
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
-  advacedQueryId: 30, //高级查询-数据查询-id
+  advacedQueryId: 1530, //高级查询-数据查询-id
 
   /***-----账号管理------***/
   accountTableId: 78, //账号管理-首页-列表

src/views/advancedQuery/views/advancedHome.vue

@@ -623,7 +623,15 @@ export default {
         {
           statusName: '到达',
           statusCode: '到达'
-        }
+        },
+        {
+          statusName: '卸机',
+          statusCode: '卸机'
+        },
+        {
+          statusName: '已中转',
+          statusCode: '已中转'
+        },
       ],
       baggageTypeList: [],
       dataContent: [],

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

@@ -24,8 +24,22 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" style="width: 150px;" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planLandingApt" :value="item.planLandingApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              style="width: 150px;"
+              filterable
+              default-first-option
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planLandingApt"
+                :value="item.planLandingApt"
+              />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">

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

@@ -24,8 +24,22 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" style="width: 150px;" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              style="width: 150px;"
+              filterable
+              default-first-option
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planDepartureApt"
+                :value="item.planDepartureApt"
+              />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -420,6 +434,7 @@ export default {
       this.baggageCount = 0
       tableData.forEach(item => {
         item['flightCanceled'] = item['flightStatus'] === 'CAN' ? 1 : 0
+        item['tounLoad'] -= item['OFFCount']
         if (item['hasTakeOff'] === 1 && !item['flightCanceled']) {
           this.leaveCount++
         }

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

@@ -39,6 +39,7 @@
               size="small"
               style="width: 150px;"
               filterable
+              default-first-option
               placeholder="请选择机场"
               @change="airPortChange"
             >
@@ -574,6 +575,7 @@ export default {
       this.baggageCount = 0
       tableData.forEach(item => {
         item['flightCanceled'] = item['flightStatus'] === 'CAN' ? 1 : 0
+        item['tounLoad'] -= item['OFFCount']
         if (item['hasTakeOff'] === 1 && !item['flightCanceled']) {
           this.leaveCount++
         }

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

@@ -295,7 +295,7 @@
           :summary-method="summaryMethod"
           :header-cell-style="{ color: '#101116' }"
           :row-class-name="rowClass"
-          @row-click="containeClick"
+          @row-click="containerClick"
         >
           <el-table-column
             v-for="col in containerTableColumn"
@@ -894,7 +894,10 @@ export default {
         return ['合计', `共${num}件`]
       }
     },
-    containeClick(row) {
+    containerClick(row) {
+      if (row.containerNumber === 'FBK') {
+        return
+      }
       this.$router.push({
         path: '/advance',
         query: {

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

@@ -24,15 +24,55 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" style="width: 100px;" filterable placeholder="请选择机场" @change="airPortChange">
-              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.planDepartureApt" :value="item.planDepartureApt" />
+            <el-select
+              v-model="formData.currentAirport"
+              class="input-shadow"
+              size="small"
+              style="width: 100px;"
+              filterable
+              default-first-option
+              placeholder="请选择机场"
+              @change="airPortChange"
+            >
+              <el-option
+                v-for="(item, index) in AirportList"
+                :key="index"
+                :label="item.planDepartureApt"
+                :value="item.planDepartureApt"
+              />
             </el-select>
           </el-form-item>
           <el-form-item prop="inboundCarrier">
-            <el-cascader v-model="formData.inboundCarrier" class="input-shadow" style="width: 150px" size="small" :options="carrierProps" :props="optionProps" placeholder="进港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
+            <el-cascader
+              v-model="formData.inboundCarrier"
+              class="input-shadow"
+              style="width: 150px"
+              size="small"
+              :options="carrierProps"
+              :props="optionProps"
+              placeholder="进港承运航司"
+              collapse-tags
+              clearable
+              filterable
+              default-first-option
+              @change="resetLoopEvent"
+            />
           </el-form-item>
           <el-form-item prop="outgoingAirline">
-            <el-cascader v-model="formData.outgoingAirline" class="input-shadow" style="width: 150px" size="small" :options="carrierPropsop" :props="optionPropser" placeholder="离港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
+            <el-cascader
+              v-model="formData.outgoingAirline"
+              class="input-shadow"
+              style="width: 150px"
+              size="small"
+              :options="carrierPropsop"
+              :props="optionPropser"
+              placeholder="离港承运航司"
+              collapse-tags
+              clearable
+              filterable
+              default-first-option
+              @change="resetLoopEvent"
+            />
           </el-form-item>
           <!-- <el-form-item prop="startDate">
             <el-date-picker

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

@@ -62,6 +62,7 @@
               collapse-tags
               clearable
               filterable
+              default-first-option
               @change="resetLoopEvent"
             />
           </el-form-item>
@@ -77,6 +78,7 @@
               collapse-tags
               clearable
               filterable
+              default-first-option
               @change="resetLoopEvent"
             />
           </el-form-item>

src/views/baggageManagement/mixins/terminal.js

@@ -141,7 +141,6 @@ export default {
               'special',
               'claim',
               'uninstalled',
-              'to_be_uninstalled',
               'terminateArrive',
               'terminatedNotArrived',
               'delivered',
@@ -220,6 +219,7 @@ export default {
           'projectedLoad',
           'loadedQuantity',
           'numberOfDestinationArrivals',
+          'uninstalled',
           'noBSM'
         ].includes(column.property) &&
         row[column.property]
@@ -266,6 +266,7 @@ export default {
           'projectedLoad',
           'loadedQuantity',
           'numberOfDestinationArrivals',
+          'uninstalled',
           'noBSM'
         ].includes(column.property) &&
         row[column.property]
@@ -478,17 +479,26 @@ export default {
             }
             break
           case 'checkIns':
-            this.$router.push({
-              path: '/advance',
-              query: {
-                flightNO: row.flightNO,
-                startDate: row.flightDate,
-                endDate: row.flightDate,
-                departureStation: row.departureAirport,
-                destination: this.formData.currentAirport,
-                status: '值机'
+          case 'numberOfDestinationArrivals':
+          case 'uninstalled':
+            {
+              const reflect = {
+                checkIns: '值机',
+                numberOfDestinationArrivals: '到达',
+                uninstalled: '卸机'
               }
-            })
+              this.$router.push({
+                path: '/advance',
+                query: {
+                  flightNO: row.flightNO,
+                  startDate: row.flightDate,
+                  endDate: row.flightDate,
+                  departureStation: row.departureAirport,
+                  destination: this.formData.currentAirport,
+                  status: reflect[column.property]
+                }
+              })
+            }
             break
           case 'projectedLoad':
             this.$router.push({
@@ -518,19 +528,6 @@ export default {
               }
             })
             break
-          case 'numberOfDestinationArrivals':
-            this.$router.push({
-              path: '/advance',
-              query: {
-                flightNO: row.flightNO,
-                startDate: row.flightDate,
-                endDate: row.flightDate,
-                departureStation: row.departureAirport,
-                destination: this.formData.currentAirport,
-                status: '到达'
-              }
-            })
-            break
           case 'terminateArrivalQuantity':
             this.$router.push({
               path: '/advance',