容器、散装查询

public/config.js

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

src/views/advancedQuery/views/advancedHome.vue

@@ -275,6 +275,23 @@
                       />
                     </el-select>
                   </template>
+                  <template v-else-if="item.prop === 'loadType'">
+                    <el-select
+                      v-model="form.loadType"
+                      size="small"
+                      clearable
+                      @keyup.esc.native="dialogFocus"
+                    >
+                      <el-option
+                        label="容器"
+                        :value="0"
+                      />
+                      <el-option
+                        label="散装"
+                        :value="1"
+                      />
+                    </el-select>
+                  </template>
                   <template v-else>
                     <el-popover
                       v-model="item.hintVisible"
@@ -332,24 +349,7 @@ export default {
       loading: false,
       colDialogFlag: false,
       gjFlag: false,
-      tableData: [
-        // {
-        //   flightNO: '',
-        //   flightDate: '',
-        //   sourceAirport: '',
-        //   targetAirport: '',
-        //   passengerNameUpcase: '',
-        //   bagSN: '',
-        //   specialType: '',
-        //   checkIn: '',
-        //   deleted: '',
-        //   activated: '',
-        //   bagWeight: '',
-        //   latestStatus: '',
-        //   bagLocation: '',
-        //   transferFlightNO: ''
-        // }
-      ],
+      tableData: [],
       page: -1,
       noMore: false,
       checkList: [],
@@ -486,6 +486,7 @@ export default {
         departureStation: '',
         baggageNO: '',
         specialType: '',
+        loadType: '',
         U_Device_ID: '',
         passengerName: '',
         PNR: '',
@@ -538,6 +539,10 @@ export default {
           prop: 'specialType',
           label: '特殊行李类型'
         },
+        {
+          prop: 'loadType',
+          label: '装载类型'
+        },
         {
           prop: 'U_Device_ID',
           label: '容器编号',
@@ -628,10 +633,10 @@ export default {
           statusName: '卸机',
           statusCode: '卸机'
         },
-        {
-          statusName: '已中转',
-          statusCode: '已中转'
-        },
+        // {
+        //   statusName: '已中转',
+        //   statusCode: '已中转'
+        // }
       ],
       baggageTypeList: [],
       dataContent: [],
@@ -730,13 +735,6 @@ export default {
         this.$set(this.tableDataSortRules, prop, '')
       }
     })
-    // console.log(this.$store.state.app.queryForm)
-    // 参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，PNR，PNR,值机号，值机号】
-    // const dataContent = [this.time[0], this.time[1]]
-    // for (let i = 0; i < 18; i++) {
-    //   dataContent.push(null)
-    // }
-    // this.statItemsQueryByStatMain(dataContent);
   },
   mounted() {
     this.baggageTypeQuery()
@@ -763,16 +761,20 @@ export default {
       this.$refs.table.doLayout()
     })
   },
