Elements-SY

modify

...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 </template> 5 </template>
6 6
7 <script> 7 <script>
8 -export default { 8 +export default {
9 - name: 'App' 9 + name: "App",
10 -} 10 +};
11 </script> 11 </script>
......
...@@ -462,6 +462,7 @@ export default { ...@@ -462,6 +462,7 @@ export default {
462 deep: true, 462 deep: true,
463 immediate: true, 463 immediate: true,
464 }, 464 },
465 + //
465 }, 466 },
466 }; 467 };
467 </script> 468 </script>
......
...@@ -183,13 +183,15 @@ export default { ...@@ -183,13 +183,15 @@ export default {
183 183
184 methods: { 184 methods: {
185 getTrCurrentHeight: debounce(function () { 185 getTrCurrentHeight: debounce(function () {
186 +
186 this.$nextTick(() => { 187 this.$nextTick(() => {
187 - const trEl = 188 + // const trEl =
188 - this.$refs.tableRef.$refs.bodyWrapper.children[0].children[1] 189 + // this.$refs.tableRef.$refs.bodyWrapper.children[0].children[1]
189 - .children[0]; 190 + // .children[0];
190 - if (trEl) { 191 + // console.log(trEl)
191 - this.trHeight = trEl.clientHeight; 192 + // if (trEl) {
192 - } 193 + // this.trHeight = trEl.clientHeight;
194 + // }
193 }); 195 });
194 }, 800), 196 }, 800),
195 197
......
...@@ -77,7 +77,7 @@ export const constantRoutes = [ ...@@ -77,7 +77,7 @@ export const constantRoutes = [
77 component: (resolve) => 77 component: (resolve) =>
78 require(["@/views/et86Config/et86RuleConfig/edit"], resolve), 78 require(["@/views/et86Config/et86RuleConfig/edit"], resolve),
79 name: "edit", 79 name: "edit",
80 - meta: { title: "ET86规则", icon: "user", noCache: false }, 80 + meta: { title: "ET86规则", icon: "user", noCache: true },
81 }, 81 },
82 { 82 {
83 path: "/errorInfo", 83 path: "/errorInfo",
......
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
128 isEtesRoute.map((item) => { 128 isEtesRoute.map((item) => {
129 routes.push({ config: false, route: item.route }); 129 routes.push({ config: false, route: item.route });
130 }); 130 });
131 - this.routeList = data.list; 131 + this.routeList = isEtesRoute;
132 this.routesInfo = routes; 132 this.routesInfo = routes;
133 } else { 133 } else {
134 this.routeList = []; 134 this.routeList = [];
......
...@@ -19,7 +19,7 @@ export const columnHeader = () => [ ...@@ -19,7 +19,7 @@ export const columnHeader = () => [
19 { 19 {
20 label: "错误信息", 20 label: "错误信息",
21 prop: "msg", 21 prop: "msg",
22 - align: "center", 22 + align: "left",
23 minWidth: 150, 23 minWidth: 150,
24 }, 24 },
25 ]; 25 ];
......
...@@ -199,10 +199,10 @@ export default { ...@@ -199,10 +199,10 @@ export default {
199 }); 199 });
200 }, 200 },
201 // 翻页序号递增 201 // 翻页序号递增
202 - indexAdd(index){ 202 + indexAdd(index) {
203 - const page = this.pageConfig.pageData.page // 当前页码 203 + const page = this.pageConfig.pageData.page; // 当前页码
204 - const pagesize = this.pageConfig.pageData.size // 每页条数 204 + const pagesize = this.pageConfig.pageData.size; // 每页条数
205 - return index + 1 + (page - 1) * pagesize 205 + return index + 1 + (page - 1) * pagesize;
206 }, 206 },
207 //条数变化 207 //条数变化
208 handleSizeChange(e) { 208 handleSizeChange(e) {
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 v-model="scope.row.flightNo" 49 v-model="scope.row.flightNo"
50 clearable 50 clearable
51 :disabled="scope.row.edit" 51 :disabled="scope.row.edit"
52 - @focus="inputFocus(scope)" 52 + @focus="inputFlightNoFocus(scope)"
53 @blur="blurSearch" 53 @blur="blurSearch"
54 placeholder="请输入航班号" 54 placeholder="请输入航班号"
55 size="small" 55 size="small"
...@@ -95,9 +95,9 @@ ...@@ -95,9 +95,9 @@
95 <template slot-scope="scope"> 95 <template slot-scope="scope">
96 <el-select 96 <el-select
97 v-model="scope.row.flightRoute" 97 v-model="scope.row.flightRoute"
98 - :placeholder="scope.row.flightNo ? (scope.row.routeList.length ? '请选择' : '暂无航线') : '请先输入航班号'"
99 size="small" 98 size="small"
100 :disabled="scope.row.edit" 99 :disabled="scope.row.edit"
100 + @focus="inputFlightRoute(scope)"
101 > 101 >
102 <el-option 102 <el-option
103 v-for="item in scope.row.routeList" 103 v-for="item in scope.row.routeList"
...@@ -649,8 +649,13 @@ export default { ...@@ -649,8 +649,13 @@ export default {
649 if (isEtesRoute.length == 0) { 649 if (isEtesRoute.length == 0) {
650 this.msgError("该航班下的航线均为普通航线"); 650 this.msgError("该航班下的航线均为普通航线");
651 } 651 }
652 + // console.log(this.currentIndex)
653 + // console.log(this.tableData)
654 + // console.log(this.tableData[this.currentIndex])
655 + // console.log(isEtesRoute)
652 this.tableData[this.currentIndex].flightRoute = ""; 656 this.tableData[this.currentIndex].flightRoute = "";
653 this.tableData[this.currentIndex].routeList = isEtesRoute; 657 this.tableData[this.currentIndex].routeList = isEtesRoute;
658 + // this.$set(this.tableData[this.currentIndex].routeList, index, isEtesRoute);
654 } else { 659 } else {
655 this.msgError("暂无航线"); 660 this.msgError("暂无航线");
656 this.tableData[this.currentIndex].routeList = []; 661 this.tableData[this.currentIndex].routeList = [];
...@@ -661,7 +666,7 @@ export default { ...@@ -661,7 +666,7 @@ export default {
661 .catch(() => {}); 666 .catch(() => {});
662 }, 667 },
663 // 航班号input 聚焦事件 668 // 航班号input 聚焦事件
664 - inputFocus({ $index }) { 669 + inputFlightNoFocus({ $index }) {
665 this.currentIndex = $index; 670 this.currentIndex = $index;
666 }, 671 },
667 // 失焦查询 672 // 失焦查询
...@@ -700,6 +705,15 @@ export default { ...@@ -700,6 +705,15 @@ export default {
700 this.msgError("请输入航班号"); 705 this.msgError("请输入航班号");
701 } 706 }
702 }, 707 },
708 + // 航线聚焦事件
709 + inputFlightRoute({ $index, row }){
710 + this.currentIndex = $index;
711 + let params = {
712 + fltNo: row.flightNo
713 + }
714 + // 航线查询
715 + // this.getQueryRouteByFltNo(params);
716 + },
703 // 添加ET86配舱航班顺位 717 // 添加ET86配舱航班顺位
704 addBtn(item) { 718 addBtn(item) {
705 this.id++; 719 this.id++;
......
...@@ -38,6 +38,7 @@ import { ...@@ -38,6 +38,7 @@ import {
38 deleteEtesRuleById, // 删除 38 deleteEtesRuleById, // 删除
39 } from "@/api/et86"; 39 } from "@/api/et86";
40 export default { 40 export default {
41 + name: "et86RuleConfig",
41 components: { 42 components: {
42 YlForm, 43 YlForm,
43 YlTable, 44 YlTable,
...@@ -45,8 +46,12 @@ export default { ...@@ -45,8 +46,12 @@ export default {
45 data() { 46 data() {
46 return { 47 return {
47 formConfig: formConfig, // 表单配置项 48 formConfig: formConfig, // 表单配置项
49 + originOfFlightNo: "",
48 queryForm: { 50 queryForm: {
49 // 表单参数 51 // 表单参数
52 + originOfFlightNo: "",
53 + startTime: "",
54 + endTime: "",
50 status: "有效", 55 status: "有效",
51 }, 56 },
52 pageConfig: { 57 pageConfig: {
...@@ -59,7 +64,12 @@ export default { ...@@ -59,7 +64,12 @@ export default {
59 }, 64 },
60 }, 65 },
61 tableAttr: tableAttr, // table配置项 66 tableAttr: tableAttr, // table配置项
62 - columns: columnHeader(this.indexAdd, this.viewRow, this.editRow, this.deleteRow), // 表头 67 + columns: columnHeader(
68 + this.indexAdd,
69 + this.viewRow,
70 + this.editRow,
71 + this.deleteRow
72 + ), // 表头
63 tableData: [], // 表格数据 73 tableData: [], // 表格数据
64 }; 74 };
65 }, 75 },
...@@ -76,6 +86,7 @@ export default { ...@@ -76,6 +86,7 @@ export default {
76 window.innerHeight - restTableHeight(this.$refs); 86 window.innerHeight - restTableHeight(this.$refs);
77 }); 87 });
78 }, 88 },
89 + computed: {},
79 methods: { 90 methods: {
80 // ET86查询 91 // ET86查询
81 queryFindAllEtesRules() { 92 queryFindAllEtesRules() {
...@@ -120,10 +131,10 @@ export default { ...@@ -120,10 +131,10 @@ export default {
120 }); 131 });
121 }, 132 },
122 // 翻页序号递增 133 // 翻页序号递增
123 - indexAdd(index){ 134 + indexAdd(index) {
124 - const page = this.pageConfig.pageData.page // 当前页码 135 + const page = this.pageConfig.pageData.page; // 当前页码
125 - const pagesize = this.pageConfig.pageData.size // 每页条数 136 + const pagesize = this.pageConfig.pageData.size; // 每页条数
126 - return index + 1 + (page - 1) * pagesize 137 + return index + 1 + (page - 1) * pagesize;
127 }, 138 },
128 //条数变化 139 //条数变化
129 handleSizeChange(e) { 140 handleSizeChange(e) {
...@@ -180,7 +191,8 @@ export default { ...@@ -180,7 +191,8 @@ export default {
180 center: true, 191 center: true,
181 }) 192 })
182 .then(() => { 193 .then(() => {
183 - deleteEtesRuleById({ id: row.id }).then((res) => { 194 + delete row.status;
195 + deleteEtesRuleById(row).then((res) => {
184 const { code, msg } = res; 196 const { code, msg } = res;
185 if (code == 200) { 197 if (code == 200) {
186 this.searchBtn(); 198 this.searchBtn();
......