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

src/styles/index.scss

@@ -552,3 +552,15 @@ li {
   font-size: 12px;
   color: #101116;
 }
+
+// 表格列筛选弹框
+.dialog-check-cols .el-tree {
+  &.has-children .el-tree-node > .el-tree-node__children {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  &.no-children {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}

src/views/advancedQuery/views/advancedHome.vue

@@ -49,10 +49,6 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
       class="advance__table"
     >
-      <!-- <el-table ref="table" max-height="100%" show-summary class="table" :data="tableData" border stripe height="calc(100vh - 155px)" style="width: 100%">
-        <el-table-column v-for="(item, index) in tableColsCopy" :prop="item.statCode" :label="item.statName" :key="index">
-        </el-table-column>
-      </el-table> -->
       <el-table
         ref="table"
         max-height="100%"
@@ -66,17 +62,19 @@
         :summary-method="summaryRow(tableData.length)"
       >
         <el-table-column
-          prop="index"
-          label="序号"
-          :width="60"
-        />
-        <el-table-column
-          prop="FlightNO"
-          label="航班号"
-          :filters="tableFilters.FlightNO"
-          :filter-method="filterHandler"
+          v-for="item in tableColsCopy"
+          :key="item.index"
+          :prop="item.prop"
+          :label="item.name"
+          :width="item.width"
+          :align="item.align || 'center'"
+          :filters="tableFilters[item.prop]"
+          :filter-method="tableFilters[item.prop] && filterHandler"
         >
-          <template slot-scope="scope">
+          <template
+            v-if="item.prop === 'FlightNO'"
+            slot-scope="scope"
+          >
             <el-button
               size="mini"
               style="text-overflow: ellipsis;
@@ -85,117 +83,40 @@
               @click="flightClickHandler(scope.row)"
             >{{ scope.row.FlightNO }}</el-button>
           </template>
-        </el-table-column>
-        <el-table-column
-          prop="FlightDate"
-          label="航班日期"
-          :filters="tableFilters.FlightDate"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="SourceAirport"
-          label="起飞站"
-          :filters="tableFilters.SourceAirport"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="TargetAirport"
-          label="目的地"
-          :filters="tableFilters.TargetAirport"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="PassengerNameUpcase"
-          label="旅客姓名"
-          :filters="tableFilters.PassengerNameUpcase"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="BagSN"
-          label="行李牌号"
-          :width="130"
-        >
-          <template slot-scope="scope">
+          <template
+            v-else-if="item.prop === 'BagSN'"
+            slot-scope="scope"
+          >
             <el-button
               size="mini"
               @click="baggageClickHandler(scope.row)"
             >{{ scope.row.BagSN }}</el-button>
           </template>
+          <template v-else>1</template>
         </el-table-column>
-        <el-table-column
-          prop="SpecialType"
-          label="特殊行李类型"
-          :width="130"
-          :filters="tableFilters.SpecialType"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="checkIn"
-          label="值机"
-          :filters="tableFilters.checkIn"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          label="删除"
-          prop="deleted"
-          :filters="tableFilters.deleted"
-          :filter-method="filterHandler"
-        >
-          <!-- <template slot-scope="scope">
-            <div>{{ scope.row.deleted == "DEL" ? 1 : 0 }}</div>
-          </template> -->
-        </el-table-column>
-        <el-table-column
-          label="激活"
-          prop="activated"
-          :filters="tableFilters.activated"
-          :filter-method="filterHandler"
-        >
-          <!-- <template slot-scope="scope">
-            <div>{{ scope.row.activated == "I" ? 0 : 1 }}</div>
-          </template> -->
-        </el-table-column>
-        <el-table-column
-          prop="BagWeight"
-          label="重量"
-        />
-        <el-table-column
-          prop="latestStatus"
-          label="最新状态"
-          :filters="tableFilters.latestStatus"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="bagLocation"
-          label="最新位置"
-          :filters="tableFilters.bagLocation"
-          :filter-method="filterHandler"
-        />
-        <el-table-column
-          prop="TransferFlightNO"
-          label="中转进航班"
-          :filters="tableFilters.TransferFlightNO"
-          :filter-method="filterHandler"
-        />
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog :flag="rowFlag">
-      <div class="rowDialog">
+    <Dialog
+      :flag="dialogFlag"
+      class="dialog-check-cols"
+    >
+      <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-checkbox-group v-model="checkList">
-            <el-row :gutter="20">
-              <el-col
-                v-for="(item, index) in tableCols"
-                :key="index"
-                class="ck"
-                :span="6"
-              >
-                <el-checkbox :label="item">{{ item.statName }}</el-checkbox>
-              </el-col>
-            </el-row>
-          </el-checkbox-group>
+          <el-tree
+            :data="tableCols"
+            :class="colsCheckClass"
+            show-checkbox
+            node-key="index"
+            :default-expand-all="true"
+            :props="{
+              label: 'name',
+              children: 'children'
+            }"
+            :default-checked-keys="checkedKeysTemp"
+            @check="handleCheck"
+          />
         </div>
         <div class="foot right t30">
           <el-button
@@ -206,7 +127,7 @@
           >确定</el-button>
           <el-button
             size="medium"
-            @click="close"
+            @click="hide"
           >取消</el-button>
         </div>
       </div>
@@ -356,9 +277,11 @@ import Search from '@/layout/components/Search'
 import Dialog from '@/layout/components/Dialog'
 import { advancedInquiry, getQuery } from '@/api/flight'
 import { parseTime } from '@/utils/index'
+import tableColsMixin from '../mixins/tableCols'
 export default {
   name: 'Advance',
   components: { Search, Dialog },
+  mixins: [tableColsMixin],
   data() {
     return {
       loading: false,
@@ -382,9 +305,24 @@ export default {
         //   TransferFlightNO: ''
         // }
       ],
-      tableColsCopy: [],
       checkList: [],
-      tableCols: [],
+      tableCols: [
+        { name: '序号', prop: 'index', width: 60 },
+        { name: '航班号', prop: 'FlightNO' },
+        { name: '航班日期', prop: 'FlightDate' },
+        { name: '起飞站', prop: 'SourceAirport' },
+        { name: '目的地', prop: 'TargetAirport' },
+        { name: '旅客姓名', prop: 'PassengerNameUpcase' },
+        { name: '行李牌号', prop: 'BagSN', width: 130 },
+        { name: '特殊行李类型', prop: 'SpecialType', width: 130 },
+        { name: '值机', prop: 'checkIn' },
+        { name: '删除', prop: 'deleted' },
+        { name: '激活', prop: 'activated' },
+        { name: '重量', prop: 'BagWeight' },
+        { name: '最新状态', prop: 'latestStatus' },
+        { name: '最新位置', prop: 'bagLocation' },
+        { name: '中转进航班', prop: 'TransferFlightNO' }
+      ],
       timeStart: parseTime(new Date(), '{y}-{m}-{d}'),
       timeEnd: parseTime(new Date(), '{y}-{m}-{d}'),
       form: {
@@ -449,46 +387,40 @@ export default {
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix').innerHTML = '开始：'
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix i').remove()
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix').innerHTML = '结束：'
-    const { FlightNO, FlightDate,name,grade,startDate,endDate,station } = this.$route.query
+    const { FlightNO, FlightDate, name, grade, startDate, endDate, station } = this.$route.query
     if (FlightNO && FlightDate) {
       this.$router.replace(this.$route.path)
       const parsedTime = parseTime(new Date(FlightDate), '{y}-{m}-{d}')
       this.timeStart = this.timeEnd = parsedTime
       this.$refs['search'].setSearch(FlightNO)
     }
-    if(name&&startDate&&endDate&&station){
-      this.timeStart = startDate;
-      this.timeEnd = endDate;
-      this.form['time'] = [startDate,endDate];
-      this.form['name'] = name;
+    if (name && startDate && endDate && station) {
+      this.timeStart = startDate
+      this.timeEnd = endDate
+      this.form['time'] = [startDate, endDate]
+      this.form['name'] = name
       this.form['station'] = station
       this.onCheckGj()
     }
 
-    if(grade&&startDate&&endDate&&station){
-      this.timeStart = startDate;
-      this.timeEnd = endDate;
-      this.form['time'] = [startDate,endDate];
-      this.form['grade'] = grade;
+    if (grade && startDate && endDate && station) {
+      this.timeStart = startDate
+      this.timeEnd = endDate
+      this.form['time'] = [startDate, endDate]
+      this.form['grade'] = grade
       this.form['station'] = station
       this.onCheckGj()
     }
 
-    if(FlightNO&&startDate&&endDate&&station){
-      this.timeStart = startDate;
-      this.timeEnd = endDate;
-      this.form['time'] = [startDate,endDate];
-      this.form['flightNumber'] = FlightNO;
+    if (FlightNO && startDate && endDate && station) {
+      this.timeStart = startDate
+      this.timeEnd = endDate
+      this.form['time'] = [startDate, endDate]
+      this.form['flightNumber'] = FlightNO
       this.form['station'] = station
       this.onCheckGj()
     }
   },
-  updated() {
-    // table数据更新
-    this.$nextTick(() => {
-      this.$refs.table.doLayout()
-    })
-  },
   methods: {
     // 查询
     getSearchData(val) {
@@ -538,25 +470,6 @@ export default {
     clearSearchData() {
       this.tableData = []
     },
-    // 列设置-确定
-    onCheck() {
-      this.tableColsCopy = _.cloneDeep(this.checkList)
-      const datas = _.sortBy(this.tableColsCopy, o => o.showOrder)
-      this.tableColsCopy = datas
-      this.tableCopy = this.checkList
-      this.rowFlag = false
-    },
-    // 弹框展开
-    show() {
-      this.tableCopy = this.checkList
-      this.rowFlag = true
-    },
-    // 弹框关闭
-    close() {
-      this.rowFlag = false
-      this.checkList = this.tableCopy
-      this.tableColsCopy = _.cloneDeep(this.checkList)
-    },
     // 高级查询-确定
     onCheckGj() {
       // 参数顺序   【航班开始日期，航班结束日期，航班号，航班号，行李牌号，行李牌号，起飞站，起飞站，目的站，目的站，特殊行李类型，特殊 行李类型，旅客姓名大写拼音，旅客姓名大写拼音，pnr,pnr,值机号，值机号】

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-05 17:41:26
+ * @LastEditTime: 2022-05-07 16:59:57
  * @LastEditors: your name
  * @Description: 进港01
 -->
@@ -149,7 +149,8 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-form-item>
-        <el-form-item v-is="['i_columnSettings']">
+        <!-- <el-form-item v-is="['i_columnSettings']"> -->
+        <el-form-item>
           <img
             class="msgImg"
             src="../../../../assets/departure/ic_setting.png"
@@ -511,14 +512,4 @@ export default {
     }
   }
 }
-::v-deep .dialog-check-cols .el-tree {
-  &.has-children .el-tree-node > .el-tree-node__children {
-    display: flex;
-    flex-wrap: wrap;
-  }
-  &.no-children {
-    display: flex;
-    flex-wrap: wrap;
-  }
-}
 </style>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-07 16:04:52
+ * @LastEditTime: 2022-05-07 16:55:50
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -122,7 +122,7 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-form-item>
-          <el-form-item v-is="['i_columnSettings']">
+          <el-form-item>
             <img
               class="msgImg"
               src="../../../../assets/departure/ic_setting.png"
@@ -364,10 +364,9 @@ export default {
     },
     tableRowClassName({ row, rowIndex }) {
       if (row.hasTakenOff == 0) {
-        if(rowIndex == this.leaveCount-1){
+        if (rowIndex == this.leaveCount - 1) {
           return 'bgl-hui redBorder'
-        }
-        else{
+        } else {
           return 'bgl-hui'
         }
       }
@@ -413,7 +412,7 @@ export default {
       this.leaveCount = 0;
       this.baggageCount = 0;
       tableData.forEach(item => {
-        if(item.hasTakenOff == 0){
+        if (item.hasTakenOff == 0) {
           this.leaveCount++
         }
         item['waitfanj'] = item['noCheckInNumber'] - item['unLoad'];
@@ -653,19 +652,4 @@ export default {
     }
   }
 }
-::v-deep .dialog-check-cols .el-tree {
-  &.has-children .el-tree-node > .el-tree-node__children {
-    display: flex;
-    flex-wrap: wrap;
-  }
-  &.no-children {
-    display: flex;
-    flex-wrap: wrap;
-  }
-}
-::v-deep .time-zone .el-dropdown-menu__item {
-  font-family: Helvetica, 'Microsoft YaHei';
-  font-size: 12px;
-  color: #101116;
-}
 </style>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-07 15:57:55
+ * @LastEditTime: 2022-05-07 16:12:48
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -660,16 +660,16 @@ export default {
           return item
         })
         this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
-          item['checkIn'] = `${item['checkIn'] ?? ''}\n${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
+          item['checkIn'] = `${item['checkIn'] ?? ''} ${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
           item['status'] = item['Status'] === 'DEL' ? '删除' : ''
-          item['security'] = `${item['DealInfo'] ?? ''}\n${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
-          item['sorting'] = `${item['sortLocationMark'] ?? ''}\n${
+          item['security'] = `${item['DealInfo'] ?? ''} ${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
+          item['sorting'] = `${item['sortLocationMark'] ?? ''} ${
             item['sortDealTime'] ? item['sortDealTime'].split('T')[1] : ''
           }`
-          item['loading'] = `${item['loadLocationMark'] ?? ''}\n${
+          item['loading'] = `${item['loadLocationMark'] ?? ''} ${
             item['loadDealTime'] ? item['loadDealTime'].split('T')[1] : ''
           }`
-          item['installed'] = `${item['inflLocationMark'] ?? ''}\n${
+          item['installed'] = `${item['inflLocationMark'] ?? ''} ${
             item['inflLoadDealTime'] ? item['inflLoadDealTime'].split('T')[1] : ''
           }`
           item['transitFlag'] = item['preFlightNO'] === 1 ? '是' : '否'