+  deactivated() {
+    this.loading = false
+  },
   beforeDestroy() {
+    this.loading = false
     // console.log(this.$route.matched.filter(item => item.name && item.meta.title))
-    if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {
-      this.$store.dispatch('app/setQueryForm', {
-        ...this.form,
-        flightDate: this.flightDate
-      })
-    } else {
-      this.$store.dispatch('app/setQueryForm', null)
-    }
+    // if (this.$route.matched.filter(item => item.name && item.meta.title).length > 1) {
+    //   this.$store.dispatch('app/setQueryForm', {
+    //     ...this.form,
+    //     flightDate: this.flightDate
+    //   })
+    // } else {
+    //   this.$store.dispatch('app/setQueryForm', null)
+    // }
   },
   methods: {
     load() {
@@ -904,53 +906,53 @@ export default {
       return classes.join(' ')
     },
     cellClickHandler(row, column, cell, event) {
-      if (['flightNO', 'bagSN', 'preFlightNO', 'transferFlightNO'].includes(column.property)) {
+      if (['flightNO', 'bagSN', 'preFlightNO', 'transferFlightNO'].includes(column.property) && row[column.property]) {
         this.$store.dispatch('keepAlive/addClickedCell', {
           row,
           columnProp: column.property,
           pageName: 'advance'
         })
-      }
-      switch (column.property) {
-        case 'flightNO':
-          this.$router.push({
-            path: '/advance/flightView',
-            query: {
-              flightNO: row.flightNO,
-              flightDate: row.flightDate
-            }
-          })
-          break
-        case 'bagSN':
-          this.$router.push({
-            path: '/advance/baggageView',
-            query: {
-              flightNO: row.flightNO,
-              flightDate: row.flightDate,
-              bagSN: row.bagSN
-            }
-          })
-          break
-        case 'transferFlightNO':
-          this.$router.push({
-            path: '/advance/flightView',
-            query: {
-              flightNO: row.transferFlightNO,
-              flightDate: row.transferFlightDate
-            }
-          })
-          break
-        case 'preFlightNO':
-          this.$router.push({
-            path: '/advance/flightView',
-            query: {
-              flightNO: row.preFlightNO,
-              flightDate: row.preFlightDate
-            }
-          })
-          break
-        default:
-          break
+        switch (column.property) {
+          case 'flightNO':
+            this.$router.push({
+              path: '/advance/flightView',
+              query: {
+                flightNO: row.flightNO,
+                flightDate: row.flightDate
+              }
+            })
+            break
+          case 'bagSN':
+            this.$router.push({
+              path: '/advance/baggageView',
+              query: {
+                flightNO: row.flightNO,
+                flightDate: row.flightDate,
+                bagSN: row.bagSN
+              }
+            })
+            break
+          case 'transferFlightNO':
+            this.$router.push({
+              path: '/advance/flightView',
+              query: {
+                flightNO: row.transferFlightNO,
+                flightDate: row.transferFlightDate
+              }
+            })
+            break
+          case 'preFlightNO':
+            this.$router.push({
+              path: '/advance/flightView',
+              query: {
+                flightNO: row.preFlightNO,
+                flightDate: row.preFlightDate
+              }
+            })
+            break
+          default:
+            break
+        }
       }
     },
     tableFormat(row, column, cellValue) {
@@ -1037,6 +1039,7 @@ export default {
             checkInSequence,
             transferArrival,
             transferDeparture,
+            loadType,
             U_Device_ID,
             unLoad,
             checkIn,
@@ -1064,7 +1067,8 @@ export default {
             transferIn,
             canceled,
             status,
-            noBSM
+            noBSM,
+            loadType
           )
           this.statItemsQueryByStatMain(this.dataContent, singleJump)
           this.gjFlag = false

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

@@ -895,18 +895,27 @@ export default {
       }
     },
     containerClick(row) {
-      if (row.containerNumber === 'FBK') {
-        return
+      if (row.containerNumber === 'FBULK') {
+        this.$router.push({
+          path: '/advance',
+          query: {
+            flightNO: this.queryData.flightNO,
+            startDate: this.queryData.flightDate,
+            endDate: this.queryData.flightDate,
+            loadType: 1
+          }
+        })
+      } else {
+        this.$router.push({
+          path: '/advance',
+          query: {
+            flightNO: this.queryData.flightNO,
+            startDate: this.queryData.flightDate,
+            endDate: this.queryData.flightDate,
+            U_Device_ID: row.containerNumber
+          }
+        })
       }
-      this.$router.push({
-        path: '/advance',
-        query: {
-          flightNO: this.queryData.flightNO,
-          startDate: this.queryData.flightDate,
-          endDate: this.queryData.flightDate,
-          U_Device_ID: row.containerNumber
-        }
-      })
     },
     exportHandler(refName, tableName) {
       const table = this.$refs[refName].$el.cloneNode(true)

src/views/baggageManagement/mixins/terminal.js

@@ -165,6 +165,7 @@ export default {
               'terminateUnreachedQuantity',
               'quantityShipped',
               'undeliveredQuantity',
+              'numberOfContainers',
               'numberOfBulk',
               'inTransferBaggageCount',
               'inTransferredBaggageCount',
@@ -220,6 +221,8 @@ export default {
           'loadedQuantity',
           'numberOfDestinationArrivals',
           'uninstalled',
+          'numberOfContainers',
+          'numberOfBulk',
           'noBSM'
         ].includes(column.property) &&
         row[column.property]
@@ -267,6 +270,8 @@ export default {
           'loadedQuantity',
           'numberOfDestinationArrivals',
           'uninstalled',
+          'numberOfContainers',
+          'numberOfBulk',
           'noBSM'
         ].includes(column.property) &&
         row[column.property]
@@ -542,6 +547,20 @@ export default {
               }
             })
             break
+          case 'numberOfContainers':
+          case 'numberOfBulk':
+            this.$router.push({
+              path: '/advance',
+              query: {
+                flightNO: row.flightNO,
+                startDate: row.flightDate,
+                endDate: row.flightDate,
+                departureStation: row.departureAirport,
+                destination: this.formData.currentAirport,
+                loadType: column.property === 'numberOfContainers' ? 0 : 1
+              }
+            })
+            break
           default:
             break
         }