Browse Source

航站视图-航站选项排序,高级查询-特殊行李类型下拉选项

zhongxiaoyu 2 years ago
parent
commit
af005f3c23

+ 3 - 2
src/api/dataIntegration.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-04-13 14:35:17
- * @LastEditTime: 2022-05-11 16:56:23
+ * @LastEditTime: 2022-05-13 09:26:03
  * @LastEditors: your name
  * @Description: 数据整合接口
  * have a nice day!
@@ -72,7 +72,8 @@ export const queryMap = {
   transferOutBaggage: 48,
   flightInfo: 49,
   baggageTrackByID: 61,
-  message: 75
+  message: 75,
+  baggageType: 86
 }
 
 export async function myQuery(id, ...dataContent) {

+ 21 - 3
src/views/advancedQuery/views/advancedHome.vue

@@ -192,10 +192,17 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="特殊行李类型">
-                  <el-input
+                  <el-select
                     v-model="form.type"
-                    size="small"
-                  />
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in baggageTypeList"
+                      :key="item.ID"
+                      :label="item.TypeName"
+                      :value="item.TypeCode"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -382,6 +389,7 @@ export default {
         transferArrival: '',
         transferDeparture: ''
       },
+      baggageTypeList: [],
       dataContent: [],
       rules: {
         // 机器信息表单验证
@@ -417,6 +425,7 @@ export default {
     // this.statItemsQueryByStatMain(dataContent);
   },
   mounted() {
+    this.baggageTypeQuery()
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix i').remove()
     document.querySelector('.interfaceLog_head_time_start .el-input__prefix').innerHTML = '开始:'
     document.querySelector('.interfaceLog_head_time_end .el-input__prefix i').remove()
@@ -690,6 +699,15 @@ export default {
         console.log('出错了', error)
       }
     },
+    // 特殊行李类型下拉选项查询
+    async baggageTypeQuery() {
+      try {
+        const result = await myQuery(queryMap.baggageType)
+        this.baggageTypeList = result
+      } catch (error) {
+        console.log('出错了', error)
+      }
+    },
     // 简单查询 废弃
     // async sempleQueryByStatMain(dataContent) {
     //   try {

+ 6 - 3
src/views/baggageManagement/components/arrival/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-12 17:36:10
+ * @LastEditTime: 2022-05-13 09:37:33
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -369,7 +369,7 @@ export default {
           dataContent: []
         })
         if (Number(res.code) === 0) {
-          this.AirportList = res.returnData
+          this.AirportList = this._.orderBy(res.returnData, o => o.PlanLandingApt)
           this.formData.currentAirport = 'PEK'
           this.getTableData()
         } else {
@@ -409,6 +409,9 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
+      if (!this.formData.currentAirport) {
+        return
+      }
       const arr = [this.formData.currentAirport, this.formData.startDate, this.formData.endDate]
       try {
         const res = await getQuery({
@@ -451,7 +454,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 => {

+ 6 - 3
src/views/baggageManagement/components/departure/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-12 17:35:52
+ * @LastEditTime: 2022-05-13 09:37:48
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -368,7 +368,7 @@ export default {
           dataContent: []
         })
         if (Number(res.code) === 0) {
-          this.AirportList = res.returnData
+          this.AirportList = this._.orderBy(res.returnData, o => o.PlanDepartureApt)
           this.formData.currentAirport = 'PEK'
           this.getTableData()
         } else {
@@ -408,6 +408,9 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
+      if (!this.formData.currentAirport) {
+        return
+      }
       const arr = [this.formData.currentAirport, this.formData.startDate, this.formData.endDate]
       try {
         const res = await getQuery({
@@ -450,7 +453,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 => {