Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/layout/components/Search/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 17:44:42
- * @LastEditTime: 2022-05-12 17:34:22
+ * @LastEditTime: 2022-05-13 13:35:45
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\account\components\search.vue
@@ -12,7 +12,7 @@
       <div v-if="isTitle" :class="isChild ? 'childTitle' : ''" class="title">
         {{ title }}
       </div>
-      <div v-if="isOnly" class="content flex-wrap" @keyup.enter="checkSearch">
+      <div v-if="isOnly" class="content flex-wrap">
         <el-select v-model="value" clearable placeholder="请选择" v-if="isSou">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
@@ -21,7 +21,7 @@
           <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <div v-if="isSearch" :class="isChild ? 'childSearch' : ''" class="search">
+        <div v-if="isSearch" :class="isChild ? 'childSearch' : ''" class="search" @keyup.enter="checkSearch">
           <el-input :size="isChild ? 'medium' : ''" :placeholder="placeholder" @clear="clearSearch" clearable v-model="input">
             <el-button slot="prepend" icon="el-icon-search"></el-button>
           </el-input>

src/views/advancedQuery/views/advancedHome.vue

@@ -24,6 +24,7 @@
       </div>
       <Search
         ref="search"
+        class="advanced-search"
         :is-title="false"
         :is-slot="true"
         @getSearchData="getSearchData"
