Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
hao.wang
77618ebb 2 parents 4d19aca0 641aa218

Merge branch 'et86-black' into 'uat' 

Et86 black



See merge request !2
Inline Side-by-side
Showing 5 changed files with 14 additions and 14 deletions
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
439 type="primary" 439 type="primary"
440 size="small" 440 size="small"
441 :disabled="pageName" 441 :disabled="pageName"
442 - @click="addRouteRule(item, index)" 442 + @click="addRouteRule(index)"
443 >新增规则</el-button 443 >新增规则</el-button
444 > 444 >
445 </el-empty> 445 </el-empty>
...@@ -607,8 +607,8 @@ export default { ...@@ -607,8 +607,8 @@ export default {
607 this.$emit("subCategory", arr); 607 this.$emit("subCategory", arr);
608 }, 608 },
609 // 新增规则 609 // 新增规则
610 - addRouteRule(item, index) { 610 + addRouteRule(index) {
611 - this.$emit("addRlue", item, index); 611 + this.$emit("addRlue", index);
612 }, 612 },
613 // 保存 613 // 保存
614 saveSubmit(item, index) { 614 saveSubmit(item, index) {
......
...@@ -122,6 +122,8 @@ export default { ...@@ -122,6 +122,8 @@ export default {
122 queryParmas: function () { 122 queryParmas: function () {
123 // White Tail 123 // White Tail
124 if (parmas.flightKindName == "White Tail") { 124 if (parmas.flightKindName == "White Tail") {
125 + this.dateParmas.flightType = "WT";
126 + this.noDateParmas.flightType = "WT";
125 _this.dateLevelData({ 127 _this.dateLevelData({
126 dateParmas: this.dateParmas, 128 dateParmas: this.dateParmas,
127 noDateParmas: this.noDateParmas, 129 noDateParmas: this.noDateParmas,
......
...@@ -1437,17 +1437,13 @@ export default { ...@@ -1437,17 +1437,13 @@ export default {
1437 /** 提交按钮 */ 1437 /** 提交按钮 */
1438 submitForm: function () { 1438 submitForm: function () {
1439 this.$refs["form"].validate((valid) => { 1439 this.$refs["form"].validate((valid) => {
1440 - if (this.form.route == undefined) { 1440 + if (this.form.route == undefined || this.form.route.length == 0) {
1441 this.routeError = true; 1441 this.routeError = true;
1442 return; 1442 return;
1443 } 1443 }
1444 if (this.form.route.length || this.form.route !== undefined) { 1444 if (this.form.route.length || this.form.route !== undefined) {
1445 this.routeError = false; 1445 this.routeError = false;
1446 } 1446 }
1447 - if (this.form.route.length == 0) {
1448 - this.routeError = true;
1449 - return;
1450 - }
1451 if (valid) { 1447 if (valid) {
1452 let formdata = JSON.parse(JSON.stringify(this.form)); 1448 let formdata = JSON.parse(JSON.stringify(this.form));
1453 //高价百分比和低价百分比和不可以大于100 1449 //高价百分比和低价百分比和不可以大于100
......
...@@ -630,7 +630,7 @@ export default { ...@@ -630,7 +630,7 @@ export default {
630 .catch(() => {}); 630 .catch(() => {});
631 }, 631 },
632 // 航线查询 632 // 航线查询
633 - getQueryRouteByFltNo(item) { 633 + getQueryRouteByFltNo(item, curRow) {
634 this.tableAttr.tableLoading = true; 634 this.tableAttr.tableLoading = true;
635 this.tableData[this.currentIndex].flightRoute; 635 this.tableData[this.currentIndex].flightRoute;
636 queryRouteByFltNo(item) 636 queryRouteByFltNo(item)
...@@ -654,7 +654,9 @@ export default { ...@@ -654,7 +654,9 @@ export default {
654 this.tableData[this.currentIndex].flightRoute = ""; 654 this.tableData[this.currentIndex].flightRoute = "";
655 } 655 }
656 } 656 }
657 - this.tableData[this.currentIndex].flightRoute = ""; 657 + if (!curRow) {
658 + this.tableData[this.currentIndex].flightRoute = "";
659 + }
658 }) 660 })
659 .catch(() => {}); 661 .catch(() => {});
660 }, 662 },
...@@ -692,7 +694,7 @@ export default { ...@@ -692,7 +694,7 @@ export default {
692 }; 694 };
693 // 航班号输入框失焦时判断有没有航班号，并且航班号是不是发生了变化调用航线查询 695 // 航班号输入框失焦时判断有没有航班号，并且航班号是不是发生了变化调用航线查询
694 if (params.fltNo && params.fltNo !== this.currentFlightNo) { 696 if (params.fltNo && params.fltNo !== this.currentFlightNo) {
695 - this.getQueryRouteByFltNo(params); // 航线查询 697 + this.getQueryRouteByFltNo(params, ""); // 航线查询
696 } 698 }
697 // 航班号为空时 699 // 航班号为空时
698 if (params.fltNo.length == 0) { 700 if (params.fltNo.length == 0) {
...@@ -710,7 +712,7 @@ export default { ...@@ -710,7 +712,7 @@ export default {
710 // 出现下拉框时触发 712 // 出现下拉框时触发
711 if (e) { 713 if (e) {
712 // 航线查询 714 // 航线查询
713 - this.getQueryRouteByFltNo(params); 715 + this.getQueryRouteByFltNo(params, row.flightRoute);
714 } 716 }
715 }, 717 },
716 // 添加ET86配舱航班顺位 718 // 添加ET86配舱航班顺位
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 </el-col> 13 </el-col>
14 <el-col :span="12"> 14 <el-col :span="12">
15 <el-form-item label="航班号" prop="flightNo"> 15 <el-form-item label="航班号" prop="flightNo">
16 - <el-input class="formItem" ref="flightNoFormItem" v-focus v-model="formData.flightNo" 16 + <el-input class="formItem" ref="flightNoFormItem" v-model="formData.flightNo"
17 maxlength="20" placeholder="请输入航班号" @change="getRoute" :disabled="disabled"> 17 maxlength="20" placeholder="请输入航班号" @change="getRoute" :disabled="disabled">
18 </el-input> 18 </el-input>
19 </el-form-item> 19 </el-form-item>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 <el-form-item label="航线" prop="flightRoute"> 31 <el-form-item label="航线" prop="flightRoute">
32 <el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置" 32 <el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置"
33 :loading="routeLoading" :disabled="routeList.length == 0 || disabled" @change="routeChange"> 33 :loading="routeLoading" :disabled="routeList.length == 0 || disabled" @change="routeChange">
34 - <el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route" 34 + <el-option v-for="item in routeList" :label="item.route" :value="item.route"
35 :key="item.id"> 35 :key="item.id">
36 <Tooltips :content="item.route" :refName="item.route"></Tooltips> 36 <Tooltips :content="item.route" :refName="item.route"></Tooltips>
37 </el-option> 37 </el-option>
......