Merge branch 'et86-black' of http://118.178.128.178/Fedex/imac-vue into et86-black

@@ -319,3 +319,28 @@ body {
 .btn-mb-4 {
   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;
+  }

@@ -1023,10 +1023,10 @@ export default {
                                             const { code, data } = result;
                                             if (code == 200) {
                                                 let newRoute = JSON.parse(JSON.stringify(this.routeList.concat(data.routeList)))
-                                                const result = newRoute.filter((item, index, self) => {
+                                                const resRoute = newRoute.filter((item, index, self) => {
                                                     return self.findIndex(t => JSON.stringify(t) === JSON.stringify(item)) === index;
                                                 });
-                                                this.routeList = Array.from(new Set(result));
+                                                this.routeList = Array.from(new Set(resRoute));
                                                 if (data.routeList.length) {
                                                     this.routeList.forEach(route => {
                                                         let routesStatus = 1

@@ -45,7 +45,7 @@
       <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules"
         @submit.native.prevent>
         <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-form-item>
       </el-form>
@@ -89,7 +89,7 @@ export default {
         addFlitNo: '',
       },//新增航班
       rules: {
-        fltNo: [
+        addFlitNo: [
           {
             required: true,
             message: "航班号不能为空",
@@ -199,6 +199,7 @@ export default {
     close() {
       this.dialogVisible = false
       this.newPre.addFlitNo = ''
+      this.$refs.addForm.clearValidate()
     },
     //翻页
     currentChange(val) {