Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

+import request from '@/utils/request'
+
+// 航班信息维护查询条件
+export function findFltConditionDataApi() {
+  return request({
+    url: '/FlightPreserveController/findFltConditionData',
+    method: 'post'
+
+  })
+}
+// 航班信息维护查询
+export function findAllFltDataApi(data) {
+  return request({
+    url: '/FlightPreserveController/findAllFltData',
+    method: 'post',
+    data: data
+
+  })
+}

@@ -7,6 +7,7 @@ const baseURL = process.env.VUE_APP_BASE_API
 
 // 日期格式化
 export function parseTime(time, pattern) {
+	debugger
 	if (arguments.length === 0 || !time) {
 		return null
 	}

@@ -236,7 +236,7 @@
       },
       /** 查询原航班顺位规则*/
       findSourceFlightRules() {
-        //this.loading = true;
+        this.loading = true;
         if (this.queryParams.pageNum > 1) {
           this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit
         } else {