Merge branch 'test' into fix-issues

@@ -134,13 +134,29 @@
         </el-row>
         </el-row>
         <el-row style="margin-bottom:5px">
         <el-row style="margin-bottom:5px">
           <el-col :span="12">
           <el-col :span="12">
-            <el-form-item label="航班路线" prop="route">
-              <el-select class="wid80" v-model="form.route" placeholder="请选择航线">
-                <el-option v-for="item in routeList" :key="item.id" :label="item.route"
-                 :value="item.id">
+            <el-form-item prop="route">
+              <template slot="label">
+                <div style="display:inline-block">航班路线
+                  <el-tooltip class="item" effect="dark" content="输入航班号后获取航线信息。航班种类为Purple Tail时可以进行多选，切换航班种类后需重新选择航线"
+                    placement="top-start">
+                    <span class="el-icon-warning" style="color:#1890ff;font-size:16px"></span>
+                  </el-tooltip>
+                </div>
+              </template>
+              <el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
+                placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading"
+                :multiple='true' :key="routeMultiple">
+                <el-option v-for="item in   routeList" :key="item.id" :label="item.route" :value="item.route">
+                </el-option>
+              </el-select>
+              <el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
+                placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading"
+                :multiple='false' :key="routeMultiple">
+                <el-option v-for="item in   routeList" :key="item.id" :label="item.route" :value="item.route">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
+            <div class="formTips" v-if="title == '修改航班信息'">注意!:移除航线，相对应日期级别航线维度会同时删除</div>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="航班类型" prop="typeId">
             <el-form-item label="航班类型" prop="typeId">
@@ -687,6 +703,9 @@ export default {
       this.formdisabled.typeId = false;
       this.formdisabled.typeId = false;
       //原始重量
       //原始重量
       this.formdisabled.originalWeight = false;
       this.formdisabled.originalWeight = false;
+          this.$nextTick(()=>{
+          this.$refs.form.clearValidate()
+    })
     },
     },
     //计算高低价可配
     //计算高低价可配
     LowHighAvailable() {
     LowHighAvailable() {
@@ -1091,10 +1110,6 @@ export default {
     //航线修改
     //航线修改
     routeChange(val) {
     routeChange(val) {
       this.$forceUpdate()
       this.$forceUpdate()
-      if(val.length){
-        // this.rules.route.required = false
-      }
-      console.log(this.form.route)
     },
     },
     //多选框选中数据
     //多选框选中数据
     tableSelect(val) {
     tableSelect(val) {