Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Elements-SY
2023-10-11 13:59:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
901ad3f75e5a5f6afdf37c08c0db30589d7f36d7
901ad3f7
1 parent
2c66eb4b
modify
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
src/views/allocationConfig/flightAllocConfig/components/routeInfo.vue
src/views/et86Config/et86RuleConfig/edit/index.vue
src/views/allocationConfig/flightAllocConfig/components/routeInfo.vue
View file @
901ad3f
...
...
@@ -139,7 +139,7 @@
type="textarea"
v-model="item.includeUrsa"
:rows="4"
placeholder="URSA之间用分号分隔,例:F
2;F3
;P_"
placeholder="URSA之间用分号分隔,例:F
1_;F2_;F3_
;P_"
>
</el-input>
</el-form-item>
...
...
@@ -151,7 +151,7 @@
type="textarea"
v-model="item.notIncludeUrsa"
:rows="4"
placeholder="URSA之间用分号分隔,例:F
2;F3;P_
"
placeholder="URSA之间用分号分隔,例:F
1;F2;F3;P
"
>
</el-input>
</el-form-item>
...
...
src/views/et86Config/et86RuleConfig/edit/index.vue
View file @
901ad3f
...
...
@@ -17,7 +17,9 @@
@click="addBtn"
>添加</el-button
>
<span class="ml20" style="color: #ffba00">拖动航班号可调整优先级</span>
<span class="ml20" style="color: #ffba00"
>拖动航班号可调整优先级</span
>
</el-col>
</el-row>
<yl-table
...
...
@@ -93,7 +95,7 @@
<template slot-scope="scope">
<el-select
v-model="scope.row.flightRoute"
placeholder="请选择
"
:placeholder="scope.row.flightNo ? (scope.row.routeList.length ? '请选择' : '暂无航线') : '请先输入航班号'
"
size="small"
:disabled="scope.row.edit"
>
...
...
@@ -232,7 +234,7 @@
maxlength="1000"
show-word-limit
:rows="4"
placeholder="URSA之间用分号分隔,例:F
2;F3
;P_"
placeholder="URSA之间用分号分隔,例:F
1_;F2_;F3_
;P_"
:disabled="!getRouter"
@blur="includeUrsa"
></el-input>
...
...
@@ -261,11 +263,15 @@
maxlength="1000"
show-word-limit
:rows="4"
placeholder="URSA之间用分号分隔,例:F
2;F3;P_
"
placeholder="URSA之间用分号分隔,例:F
1;F2;F3;P
"
:disabled="!getRouter"
@blur="notIncludeUrsa"
></el-input>
<span class="el-form-item__error" v-text="notUrsaError" style="width: 50%; margin-left: 28%"></span>
<span
class="el-form-item__error"
v-text="notUrsaError"
style="width: 50%; margin-left: 28%"
></span>
</el-col>
</el-form-item>
</el-col>
...
...
@@ -671,6 +677,12 @@ export default {
item.calculateDay == this.tableData[this.currentIndex].calculateDay &&
item.flightRoute == this.tableData[this.currentIndex].flightRoute
);
let flightNo = repeat.every((item) => item.flightNo.length == 0);
// 出现重复的是不是有航班号
if (flightNo) {
this.msgError("请输入航班号");
return;
}
// 出现重复的返回
if (repeat.length > 1) {
this.msgError("航班顺位已重复");
...
...
@@ -712,6 +724,7 @@ export default {
},
// 删除
deleBtn(item, $index) {
console.log(item, $index);
this.tableData.splice($index, 1);
},
// 类别
...
...
Please
register
or
login
to post a comment