Merge branch 'test' into et86

@@ -319,3 +319,28 @@ body {
 .btn-mb-4 {
 .btn-mb-4 {
   margin-bottom: 4px;
   margin-bottom: 4px;
 }
 }
+
+textarea::-webkit-input-placeholder {
+    /* WebKit browsers */
+    color: #C0C4CC !important;
+    font-size: 13px !important;
+    font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
+  }
+  textarea:-moz-placeholder {
+    /* Mozilla Firefox 4 to 18 */
+    color: #c0c4cc !important;
+    font-size: 13px !important;
+    font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
+  }
+  textarea::-moz-placeholder {
+    /* Mozilla Firefox 19+ */
+    color: #c0c4cc !important;
+    font-size: 13px !important;
+    font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
+  }
+  textarea::-ms-input-placeholder {
+    /* Internet Explorer 10+ */
+    color: #c0c4cc !important;
+    font-size: 13px !important;
+    font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
+  }

@@ -79,14 +79,22 @@ service.interceptors.response.use(res => {
       type: 'error'
       type: 'error'
     })
     })
     return Promise.reject(new Error(msg))
     return Promise.reject(new Error(msg))
-  } else if (code !== 200 && code !== 201 && code !== 202 && code != 203 && code != 603 && code != 402) {
+  } else if (
+    code !== 200 &&
+    code !== 201 &&
+    code !== 202 &&
+    code != 203 &&
+    code != 300 &&
+    code != 402 &&
+    code != 603
+  ) {
     Message({
     Message({
       message: msg,
       message: msg,
-      type: 'error'
-    })
-    return Promise.reject('error')
+      type: "error",
+    });
+    return Promise.reject("error");
   } else {
   } else {
-    return res.data
+    return res.data;
   }
   }
 },
 },
   error => {
   error => {

@@ -136,7 +136,7 @@
         </el-col>
         </el-col>
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="运单号">
           <el-form-item label="运单号">
-            <el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号（回车分割）" :maxlength="12000"
+            <el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号(回车分割)" :maxlength="12000"
               v-model="formData.waybillNo" clearable></el-input>
               v-model="formData.waybillNo" clearable></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>

@@ -437,6 +437,7 @@ export default {
     cancel() {
     cancel() {
       this.open = false;
       this.open = false;
       this.findSourceFlightRules();
       this.findSourceFlightRules();
+      this.$refs.form.clearValidate();
       //this.reset();
       //this.reset();
     },
     },
     /** 重置按钮操作 */
     /** 重置按钮操作 */

@@ -45,7 +45,7 @@
       <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules"
       <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules"
         @submit.native.prevent>
         @submit.native.prevent>
         <el-form-item label="航班号" prop="addFlitNo">
         <el-form-item label="航班号" prop="addFlitNo">
-          <el-input type="textarea" v-model="fltNo" :rows="7" maxlength="255" show-word-limit placeholder="请输入航班号，用;分隔">
+          <el-input type="textarea" v-model="newPre.addFlitNo" :rows="7" maxlength="255" show-word-limit placeholder="请输入航班号，用;分隔">
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
@@ -89,7 +89,7 @@ export default {
         addFlitNo: '',
         addFlitNo: '',
       },//新增航班
       },//新增航班
       rules: {
       rules: {
-        fltNo: [
+        addFlitNo: [
           {
           {
             required: true,
             required: true,
             message: "航班号不能为空",
             message: "航班号不能为空",
@@ -199,6 +199,7 @@ export default {
     close() {
     close() {
       this.dialogVisible = false
       this.dialogVisible = false
       this.newPre.addFlitNo = ''
       this.newPre.addFlitNo = ''
+      this.$refs.addForm.clearValidate()
     },
     },
     //翻页
     //翻页
     currentChange(val) {
     currentChange(val) {

@@ -180,8 +180,8 @@
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="原始重量（KG）" prop="originalWeight">
             <el-form-item label="原始重量（KG）" prop="originalWeight">
-              <el-input-number class="wid80" @change="LowHighAvailable" :precision="0" placeholder="请输入原始重量（KG）"
-                v-model="form.originalWeight"></el-input-number>
+              <el-input-number class="wid80" @change="LowHighAvailable" :min="0" :precision="0" placeholder="请输入原始重量（KG）"
+                v-model="form.originalWeight" v-input-filter></el-input-number>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -359,7 +359,7 @@ export default {
         route: [
         route: [
           {
           {
             required: true,
             required: true,
-            message: "航班路线不能为空",
+            message: "航班路线不能为空呀",
             trigger: "change",
             trigger: "change",
           },
           },
           // {
           // {
@@ -482,6 +482,29 @@ export default {
       shiftKey: false,
       shiftKey: false,
     };
     };
   },
   },
+    directives: {
+    // 处理加减天数
+    "input-filter": {
+      bind: function (el, binding, { context }) {
+        el.handler = function (event) {
+          if (event.data == "E" || event.data == "e") {
+            // 无理数时
+            event.target.value = "";
+          }
+          if (event.target.value) {
+            if (Number(event.target.value) < 0) {
+              event.target.value = "";
+            }
+            event.target.dispatchEvent(new Event("input"));
+          }
+        };
+        el.addEventListener("input", el.handler);
+      },
+      unbind: function (el) {
+        el.removeEventListener("input", el.handler);
+      },
+    },
+  },
   created() {
   created() {
     //查询条件数据源
     //查询条件数据源
     this.queryParams.fltDateStart = this.nowDate()
     this.queryParams.fltDateStart = this.nowDate()
@@ -615,11 +638,15 @@ export default {
       this.selectOption.flightKindlist.forEach(item => {
       this.selectOption.flightKindlist.forEach(item => {
         if (item.id == val) {
         if (item.id == val) {
           if (item.chineseName.indexOf('White') >= 0) {
           if (item.chineseName.indexOf('White') >= 0) {
-            this.form.route = ''
             this.routeMultiple = false
             this.routeMultiple = false
+            // this.rules.route[0].type = 'string'
+            this.form.route = ''
+            // this.rules.route[0].required = true;
           } else if (item.chineseName.indexOf('Purple') >= 0) {
           } else if (item.chineseName.indexOf('Purple') >= 0) {
-            this.form.route = []
             this.routeMultiple = true
             this.routeMultiple = true
+            // this.rules.route[0].type = 'array'
+            this.form.route = []
+            // this.rules.route[0].required = true;
           }
           }
         }
         }
       })
       })
@@ -1109,6 +1136,11 @@ export default {
     },
     },
     //航线修改
     //航线修改
     routeChange(val) {
     routeChange(val) {
+      if(val.length){
+        this.rules.route[0].required = false;
+      }else{
+        // this.rules.route[0].required = true;
+      }
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
     //多选框选中数据
     //多选框选中数据

@@ -501,7 +501,7 @@ export default {
   directives: {
   directives: {
     // 处理加减天数
     // 处理加减天数
     "input-filter": {
     "input-filter": {
-      bind: function (el, binding) {
+      bind: function (el, binding, { context }) {
         el.handler = function (event) {
         el.handler = function (event) {
           if (event.data == "E" || event.data == "e") {
           if (event.data == "E" || event.data == "e") {
             // 无理数时
             // 无理数时
@@ -510,10 +510,10 @@ export default {
           if (event.target.value) {
           if (event.target.value) {
             if (Number(event.target.value) < -7) {
             if (Number(event.target.value) < -7) {
               event.target.value = "";
               event.target.value = "";
-              this.msgError("加减天数最小不能低于7天");
+              context.msgError("加减天数最小不能低于7天");
             } else if (Number(event.target.value) > 7) {
             } else if (Number(event.target.value) > 7) {
               event.target.value = "";
               event.target.value = "";
-              this.msgError("加减天数最小不能大于7天");
+              context.msgError("加减天数最小不能大于7天");
             } else if (/[\.]/.test(Number(event.target.value))) {
             } else if (/[\.]/.test(Number(event.target.value))) {
               // 浮点数时
               // 浮点数时
               event.target.value = "";
               event.target.value = "";