Merge branch 'et86' into uat

@@ -125,14 +125,18 @@ export default {
                 (item) => item.isEtesRoute == "N"
                 (item) => item.isEtesRoute == "N"
               ); // 过滤ET86航线
               ); // 过滤ET86航线
               const routes = [];
               const routes = [];
-              isEtesRoute.map((item) => {
-                routes.push({ config: false, route: item.route });
-              });
+              if (isEtesRoute.length) {
+                isEtesRoute.map((item) => {
+                  routes.push({ config: false, route: item.route });
+                });
+              } else {
+                this.msgWarning("暂无航线");
+              }
               this.routeList = isEtesRoute;
               this.routeList = isEtesRoute;
               this.routesInfo = routes;
               this.routesInfo = routes;
             } else {
             } else {
               this.routeList = [];
               this.routeList = [];
-              this.msgError("暂无航线");
+              this.msgWarning("暂无航线");
             }
             }
           }
           }
         })
         })

@@ -231,7 +231,7 @@ export default {
           flightDate: ruleDate,
           flightDate: ruleDate,
           purposeOfFlightNo: purposeOfFlightNo,
           purposeOfFlightNo: purposeOfFlightNo,
           flightRouteListStr: flightRoute,
           flightRouteListStr: flightRoute,
-          status: status,
+          status: status == "1" ? "" : status == "3" ? status : "",
           pageName: "flightAllocConfig",
           pageName: "flightAllocConfig",
           dataStatus: name,
           dataStatus: name,
           querySpecifyData: this.queryParams.querySpecifyData,
           querySpecifyData: this.queryParams.querySpecifyData,

@@ -82,14 +82,14 @@ export default {
             flightDate: "",
             flightDate: "",
             flightRoute: "",
             flightRoute: "",
             purposeOfFlightNo: parmas.purposeOfFlightNo,
             purposeOfFlightNo: parmas.purposeOfFlightNo,
-            status: "",
+            status: parmas.status,
           },
           },
           dateParmas: {
           dateParmas: {
             flightDate: parmas.flightDate,
             flightDate: parmas.flightDate,
             flightRoute: "",
             flightRoute: "",
             flightRouteListStr: "",
             flightRouteListStr: "",
             purposeOfFlightNo: parmas.purposeOfFlightNo,
             purposeOfFlightNo: parmas.purposeOfFlightNo,
-            status: "",
+            status: parmas.status,
           },
           },
           queryParmas: function () {
           queryParmas: function () {
             // 非日期级别
             // 非日期级别

@@ -358,7 +358,7 @@
                 </div>
                 </div>
               </template>
               </template>
               <el-select
               <el-select
-                v-if="routeMultiple"
+                v-show="routeMultiple == true"
                 ref="routeSelect"
                 ref="routeSelect"
                 class="wid80"
                 class="wid80"
                 v-model="form.route"
                 v-model="form.route"
@@ -389,7 +389,7 @@
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
               <el-select
               <el-select
-                v-if="routeMultiple == false"
+                v-show="routeMultiple == false"
                 ref="routeSelect"
                 ref="routeSelect"
                 class="wid80"
                 class="wid80"
                 v-model="form.route"
                 v-model="form.route"
@@ -1005,7 +1005,7 @@ export default {
             this.form.route = "";
             this.form.route = "";
           } else if (item.chineseName.indexOf("Purple") >= 0) {
           } else if (item.chineseName.indexOf("Purple") >= 0) {
             this.routeMultiple = true;
             this.routeMultiple = true;
-            this.form.route = [];
+            this.$set(this.form, "route", []);
           }
           }
           this.routeError = true;
           this.routeError = true;
         }
         }

@@ -258,11 +258,13 @@ export default {
           }
           }
           findFlightRoute(obj).then(res => {
           findFlightRoute(obj).then(res => {
             if (res.code === 200) {
             if (res.code === 200) {
-              res.data[0].route.indexOf(';') <= 0 ?
+              if(res.data.length){
+                res.data[0].route.indexOf(';') <= 0 ?
                 this.routeList = res.data :
                 this.routeList = res.data :
                 res.data[0].route.split(';').forEach(item => {
                 res.data[0].route.split(';').forEach(item => {
                   this.routeList.push({ id: res.data[0].id, route: item })
                   this.routeList.push({ id: res.data[0].id, route: item })
                 })
                 })
+              }
             } else {
             } else {
               this.msgWarning(res.msg)
               this.msgWarning(res.msg)
             }
             }