Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
901ad3f7 1 parent 2c66eb4b

modify

Inline Side-by-side
Showing 2 changed files with 20 additions and 7 deletions
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
139 type="textarea" 139 type="textarea"
140 v-model="item.includeUrsa" 140 v-model="item.includeUrsa"
141 :rows="4" 141 :rows="4"
142 - placeholder="URSA之间用分号分隔，例：F2;F3;P_" 142 + placeholder="URSA之间用分号分隔，例：F1_;F2_;F3_;P_"
143 > 143 >
144 </el-input> 144 </el-input>
145 </el-form-item> 145 </el-form-item>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
151 type="textarea" 151 type="textarea"
152 v-model="item.notIncludeUrsa" 152 v-model="item.notIncludeUrsa"
153 :rows="4" 153 :rows="4"
154 - placeholder="URSA之间用分号分隔，例：F2;F3;P_" 154 + placeholder="URSA之间用分号分隔，例：F1;F2;F3;P"
155 > 155 >
156 </el-input> 156 </el-input>
157 </el-form-item> 157 </el-form-item>
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
17 @click="addBtn" 17 @click="addBtn"
18 >添加</el-button 18 >添加</el-button
19 > 19 >
20 - <span class="ml20" style="color: #ffba00">拖动航班号可调整优先级</span> 20 + <span class="ml20" style="color: #ffba00"
21 + >拖动航班号可调整优先级</span
22 + >
21 </el-col> 23 </el-col>
22 </el-row> 24 </el-row>
23 <yl-table 25 <yl-table
...@@ -93,7 +95,7 @@ ...@@ -93,7 +95,7 @@
93 <template slot-scope="scope"> 95 <template slot-scope="scope">
94 <el-select 96 <el-select
95 v-model="scope.row.flightRoute" 97 v-model="scope.row.flightRoute"
96 - placeholder="请选择" 98 + :placeholder="scope.row.flightNo ? (scope.row.routeList.length ? '请选择' : '暂无航线') : '请先输入航班号'"
97 size="small" 99 size="small"
98 :disabled="scope.row.edit" 100 :disabled="scope.row.edit"
99 > 101 >
...@@ -232,7 +234,7 @@ ...@@ -232,7 +234,7 @@
232 maxlength="1000" 234 maxlength="1000"
233 show-word-limit 235 show-word-limit
234 :rows="4" 236 :rows="4"
235 - placeholder="URSA之间用分号分隔，例：F2;F3;P_" 237 + placeholder="URSA之间用分号分隔，例：F1_;F2_;F3_;P_"
236 :disabled="!getRouter" 238 :disabled="!getRouter"
237 @blur="includeUrsa" 239 @blur="includeUrsa"
238 ></el-input> 240 ></el-input>
...@@ -261,11 +263,15 @@ ...@@ -261,11 +263,15 @@
261 maxlength="1000" 263 maxlength="1000"
262 show-word-limit 264 show-word-limit
263 :rows="4" 265 :rows="4"
264 - placeholder="URSA之间用分号分隔，例：F2;F3;P_" 266 + placeholder="URSA之间用分号分隔，例：F1;F2;F3;P"
265 :disabled="!getRouter" 267 :disabled="!getRouter"
266 @blur="notIncludeUrsa" 268 @blur="notIncludeUrsa"
267 ></el-input> 269 ></el-input>
268 - <span class="el-form-item__error" v-text="notUrsaError" style="width: 50%; margin-left: 28%"></span> 270 + <span
271 + class="el-form-item__error"
272 + v-text="notUrsaError"
273 + style="width: 50%; margin-left: 28%"
274 + ></span>
269 </el-col> 275 </el-col>
270 </el-form-item> 276 </el-form-item>
271 </el-col> 277 </el-col>
...@@ -671,6 +677,12 @@ export default { ...@@ -671,6 +677,12 @@ export default {
671 item.calculateDay == this.tableData[this.currentIndex].calculateDay && 677 item.calculateDay == this.tableData[this.currentIndex].calculateDay &&
672 item.flightRoute == this.tableData[this.currentIndex].flightRoute 678 item.flightRoute == this.tableData[this.currentIndex].flightRoute
673 ); 679 );
680 + let flightNo = repeat.every((item) => item.flightNo.length == 0);
681 + // 出现重复的是不是有航班号
682 + if (flightNo) {
683 + this.msgError("请输入航班号");
684 + return;
685 + }
674 // 出现重复的返回 686 // 出现重复的返回
675 if (repeat.length > 1) { 687 if (repeat.length > 1) {
676 this.msgError("航班顺位已重复"); 688 this.msgError("航班顺位已重复");
...@@ -712,6 +724,7 @@ export default { ...@@ -712,6 +724,7 @@ export default {
712 }, 724 },
713 // 删除 725 // 删除
714 deleBtn(item, $index) { 726 deleBtn(item, $index) {
727 + console.log(item, $index);
715 this.tableData.splice($index, 1); 728 this.tableData.splice($index, 1);
716 }, 729 },
717 // 类别 730 // 类别
......