@@ -258,6 +259,20 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="已翻减">
+                  <!-- <el-input
+                    v-model="form.DealResult"
+                    size="small"
+                  /> -->
+                  <el-select
+                    v-model="form.DealResult"
+                    clearable
+                  >
+                    <el-option label="OFF" value="OFF" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </div>
@@ -345,12 +360,12 @@ export default {
           label: '特殊行李类型'
         },
         {
-          prop: '删除',
-          label: 'deleted'
+          prop: 'deleted',
+          label: '删除'
         },
         {
-          prop: '激活',
-          label: 'activated'
+          prop: 'activated',
+          label: '激活'
         },
         {
           prop: 'BagWeight',
@@ -390,7 +405,8 @@ export default {
         pnr: '',
         check: '',
         transferArrival: '',
-        transferDeparture: ''
+        transferDeparture: '',
+        DealResult: ''
       },
       baggageTypeList: [],
       dataContent: [],
@@ -615,7 +631,8 @@ export default {
         pnr,
         check,
         transferArrival,
-        transferDeparture
+        transferDeparture,
+        DealResult
       } = this.form
       if (time && time.length) {
         this.dataContent.push(time[0])
@@ -632,7 +649,8 @@ export default {
           pnr === '' &&
           check === '' &&
           transferArrival === '' &&
-          transferDeparture === ''
+          transferDeparture === '' &&
+          DealResult === ''
         ) {
           this.$message.error('请先输入查询信息')
         } else {
@@ -648,7 +666,8 @@ export default {
             check,
             transferArrival,
             transferDeparture,
-            U_Device_ID
+            U_Device_ID,
+            DealResult
           )
           this.statItemsQueryByStatMain(this.dataContent)
           this.gjFlag = false
@@ -793,6 +812,9 @@ export default {
     }
   }
 }
+::v-deep .advanced-search .el-input .el-input__suffix {
+  top: -30%;
+}
 .advance__table {
   width: 100%;
   ::v-deep .table {

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

@@ -1,14 +1,14 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 09:37:33
+ * @LastEditTime: 2022-05-13 13:50:30
  * @LastEditors: your name
- * @Description: 离港01
+ * @Description: 进港01
 -->
 <template>
-  <div class="departure-one">
+  <div class="arrival-one">
     <!--功能区-表单-->
-    <div class="departure-form">
+    <div class="arrival-form">
       <el-form
         ref="form"
         :inline="true"
@@ -151,7 +151,7 @@
     <!--表格-->
     <div
       v-loading="loading"
-      class="departure-table"
+      class="arrival-table"
       element-loading-text="拼命加载中"
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -179,7 +179,11 @@
           :filter-method="
             tableDataFilters[item.statCode] && filterHandler
           "
-        />
+        >
+          <template slot="header">
+            <el-tooltip :content="item.statName" placement="top"><span>{{ item.statName }}</span></el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
@@ -234,13 +238,13 @@ export default {
   mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
           statCode: 'FlightNO',
           statName: '航班号',
-          width: 100
+          width: 80
         },
         {
           statCode: 'FlightDate',
@@ -282,11 +286,11 @@ export default {
         },
         {
           statCode: 'numberOfDestinationArrivals',
-          statName: '到达'
+          statName: '中转到达'
         },
         {
           statCode: 'endPointNotReached',
-          statName: '未到达'
+          statName: '中转未到达'
         },
         {
           statCode: 'specialQuantity',
@@ -306,11 +310,11 @@ export default {
         },
         {
           statCode: 'terminateArrivalQuantity',
-          statName: '到达'
+          statName: '终点到达'
         },
         {
           statCode: 'terminateUnreachedQuantity',
-          statName: '未到达'
+          statName: '终点未到达'
         },
         {
           statCode: 'quantityShipped',
@@ -483,10 +487,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
@@ -499,7 +503,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.departure-form {
+.arrival-form {
   padding-top: 11px;
   padding-left: 5px;
   ::v-deep .form {
@@ -623,7 +627,7 @@ export default {
     margin-right: 0;
   }
 }
-.departure-table {
+.arrival-table {
   width: 100%;
   ::v-deep .table {
     width: 100%;

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 09:37:48
+ * @LastEditTime: 2022-05-13 14:29:51
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -179,8 +179,11 @@
           :width="item.width"
           :filters="tableDataFilters[item.statCode]"
           :filter-method="tableDataFilters[item.statCode] && filterHandler"
-        />
-
+        >
+          <template slot="header">
+            <el-tooltip :content="item.statName" placement="top"><span>{{ item.statName }}</span></el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
@@ -235,7 +238,7 @@ export default {
   mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
@@ -482,10 +485,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 11:47:31
+ * @LastEditTime: 2022-05-13 16:31:41
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -214,7 +214,11 @@
             :prop="p.statCode"
             :label="p.statName"
             :formatter="tableFormat"
-          />
+          >
+            <template slot="header">
+              <el-tooltip :content="p.statName" placement="top"><span>{{ p.statName }}</span></el-tooltip>
+            </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
     </div>
@@ -279,7 +283,7 @@ export default {
         label: 'outAicompanyCode2'
       },
 
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
@@ -424,7 +428,7 @@ export default {
   // },
   methods: {
     cellClass(row, column, rowIndex, columnIndex) {
-      if (row.column.property == 'FlightNO' || row.column.property == 'PreFlightNO') {
+      if (['FlightNO', 'PreFlightNO', 'outTransferBaggageCount'].includes(row.column.property)) {
         return 'clickCell'
       }
     },
@@ -443,8 +447,8 @@ export default {
           this.$router.push({
             path: '/advance',
             query: {
-              FlightNO: row.FlightNO,
-              transferDeparture: row.TransferFlightNO,
+              FlightNO: row.PreFlightNO,
+              transferDeparture: row.FlightNO,
               startDate: row.FlightDate,
               endDate: row.FlightDate
             }
@@ -630,7 +634,7 @@ export default {
       })
       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 => {
@@ -659,10 +663,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
@@ -691,9 +695,7 @@ export default {
           'StandForDepartrue',
           'outTransferBaggageCount',
           'outTransferredBaggageCount',
-          'timeDifference',
-          'inTransferBaggageCount',
-          'inTransferredBaggageCount'
+          'timeDifference'
         ].includes(column['property'])
       ) {
         const _row = this.spanArr[rowIndex]
@@ -705,7 +707,7 @@ export default {
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      for (let i = 0; i < 5; i++) {
+      for (let i = 0; i < 9; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
@@ -724,7 +726,7 @@ export default {
       //     return [0, 0];
       //   }
       // } else if (columnIndex == 1) {
-      //   // 第二列的大于3行的清除，避免影响样式
+      //   // 第二列的大于3行的清除，避免影响样式
 
       //   if (rowIndex >= 3) {
       //     return [0, 0];

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 11:42:10
+ * @LastEditTime: 2022-05-13 16:30:13
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -228,7 +228,11 @@
             :prop="p.statCode"
             :label="p.statName"
             :formatter="tableFormat"
-          />
+          >
+            <template slot="header">
+              <el-tooltip :content="p.statName" placement="top"><span>{{ p.statName }}</span></el-tooltip>
+            </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
     </div>
@@ -292,7 +296,7 @@ export default {
         value: 'outAicompanyCode2',
         label: 'outAicompanyCode2'
       },
-      orderNum: ['0', '0', '0', '0'], // 默认总数
+      orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       // 初始表头
       tableCols: [
         {
@@ -428,7 +432,7 @@ export default {
   },
   methods: {
     cellClass(row, column, rowIndex, columnIndex) {
-      if (row.column.property == 'FlightNO' || row.column.property == 'PreFlightNO') {
+      if (['FlightNO', 'PreFlightNO', 'inTransferBaggageCount'].includes(row.column.property)) {
         return 'clickCell'
       }
     },
@@ -634,7 +638,7 @@ export default {
       })
       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 => {
@@ -663,10 +667,10 @@ export default {
 
     toOrderNum(num) {
       num = num.toString()
-      if (num.length < 4) {
+      if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
         this.toOrderNum(num) // 递归添加"0"补位
-      } else if (num.length === 4) {
+      } else if (num.length >= 6) {
         this.orderNum = num.split('') // 将其便变成数据，渲染至滚动数组
       } else {
         // 订单总量数字超过八位显示异常
@@ -684,11 +688,11 @@ export default {
           'LandingBuild',
           'Carousel',
           'StandForLanding',
+          'outTransferBaggageCount',
+          'outTransferredBaggageCount',
           'positionDistribution',
           'expect_load',
-          'loadflight',
-          'outTransferBaggageCount',
-          'outTransferredBaggageCount'
+          'loadflight'
         ].includes(column['property'])
       ) {
         const _row = this.spanArr[rowIndex]
@@ -700,7 +704,7 @@ export default {
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      for (let i = 0; i < 7; i++) {
+      for (let i = 0; i < 9; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
           const _col = _row > 0 ? 1 : 0

src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-07 16:01:26
+ * @LastEditTime: 2022-05-13 15:45:14
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -79,7 +79,10 @@ export default {
           case 'PlanDepartureTime':
           case 'PrePlanLandingTime':
           case 'TransferFlightPlanDepartureTime':
-            return cellValue.split('T')[1].split(':').slice(0, 2).join(':')
+          case 'ActualDepartureTime':
+          case 'ActualLandingTime':
+            // return cellValue.split('T')[1].split(':').slice(0, 2).join(':')
+            return cellValue.replace('T', ' ')
           default:
             return cellValue
         }