Merge branch 'et86-black' into 'uat'

Et86 black



See merge request !2

@@ -439,7 +439,7 @@
                     type="primary"
                     type="primary"
                     size="small"
                     size="small"
                     :disabled="pageName"
                     :disabled="pageName"
-                    @click="addRouteRule(item, index)"
+                    @click="addRouteRule(index)"
                     >新增规则</el-button
                     >新增规则</el-button
                   >
                   >
                 </el-empty>
                 </el-empty>
@@ -607,8 +607,8 @@ export default {
       this.$emit("subCategory", arr);
       this.$emit("subCategory", arr);
     },
     },
     // 新增规则
     // 新增规则
-    addRouteRule(item, index) {
-      this.$emit("addRlue", item, index);
+    addRouteRule(index) {
+      this.$emit("addRlue", index);
     },
     },
     // 保存
     // 保存
     saveSubmit(item, index) {
     saveSubmit(item, index) {

@@ -122,6 +122,8 @@ export default {
           queryParmas: function () {
           queryParmas: function () {
             // White Tail
             // White Tail
             if (parmas.flightKindName == "White Tail") {
             if (parmas.flightKindName == "White Tail") {
+               this.dateParmas.flightType = "WT";
+               this.noDateParmas.flightType = "WT";
               _this.dateLevelData({
               _this.dateLevelData({
                 dateParmas: this.dateParmas,
                 dateParmas: this.dateParmas,
                 noDateParmas: this.noDateParmas,
                 noDateParmas: this.noDateParmas,

@@ -1437,17 +1437,13 @@ export default {
     /** 提交按钮 */
     /** 提交按钮 */
     submitForm: function () {
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
       this.$refs["form"].validate((valid) => {
-        if (this.form.route == undefined) {
+        if (this.form.route == undefined || this.form.route.length == 0) {
           this.routeError = true;
           this.routeError = true;
           return;
           return;
         }
         }
         if (this.form.route.length || this.form.route !== undefined) {
         if (this.form.route.length || this.form.route !== undefined) {
           this.routeError = false;
           this.routeError = false;
         }
         }
-        if (this.form.route.length == 0) {
-          this.routeError = true;
-          return;
-        }
         if (valid) {
         if (valid) {
           let formdata = JSON.parse(JSON.stringify(this.form));
           let formdata = JSON.parse(JSON.stringify(this.form));
           //高价百分比和低价百分比和不可以大于100
           //高价百分比和低价百分比和不可以大于100

@@ -630,7 +630,7 @@ export default {
         .catch(() => {});
         .catch(() => {});
     },
     },
     // 航线查询
     // 航线查询
-    getQueryRouteByFltNo(item) {
+    getQueryRouteByFltNo(item, curRow) {
       this.tableAttr.tableLoading = true;
       this.tableAttr.tableLoading = true;
       this.tableData[this.currentIndex].flightRoute;
       this.tableData[this.currentIndex].flightRoute;
       queryRouteByFltNo(item)
       queryRouteByFltNo(item)
@@ -654,7 +654,9 @@ export default {
               this.tableData[this.currentIndex].flightRoute = "";
               this.tableData[this.currentIndex].flightRoute = "";
             }
             }
           }
           }
+          if (!curRow) {
             this.tableData[this.currentIndex].flightRoute = "";
             this.tableData[this.currentIndex].flightRoute = "";
+          }
         })
         })
         .catch(() => {});
         .catch(() => {});
     },
     },
@@ -692,7 +694,7 @@ export default {
       };
       };
       // 航班号输入框失焦时判断有没有航班号，并且航班号是不是发生了变化调用航线查询
       // 航班号输入框失焦时判断有没有航班号，并且航班号是不是发生了变化调用航线查询
       if (params.fltNo && params.fltNo !== this.currentFlightNo) {
       if (params.fltNo && params.fltNo !== this.currentFlightNo) {
-        this.getQueryRouteByFltNo(params); // 航线查询
+        this.getQueryRouteByFltNo(params, ""); // 航线查询
       }
       }
       // 航班号为空时
       // 航班号为空时
       if (params.fltNo.length == 0) {
       if (params.fltNo.length == 0) {
@@ -710,7 +712,7 @@ export default {
       // 出现下拉框时触发
       // 出现下拉框时触发
       if (e) {
       if (e) {
         // 航线查询
         // 航线查询
-        this.getQueryRouteByFltNo(params);
+        this.getQueryRouteByFltNo(params, row.flightRoute);
       }
       }
     },
     },
     // 添加ET86配舱航班顺位
     // 添加ET86配舱航班顺位

@@ -13,7 +13,7 @@
                     </el-col>
                     </el-col>
                     <el-col :span="12">
                     <el-col :span="12">
                         <el-form-item label="航班号" prop="flightNo">
                         <el-form-item label="航班号" prop="flightNo">
-                            <el-input class="formItem" ref="flightNoFormItem" v-focus v-model="formData.flightNo"
+                            <el-input class="formItem" ref="flightNoFormItem" v-model="formData.flightNo"
                                 maxlength="20" placeholder="请输入航班号" @change="getRoute" :disabled="disabled">
                                 maxlength="20" placeholder="请输入航班号" @change="getRoute" :disabled="disabled">
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
@@ -31,7 +31,7 @@
                         <el-form-item label="航线" prop="flightRoute">
                         <el-form-item label="航线" prop="flightRoute">
                             <el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置"
                             <el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置"
                                 :loading="routeLoading" :disabled="routeList.length == 0 || disabled" @change="routeChange">
                                 :loading="routeLoading" :disabled="routeList.length == 0 || disabled" @change="routeChange">
-                                <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route"
+                                <el-option v-for="item in routeList" :label="item.route" :value="item.route"
                                     :key="item.id">
                                     :key="item.id">
                                     <Tooltips :content="item.route" :refName="item.route"></Tooltips>
                                     <Tooltips :content="item.route" :refName="item.route"></Tooltips>
                                 </el-option>
                                 </el-option>