Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
7d5ca3c0 2 parents 000e8054 840a37ac

modify

Inline Side-by-side
Showing 8 changed files with 352 additions and 33 deletions
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <sidebar class="sidebar-container" 4 <sidebar class="sidebar-container"
5 :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" /> 5 :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
6 <div :class="{ hasTagsView: needTagsView }" class="main-container"> 6 <div :class="{ hasTagsView: needTagsView }" class="main-container">
7 - <div :class="{ 'fixed-header': fixedHeader }"> 7 + <div :class="{ 'fixed-header': fixedHeader }" ref="headerRef">
8 <navbar /> 8 <navbar />
9 <tags-view v-if="needTagsView" /> 9 <tags-view v-if="needTagsView" />
10 </div> 10 </div>
......
...@@ -13,32 +13,42 @@ const state = { ...@@ -13,32 +13,42 @@ const state = {
13 }; 13 };
14 14
15 const mutations = { 15 const mutations = {
16 - TOGGLE_SIDEBAR: state => { 16 + TOGGLE_SIDEBAR: (state) => {
17 - state.sidebar.opened = !state.sidebar.opened 17 + state.sidebar.opened = !state.sidebar.opened;
18 - state.sidebar.withoutAnimation = false 18 + state.sidebar.withoutAnimation = false;
19 if (state.sidebar.opened) { 19 if (state.sidebar.opened) {
20 //Cookies.set('sidebarStatus', 1) 20 //Cookies.set('sidebarStatus', 1)
21 - localStorage.setItem('sidebarStatus', 1) 21 + localStorage.setItem("sidebarStatus", 1);
22 } else { 22 } else {
23 // Cookies.set('sidebarStatus', 0) 23 // Cookies.set('sidebarStatus', 0)
24 - localStorage.setItem('sidebarStatus', 0) 24 + localStorage.setItem("sidebarStatus", 0);
25 } 25 }
26 }, 26 },
27 CLOSE_SIDEBAR: (state, withoutAnimation) => { 27 CLOSE_SIDEBAR: (state, withoutAnimation) => {
28 //Cookies.set('sidebarStatus', 0) 28 //Cookies.set('sidebarStatus', 0)
29 - localStorage.setItem('sidebarStatus', 0) 29 + localStorage.setItem("sidebarStatus", 0);
30 - state.sidebar.opened = false 30 + state.sidebar.opened = false;
31 - state.sidebar.withoutAnimation = withoutAnimation 31 + state.sidebar.withoutAnimation = withoutAnimation;
32 }, 32 },
33 TOGGLE_DEVICE: (state, device) => { 33 TOGGLE_DEVICE: (state, device) => {
34 - state.device = device 34 + state.device = device;
35 }, 35 },
36 SET_SIZE: (state, size) => { 36 SET_SIZE: (state, size) => {
37 - state.size = size 37 + state.size = size;
38 //Cookies.set('size', size) 38 //Cookies.set('size', size)
39 - localStorage.setItem('size', size) 39 + localStorage.setItem("size", size);
40 }, 40 },
41 + SET_APPHEADERBLOCKCH: (state, height) => {
42 + state.headerBlockClientHeight = height;
43 + },
44 +<<<<<<< HEAD
41 } 45 }
46 +=======
47 + SET_APPMAINBLOCKCH: (state, height) => {
48 + state.appMainBlockClientHeight = height;
49 + },
50 +};
51 +>>>>>>> test
42 52
43 const actions = { 53 const actions = {
44 toggleSideBar({ commit }) { 54 toggleSideBar({ commit }) {
...@@ -53,6 +63,15 @@ const actions = { ...@@ -53,6 +63,15 @@ const actions = {
53 setSize({ commit }, size) { 63 setSize({ commit }, size) {
54 commit("SET_SIZE", size); 64 commit("SET_SIZE", size);
55 }, 65 },
66 +<<<<<<< HEAD
67 +=======
68 + setAppHeaderBlockCH({ commit }, height) {
69 + commit("SET_APPHEADERBLOCKCH", height);
70 + },
71 + setAppMainBlockCH({ commit }, height) {
72 + commit("SET_APPMAINBLOCKCH", height);
73 + },
74 +>>>>>>> test
56 }; 75 };
57 76
58 export default { 77 export default {
......
...@@ -424,21 +424,12 @@ export function restTableHeight($refs) { ...@@ -424,21 +424,12 @@ export function restTableHeight($refs) {
424 if (key == "ylTable") { 424 if (key == "ylTable") {
425 $refs[key].$children.map((item) => { 425 $refs[key].$children.map((item) => {
426 if (item.$el.id == "group-btn") { 426 if (item.$el.id == "group-btn") {
427 - // console.log("group-btn：", getPropertyValue(item.$el));
428 // table表格组合按钮 427 // table表格组合按钮
429 heigth += getPropertyValue(item.$el); 428 heigth += getPropertyValue(item.$el);
430 heigth += item.$el.clientHeight; 429 heigth += item.$el.clientHeight;
431 } else if (item.$el.className == "el-pagination is-background") { 430 } else if (item.$el.className == "el-pagination is-background") {
432 // table表格组合分页 431 // table表格组合分页
433 if (item.$el.offsetParent.className == "pagination-container") { 432 if (item.$el.offsetParent.className == "pagination-container") {
434 - // console.log(
435 - // "pagination：",
436 - // getPropertyValue(item.$el.offsetParent)
437 - // );
438 - // console.log(
439 - // "paginationClientHeight：",
440 - // getPropertyValue(item.$el.offsetParent.clientHeight)
441 - // );
442 heigth += getPropertyValue(item.$el.offsetParent); 433 heigth += getPropertyValue(item.$el.offsetParent);
443 heigth += item.$el.offsetParent.clientHeight; 434 heigth += item.$el.offsetParent.clientHeight;
444 } 435 }
...@@ -448,22 +439,14 @@ export function restTableHeight($refs) { ...@@ -448,22 +439,14 @@ export function restTableHeight($refs) {
448 if ($refs[key].hasOwnProperty("$el")) { 439 if ($refs[key].hasOwnProperty("$el")) {
449 heigth += $refs[key].$el.clientHeight; 440 heigth += $refs[key].$el.clientHeight;
450 heigth += getPropertyValue($refs[key].$el); 441 heigth += getPropertyValue($refs[key].$el);
451 - // console.log(
452 - // "ruleForm：",
453 - // $refs[key].$el.clientHeight,
454 - // getPropertyValue($refs[key].$el)
455 - // );
456 } else { 442 } else {
457 - // console.log("ruleForm：", $refs[key]);
458 heigth += $refs[key].$el.clientHeight; 443 heigth += $refs[key].$el.clientHeight;
459 heigth += getPropertyValue($refs[key]); 444 heigth += getPropertyValue($refs[key]);
460 } 445 }
461 } 446 }
462 } else if (key == "formHeaderRef") { 447 } else if (key == "formHeaderRef") {
463 - // console.log("formHeaderRef：", getPropertyValue($refs[key]));
464 heigth += getPropertyValue($refs[key]); 448 heigth += getPropertyValue($refs[key]);
465 } 449 }
466 }); 450 });
467 - // console.log("heigth：", heigth);
468 return heigth; 451 return heigth;
469 } 452 }
......
...@@ -844,13 +844,17 @@ export default { ...@@ -844,13 +844,17 @@ export default {
844 } else { 844 } else {
845 //未请求到数据 845 //未请求到数据
846 if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') { 846 if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
847 - //航线不为空，获取该航线下无日期通用维度设置 847 + let params = {
848 - findDestinationFltRuleByFlightNo({
849 purposeOfFlightNo: this.infoForm.fltNo, 848 purposeOfFlightNo: this.infoForm.fltNo,
850 flightRoute: this.infoForm.route, 849 flightRoute: this.infoForm.route,
851 flightRouteListStr: this.$route.params.route, 850 flightRouteListStr: this.$route.params.route,
852 status: this.$route.params.status 851 status: this.$route.params.status
853 - }).then(response => { 852 + }
853 + if(this.$route.params.handle == "updated"){
854 + delete params.flightRoute
855 + }
856 + //航线不为空，获取该航线下无日期通用维度设置
857 + findDestinationFltRuleByFlightNo(params).then(response => {
854 this.routeList = response.data.routeList 858 this.routeList = response.data.routeList
855 if (response.data.list.length > 0) { 859 if (response.data.list.length > 0) {
856 //查询到通用维度，去除id status，航线赋值，航线优先级赋值 860 //查询到通用维度，去除id status，航线赋值，航线优先级赋值
......
...@@ -858,7 +858,7 @@ export default { ...@@ -858,7 +858,7 @@ export default {
858 goFlightAllocConfig(val) { 858 goFlightAllocConfig(val) {
859 let obj = { 859 let obj = {
860 id: ' ', 860 id: ' ',
861 - handle: 'update', 861 + handle: 'updated',
862 fltNo: val.fltNo, 862 fltNo: val.fltNo,
863 fltDate: val.fltDate ? val.fltDate : null, 863 fltDate: val.fltDate ? val.fltDate : null,
864 route: val.route, 864 route: val.route,
......
1 +export const formConfig = [
2 + {
3 + label: "原航班",
4 + type: "Input",
5 + name: "originOfFlightNo",
6 + prop: "originOfFlightNo",
7 + placeholder: "请输入原航班号",
8 + span: 5,
9 + trigger: "blur",
10 + labelWidth: "55px",
11 + },
12 + {
13 + label: "修改时间 从",
14 + type: "Date",
15 + name: "startTime",
16 + prop: "startTime",
17 + placeholder: "请选择开始时间",
18 + // rules: { required: true, message: "请选择开始时间", trigger: "blur" },
19 + format: "yyyy-MM-dd",
20 + colWidth: "23%",
21 + inputWidth: "100%",
22 + },
23 + {
24 + label: "到",
25 + type: "Date",
26 + name: "endTime",
27 + prop: "endTime",
28 + placeholder: "请选择结束时间",
29 + // rules: { required: true, message: "请选择结束时间", trigger: "blur" },
30 + format: "yyyy-MM-dd",
31 + colWidth: "20%",
32 + labelWidth: "20px",
33 + inputWidth: "100%",
34 + },
35 + {
36 + label: "规则状态",
37 + type: "Select",
38 + name: "status",
39 + prop: "status",
40 + placeholder: "请选择状态",
41 + options: {
42 + data: [
43 + {
44 + value: "1",
45 + label: "有效",
46 + },
47 + {
48 + value: "0",
49 + label: "无效",
50 + },
51 + ],
52 + },
53 + colWidth: "18%",
54 + labelWidth: "70px",
55 + inputWidth: "100%",
56 + },
57 +];
58 +
59 +export const editFormConfig = [
60 + {
61 + label: "航班号",
62 + type: "Search",
63 + name: "route",
64 + prop: "fltNo",
65 + placeholder: "请输入航班号",
66 + rules: {
67 + required: true,
68 + message: "请输入航班号",
69 + trigger: ["change", "blur"],
70 + },
71 + http: {
72 + url: "/dictionary/queryRouteByFltNo",
73 + method: "post",
74 + data: {
75 + fltNo: "",
76 + },
77 + },
78 + },
79 + {
80 + label: "",
81 + type: "inputNumber",
82 + name: "count",
83 + prop: "count",
84 + placeholder: "+",
85 + min: 0,
86 + max: 7,
87 + with: "50px",
88 + },
89 + {
90 + label: "航线优先级",
91 + type: "Input",
92 + name: "route",
93 + prop: "fltNum",
94 + placeholder: "请选择航线优先级",
95 + trigger: "focus",
96 + },
97 + {
98 + label: "爆仓是否继续配舱",
99 + type: "Checkbox",
100 + name: "checked",
101 + prop: "checked",
102 + disabled: false,
103 + },
104 +];
1 +<template>
2 + <div ref="formHeaderRef" class="form-header container">
3 + <el-row>
4 + <el-col>
5 + <yl-form
6 + ref="ruleForm"
7 + :formConfig="formConfig"
8 + :queryForm="queryForm"
9 + :inline="false"
10 + formWidth="auto"
11 + @blur="blurEvent"
12 + />
13 + </el-col>
14 + </el-row>
15 + <yl-table
16 + ref="ylTable"
17 + :attrs="tableAttr"
18 + :loadingTable="tableAttr.loadingTable"
19 + :columns="columns"
20 + :tableData="tableData"
21 + :pageConfig="pageConfig"
22 + @sizeChange="handleSizeChange"
23 + @currentChange="handleCurrentChange"
24 + @search="searchBtn"
25 + @add="addBtn"
26 + >
27 + </yl-table>
28 + </div>
29 +</template>
30 +<script>
31 +import YlForm from "@/components/YlForm";
32 +import YlTable from "@/components/YlTable";
33 +import { formConfig } from "./formConfig";
34 +import { tableAttr, columnHeader } from "./tableConfig";
35 +import { restTableHeight, sortList } from "@/utils";
36 +import store from '@/store'
37 +import {
38 + findAllEtesRules, // ET86查询
39 + deleteEtesRuleById, // 删除
40 +} from "@/api/et86";
41 +export default {
42 + components: {
43 + YlForm,
44 + YlTable,
45 + },
46 + data() {
47 + return {
48 + formConfig: formConfig, // 表单配置项
49 + queryForm: {
50 + // 表单参数
51 + status: "有效",
52 + },
53 + pageConfig: {
54 + // 分页配置项
55 + isPagination: true,
56 + total: 0,
57 + pageData: {
58 + page: 1,
59 + size: 10,
60 + },
61 + },
62 + tableAttr: tableAttr, // table配置项
63 + columns: columnHeader(this.indexAdd, this.viewRow, this.editRow, this.deleteRow), // 表头
64 + tableData: [], // 表格数据
65 + };
66 + },
67 + created() {
68 + // ET86查询
69 + this.$nextTick(() => {
70 + this.searchBtn();
71 + });
72 + },
73 + mounted() {
74 + this.$nextTick(() => {
75 + this.tableAttr.maxHeight =
76 + window.innerHeight - restTableHeight(this.$refs);
77 + });
78 + console.log(store.getters.appHeaderBlockClientHeight)
79 + },
80 + methods: {
81 + // ET86查询
82 + queryFindAllEtesRules() {
83 + const { page, size } = this.pageConfig.pageData;
84 + let params = {
85 + originOfFlightNo: this.queryForm.originOfFlightNo,
86 + updateTimeStart: this.queryForm.startTime
87 + ? this.queryForm.startTime
88 + : "",
89 + updateTimeEnd: this.queryForm.endTime ? this.queryForm.endTime : "",
90 + limitStart: (page - 1) * size,
91 + limitSize: size,
92 + status: this.queryForm.status,
93 + };
94 + if (this.queryForm.status == "有效") {
95 + params.status = "1";
96 + }
97 + this.tableAttr.loadingTable = true;
98 + findAllEtesRules(params)
99 + .then((res) => {
100 + this.tableAttr.loadingTable = false;
101 + const { code, data } = res;
102 + if (code == 200) {
103 + const valid = data.list.filter((item) => item.status == "1"); // 有效
104 + const invalid = data.list.filter((item) => item.status == "0"); // 无效
105 + this.tableData = valid.concat(invalid);
106 + this.pageConfig.total = data.total;
107 + }
108 + })
109 + .catch(() => {});
110 + },
111 + // 失焦事件
112 + blurEvent({ originOfFlightNo }) {
113 + this.queryForm.originOfFlightNo = this.upCase(originOfFlightNo);
114 + },
115 + // 搜索
116 + searchBtn() {
117 + this.pageConfig.pageData.page = 1;
118 + this.pageConfig.pageData.size = 10;
119 + this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
120 + this.queryFindAllEtesRules();
121 + });
122 + },
123 + // 翻页序号递增
124 + indexAdd(index){
125 + const page = this.pageConfig.pageData.page // 当前页码
126 + const pagesize = this.pageConfig.pageData.size // 每页条数
127 + return index + 1 + (page - 1) * pagesize
128 + },
129 + //条数变化
130 + handleSizeChange(e) {
131 + this.pageConfig.pageData.size = e;
132 + this.pageConfig.pageData.page = 1;
133 + this.queryFindAllEtesRules();
134 + },
135 + //页码变化
136 + handleCurrentChange(e) {
137 + this.pageConfig.pageData.page = e;
138 + this.queryFindAllEtesRules();
139 + },
140 + // 添加
141 + addBtn(item) {
142 + this.$router.push({
143 + path: "/edit",
144 + query: {
145 + name: "add",
146 + },
147 + });
148 + },
149 + // 重置表单
150 + restForm() {
151 + this.$refs.ruleForm.resetFields("ruleForm");
152 + },
153 + // 查看
154 + viewRow({ row }) {
155 + this.$router.push({
156 + path: "/edit",
157 + query: {
158 + name: "view",
159 + id: row.id,
160 + status: row.status,
161 + },
162 + });
163 + },
164 + // 编辑
165 + editRow({ row }) {
166 + this.$router.push({
167 + path: "/edit",
168 + query: {
169 + name: "edit",
170 + id: row.id,
171 + status: row.status,
172 + },
173 + });
174 + },
175 + // 删除
176 + deleteRow({ row }) {
177 + this.$confirm("是否确认删除? 删除后该规则设置为无效，不可恢复", "提示", {
178 + confirmButtonText: "确定",
179 + cancelButtonText: "取消",
180 + type: "warning",
181 + center: true,
182 + })
183 + .then(() => {
184 + deleteEtesRuleById({ id: row.id }).then((res) => {
185 + const { code, msg } = res;
186 + if (code == 200) {
187 + this.searchBtn();
188 + this.msgSuccess("删除成功!");
189 + } else {
190 + this.msgError(msg || "删除失败");
191 + }
192 + });
193 + })
194 + .catch(() => {});
195 + },
196 + },
197 +};
198 +</script>
199 +<style lang="scss" scoped></style>
...@@ -299,6 +299,16 @@ export default { ...@@ -299,6 +299,16 @@ export default {
299 } 299 }
300 queryRoute(obj).then(res => { 300 queryRoute(obj).then(res => {
301 if (res.code === 200) { 301 if (res.code === 200) {
302 +<<<<<<< HEAD
303 +=======
304 + res.data.list.map(item=>{
305 + if(item.isEtesRoute == "N" || item.isEtesRoute == null){
306 + item.isEtesRoute = false;
307 + }else{
308 + item.isEtesRoute = true;
309 + }
310 + })
311 +>>>>>>> fix-issues
302 this.tableData = res.data.list 312 this.tableData = res.data.list
303 this.total = res.data.total 313 this.total = res.data.total
304 } else { 314 } else {
......