Browse Source

高级查询添加已翻减字段

zhongxiaoyu 2 years ago
parent
commit
f054bae07a

+ 22 - 4
src/views/advancedQuery/views/advancedHome.vue

@@ -258,6 +258,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>
@@ -390,7 +404,8 @@ export default {
         pnr: '',
         check: '',
         transferArrival: '',
-        transferDeparture: ''
+        transferDeparture: '',
+        DealResult: ''
       },
       baggageTypeList: [],
       dataContent: [],
@@ -615,7 +630,8 @@ export default {
         pnr,
         check,
         transferArrival,
-        transferDeparture
+        transferDeparture,
+        DealResult
       } = this.form
       if (time && time.length) {
         this.dataContent.push(time[0])
@@ -632,7 +648,8 @@ export default {
           pnr === '' &&
           check === '' &&
           transferArrival === '' &&
-          transferDeparture === ''
+          transferDeparture === '' &&
+          DealResult === ''
         ) {
           this.$message.error('请先输入查询信息')
         } else {
@@ -648,7 +665,8 @@ export default {
             check,
             transferArrival,
             transferDeparture,
-            U_Device_ID
+            U_Device_ID,
+            DealResult
           )
           this.statItemsQueryByStatMain(this.dataContent)
           this.gjFlag = false

+ 2 - 2
src/views/baggageManagement/components/transferArrival/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-13 15:41:16
+ * @LastEditTime: 2022-05-13 15:42:33
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -726,7 +726,7 @@ export default {
       //     return [0, 0];
       //   }
       // } else if (columnIndex == 1) {
-      //   // 第二列的大于3行的清除,避免影响样式
+      //   // 第二列的大于3行的清除,避免影响样式
 
       //   if (rowIndex >= 3) {
       //     return [0, 0];

+ 5 - 2
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
         }