进港视图跳转高级查询

src/utils/table.js

@@ -131,7 +131,7 @@ export function setTableFilters(tableData, filters) {
   })
   tableData.forEach(item => {
     Object.keys(tempSets).forEach(key => {
-      ;(item[key] ?? '') !== '' && tempSets[key].add(item[key])
+      (item[key] ?? '') !== '' && tempSets[key].add(item[key])
     })
   })
   Object.keys(tempSets).forEach(key => {
@@ -166,7 +166,7 @@ export function exportToExcel(table, tableName, fileName, headerRowNumber = 1) {
     // 设置了列的fixed属性后会有两个table元素，导出数据会重复，需要去掉一个table
     const fixedTable = table.querySelector('.el-table__fixed')
     fixedTable && table.removeChild(fixedTable)
-    // 自定义的表头里包含筛选，直接导出会把筛选的下拉数据也写到表头单元格离，需要先去掉筛选弹出框
+    // 自定义的表头里包含筛选，直接导出会把筛选的下拉数据也写到表头单元格里，需要先去掉筛选弹出框
     const tableHeaderCellPopovers = table.querySelectorAll('.table-header-cell-popover')
     tableHeaderCellPopovers.forEach(node => {
       node.removeChild(node.querySelector('.el-popover'))
@@ -178,7 +178,7 @@ export function exportToExcel(table, tableName, fileName, headerRowNumber = 1) {
     // 计算每一列的单元格的最大宽度（包含表头），单元格的key为'A12'、'AA2'等，和excel里一致
     const xlsxDatas = tableBook.Sheets[tableName]
     const columnWidths = []
-    for (let cellName in xlsxDatas) {
+    for (const cellName in xlsxDatas) {
       if (!['!rows', '!cols', '!fullref', '!ref', '!merges'].includes(cellName)) {
         const { columnIndex, rowIndex } = devideGroup(cellName)
         const cellTextLength = xlsxDatas[cellName].v.split('').reduce((pre, curr) => {

src/views/advancedQuery/views/advancedHome.vue

@@ -33,6 +33,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :picker-options="dateRangePickerOptions"
+          :clearable="false"
         />
       </div>
       <Search
@@ -184,6 +185,7 @@
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
                       :picker-options="dateRangePickerOptions"
+                      :clearable="false"
                       @keyup.esc.native="dialogFocus"
                     />
                   </template>
@@ -199,8 +201,8 @@
                       <el-option
                         v-for="option in statusList"
                         :key="option.ID"
-                        :label="option.StatusName"
-                        :value="option.StatusCode"
+                        :label="option.statusName"
+                        :value="option.statusCode"
                       />
                     </el-select>
                   </template>
@@ -239,60 +241,9 @@
                       />
                     </el-select>
                   </template>
-                  <template v-else-if="item.prop === 'checkIn'">
+                  <template v-else-if="['checkIn', 'active', 'transferIn', 'canceled'].includes(item.prop)">
                     <el-select
-                      v-model="form.checkIn"
-                      size="small"
-                      clearable
-                      @keyup.esc.native="dialogFocus"
-                    >
-                      <el-option
-                        label="是"
-                        :value="1"
-                      />
-                      <el-option
-                        label="否"
-                        :value="0"
-                      />
-                    </el-select>
-                  </template>
-                  <template v-else-if="item.prop === 'active'">
-                    <el-select
-                      v-model="form.active"
-                      size="small"
-                      clearable
-                      @keyup.esc.native="dialogFocus"
-                    >
-                      <el-option
-                        label="是"
-                        :value="1"
-                      />
-                      <el-option
-                        label="否"
-                        :value="0"
-                      />
-                    </el-select>
-                  </template>
-                  <template v-else-if="item.prop === 'transferIn'">
-                    <el-select
-                      v-model="form.transferIn"
-                      size="small"
-                      clearable
-                      @keyup.esc.native="dialogFocus"
-                    >
-                      <el-option
-                        label="是"
-                        :value="1"
-                      />
-                      <el-option
-                        label="否"
-                        :value="0"
-                      />
-                    </el-select>
-                  </template>
-                  <template v-else-if="item.prop === 'canceled'">
-                    <el-select
-                      v-model="form.canceled"
+                      v-model="form[item.prop]"
                       size="small"
                       clearable
                       @keyup.esc.native="dialogFocus"
@@ -651,28 +602,28 @@ export default {
       statusList: [
         {
           ID: 0,
-          StatusName: '安检',
-          StatusCode: '安检'
+          statusName: '安检',
+          statusCode: '安检'
         },
         {
           ID: 1,
-          StatusName: '分拣',
-          StatusCode: '分拣'
+          statusName: '分拣',
+          statusCode: '分拣'
         },
         {
           ID: 2,
-          StatusName: '装车',
-          StatusCode: '装车'
+          statusName: '装车',
+          statusCode: '装车'
         },
         {
           ID: 3,
-          StatusName: '装机',
-          StatusCode: '装机'
+          statusName: '装机',
+          statusCode: '装机'
         },
         {
           ID: 4,
-          StatusName: '到达',
-          StatusCode: '到达'
+          statusName: '到达',
+          statusCode: '到达'
         }
       ],
       baggageTypeList: [],

src/views/baggageManagement/mixins/terminal.js

@@ -216,6 +216,9 @@ export default {
           'loadNumber',
           'boardID',
           // 'checkIns',
+          'projectedLoad',
+          'loadedQuantity',
+          'numberOfDestinationArrivals',
           'noBSM'
         ].includes(column.property) &&
         row[column.property]
@@ -258,6 +261,9 @@ export default {
           'loadNumber',
           'boardID',
           // 'checkIns',
+          'projectedLoad',
+          'loadedQuantity',
+          'numberOfDestinationArrivals',
           'noBSM'
         ].includes(column.property)
       ) {
@@ -446,26 +452,27 @@ export default {
         case 'checkNumber':
         case 'sortNumber':
         case 'loadNumber':
-        case 'boardID': {
-          const reflect = {
-            checkNumber: '安检',
-            sortNumber: '分拣',
-            loadNumber: '装车',
-            boardID: '装机'
-          }
-          this.$router.push({
-            path: '/advance',
-            query: {
-              flightNO: row.flightNO,
-              startDate: row.flightDate,
-              endDate: row.flightDate,
-              departureStation: this.formData.currentAirport,
-              destination: row.targetAirport,
-              status: reflect[column.property]
+        case 'boardID':
+          {
+            const reflect = {
+              checkNumber: '安检',
+              sortNumber: '分拣',
+              loadNumber: '装车',
+              boardID: '装机'
             }
-          })
+            this.$router.push({
+              path: '/advance',
+              query: {
+                flightNO: row.flightNO,
+                startDate: row.flightDate,
+                endDate: row.flightDate,
+                departureStation: this.formData.currentAirport,
+                destination: row.targetAirport,
+                status: reflect[column.property]
+              }
+            })
+          }
           break
-        }
         // case 'checkIns':
         //   this.$router.push({
         //     path: '/advance',
@@ -479,6 +486,47 @@ export default {
         //     }
         //   })
         //   break
+        case 'projectedLoad':
+          this.$router.push({
+            path: '/advance',
+            query: {
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
+              departureStation: row.departureAirport,
+              destination: this.formData.currentAirport,
+              active: 1,
+              canceled: 0
+            }
+          })
+          break
+        case 'loadedQuantity':
+          this.$router.push({
+            path: '/advance',
+            query: {
+              flightNO: row.flightNO,
+              startDate: row.flightDate,
+              endDate: row.flightDate,
+              departureStation: row.departureAirport,
+              destination: this.formData.currentAirport,
+              status: '装机',
+              canceled: 0
+            }
+          })
+          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
         default:
           break
       }