Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
5afd9811 2 parents 4e44e829 f8b6f352

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

Inline Side-by-side
Showing 3 changed files with 30 additions and 4 deletions
...@@ -319,3 +319,28 @@ body { ...@@ -319,3 +319,28 @@ body {
319 .btn-mb-4 { 319 .btn-mb-4 {
320 margin-bottom: 4px; 320 margin-bottom: 4px;
321 } 321 }
322 +
323 +textarea::-webkit-input-placeholder {
324 + /* WebKit browsers */
325 + color: #C0C4CC !important;
326 + font-size: 13px !important;
327 + font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
328 + }
329 + textarea:-moz-placeholder {
330 + /* Mozilla Firefox 4 to 18 */
331 + color: #c0c4cc !important;
332 + font-size: 13px !important;
333 + font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
334 + }
335 + textarea::-moz-placeholder {
336 + /* Mozilla Firefox 19+ */
337 + color: #c0c4cc !important;
338 + font-size: 13px !important;
339 + font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
340 + }
341 + textarea::-ms-input-placeholder {
342 + /* Internet Explorer 10+ */
343 + color: #c0c4cc !important;
344 + font-size: 13px !important;
345 + font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
346 + }
......
...@@ -1023,10 +1023,10 @@ export default { ...@@ -1023,10 +1023,10 @@ export default {
1023 const { code, data } = result; 1023 const { code, data } = result;
1024 if (code == 200) { 1024 if (code == 200) {
1025 let newRoute = JSON.parse(JSON.stringify(this.routeList.concat(data.routeList))) 1025 let newRoute = JSON.parse(JSON.stringify(this.routeList.concat(data.routeList)))
1026 - const result = newRoute.filter((item, index, self) => { 1026 + const resRoute = newRoute.filter((item, index, self) => {
1027 return self.findIndex(t => JSON.stringify(t) === JSON.stringify(item)) === index; 1027 return self.findIndex(t => JSON.stringify(t) === JSON.stringify(item)) === index;
1028 }); 1028 });
1029 - this.routeList = Array.from(new Set(result)); 1029 + this.routeList = Array.from(new Set(resRoute));
1030 if (data.routeList.length) { 1030 if (data.routeList.length) {
1031 this.routeList.forEach(route => { 1031 this.routeList.forEach(route => {
1032 let routesStatus = 1 1032 let routesStatus = 1
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules" 45 <el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules"
46 @submit.native.prevent> 46 @submit.native.prevent>
47 <el-form-item label="航班号" prop="addFlitNo"> 47 <el-form-item label="航班号" prop="addFlitNo">
48 - <el-input type="textarea" v-model="fltNo" :rows="7" maxlength="255" show-word-limit placeholder="请输入航班号"> 48 + <el-input type="textarea" v-model="newPre.addFlitNo" :rows="7" maxlength="255" show-word-limit placeholder="请输入航班号，用;分隔">
49 </el-input> 49 </el-input>
50 </el-form-item> 50 </el-form-item>
51 </el-form> 51 </el-form>
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
89 addFlitNo: '', 89 addFlitNo: '',
90 },//新增航班 90 },//新增航班
91 rules: { 91 rules: {
92 - fltNo: [ 92 + addFlitNo: [
93 { 93 {
94 required: true, 94 required: true,
95 message: "航班号不能为空", 95 message: "航班号不能为空",
...@@ -199,6 +199,7 @@ export default { ...@@ -199,6 +199,7 @@ export default {
199 close() { 199 close() {
200 this.dialogVisible = false 200 this.dialogVisible = false
201 this.newPre.addFlitNo = '' 201 this.newPre.addFlitNo = ''
202 + this.$refs.addForm.clearValidate()
202 }, 203 },
203 //翻页 204 //翻页
204 currentChange(val) { 205 currentChange(val) {
......