Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
ce57050b 2 parents 2e2c4ac7 814e887e

Merge branch 'et86' into 2023-08-14

Expand all
Inline Side-by-side
Showing 7 changed files with 102 additions and 100 deletions
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </el-row> 17 </el-row>
18 <el-table 18 <el-table
19 :max-height="attrs.maxHeight" 19 :max-height="attrs.maxHeight"
20 - empty-text 20 + :empty-text="emptyText"
21 v-bind="attrs" 21 v-bind="attrs"
22 v-loading="loadingTable" 22 v-loading="loadingTable"
23 :data="tableData" 23 :data="tableData"
...@@ -82,6 +82,10 @@ export default { ...@@ -82,6 +82,10 @@ export default {
82 }, 82 },
83 }, 83 },
84 }, 84 },
85 + emptyText: {
86 + type: String,
87 + default: "暂无数据",
88 + },
85 loadingTable: { 89 loadingTable: {
86 type: Boolean, 90 type: Boolean,
87 default: false, 91 default: false,
...@@ -93,7 +97,6 @@ export default { ...@@ -93,7 +97,6 @@ export default {
93 tableData: { 97 tableData: {
94 type: Array, 98 type: Array,
95 default: () => [], 99 default: () => [],
96 - required: true,
97 }, 100 },
98 pageConfig: { 101 pageConfig: {
99 type: Object, 102 type: Object,
...@@ -127,8 +130,6 @@ export default { ...@@ -127,8 +130,6 @@ export default {
127 } 130 }
128 }, 131 },
129 mounted() { 132 mounted() {
130 - this.getTrCurrentHeight();
131 - window.addEventListener("resize", this.getTrCurrentHeight);
132 //阻止火狐拖拽新建新页面 133 //阻止火狐拖拽新建新页面
133 document.body.addEventListener( 134 document.body.addEventListener(
134 "drop", 135 "drop",
...@@ -138,13 +139,19 @@ export default { ...@@ -138,13 +139,19 @@ export default {
138 }, 139 },
139 false 140 false
140 ); 141 );
141 - // 拖拽行更新排序 142 + if (this.tableData.length) {
142 - // this.rowDrop(); 143 + this.getTrCurrentHeight();
143 - // 拖拽列更新排序 144 + window.addEventListener("resize", this.getTrCurrentHeight);
144 - this.columnDrop(); 145 + // 拖拽行更新排序
146 + // this.rowDrop();
147 + // 拖拽列更新排序
148 + this.columnDrop();
149 + }
145 }, 150 },
146 destroyed() { 151 destroyed() {
147 - window.removeEventListener("resize", this.getTrCurrentHeight); 152 + if (this.tableData.length) {
153 + window.removeEventListener("resize", this.getTrCurrentHeight);
154 + }
148 }, 155 },
149 156
150 methods: { 157 methods: {
......
...@@ -6,15 +6,6 @@ export const tableAttr = { ...@@ -6,15 +6,6 @@ export const tableAttr = {
6 btnCofig: { 6 btnCofig: {
7 isBtn: true, 7 isBtn: true,
8 btnGroup: [ 8 btnGroup: [
9 - // {
10 - // type: "primary", // text、primary、danger
11 - // icon: "el-icon-search", // el-icon-edit 、el-icon-delete、el-icon-plus、el-icon-download、el-icon-upload el-icon--right
12 - // btnName: "搜索",
13 - // size: "mini", // medium / small / mini
14 - // round: false,
15 - // loading: false,
16 - // event: "search",
17 - // },
18 { 9 {
19 type: "primary", 10 type: "primary",
20 icon: "el-icon-plus", 11 icon: "el-icon-plus",
...@@ -24,15 +15,6 @@ export const tableAttr = { ...@@ -24,15 +15,6 @@ export const tableAttr = {
24 loading: false, 15 loading: false,
25 event: "add", 16 event: "add",
26 }, 17 },
27 - // {
28 - // type: "danger",
29 - // icon: "el-icon-delete",
30 - // btnName: "删除",
31 - // size: "mini",
32 - // round: false,
33 - // loading: false,
34 - // event: "delete",
35 - // },
36 ], 18 ],
37 }, 19 },
38 }; 20 };
...@@ -104,7 +86,8 @@ export const tableData = [ ...@@ -104,7 +86,8 @@ export const tableData = [
104 id: "1", 86 id: "1",
105 fltNo: "A380", 87 fltNo: "A380",
106 fltNoDate: "3", 88 fltNoDate: "3",
107 - fltRoute: "CAN", 89 + fltRoute: "",
90 + routeList: [],
108 isOn: "1", 91 isOn: "1",
109 sort: "1", // 排序字段 92 sort: "1", // 排序字段
110 }, 93 },
......
...@@ -27,15 +27,11 @@ export const formConfig = [ ...@@ -27,15 +27,11 @@ export const formConfig = [
27 data: [ 27 data: [
28 { 28 {
29 value: "1", 29 value: "1",
30 - label: "新增", 30 + label: "有效",
31 - },
32 - {
33 - value: "2",
34 - label: "修改",
35 }, 31 },
36 { 32 {
37 value: "3", 33 value: "3",
38 - label: "删除", 34 + label: "无效",
39 }, 35 },
40 ], 36 ],
41 label: "", 37 label: "",
......
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
22 @search="searchBtn" 22 @search="searchBtn"
23 @restForm="restForm" 23 @restForm="restForm"
24 @add="addBtn" 24 @add="addBtn"
25 - @upload="uploadBtn"
26 - @download="downloadBtn"
27 > 25 >
28 </yl-table> 26 </yl-table>
29 </div> 27 </div>
...@@ -134,14 +132,6 @@ export default { ...@@ -134,14 +132,6 @@ export default {
134 }, 132 },
135 }); 133 });
136 }, 134 },
137 - // 上传
138 - uploadBtn(item) {
139 - console.log("upload：", item);
140 - },
141 - // 导出
142 - downloadBtn(item) {
143 - console.log("download：", item);
144 - },
145 // 编辑 135 // 编辑
146 editRow(item) { 136 editRow(item) {
147 this.$router.push({ 137 this.$router.push({
......
1 const state = { 1 const state = {
2 - 1: "新增", 2 + 1: "有效",
3 - 2: "修改", 3 + 3: "无效",
4 - 3: "删除",
5 }; 4 };
6 export const tableAttr = { 5 export const tableAttr = {
7 border: true, 6 border: true,
...@@ -38,28 +37,10 @@ export const tableAttr = { ...@@ -38,28 +37,10 @@ export const tableAttr = {
38 loading: false, 37 loading: false,
39 event: "add", 38 event: "add",
40 }, 39 },
41 - {
42 - type: "primary",
43 - icon: "el-icon-upload",
44 - btnName: "上传",
45 - size: "mini",
46 - round: false,
47 - loading: false,
48 - event: "upload",
49 - },
50 - {
51 - type: "primary",
52 - icon: "el-icon-download",
53 - btnName: "导出",
54 - size: "mini",
55 - round: false,
56 - loading: false,
57 - event: "download",
58 - },
59 ], 40 ],
60 }, 41 },
61 }; 42 };
62 -export const columnHeader = (editRow, deleteRow, viewRow) => [ 43 +export const columnHeader = (viewRow, editRow, deleteRow) => [
63 { 44 {
64 type: "selection", 45 type: "selection",
65 align: "center", 46 align: "center",
...@@ -74,12 +55,30 @@ export const columnHeader = (editRow, deleteRow, viewRow) => [ ...@@ -74,12 +55,30 @@ export const columnHeader = (editRow, deleteRow, viewRow) => [
74 width: "50", 55 width: "50",
75 }, 56 },
76 { 57 {
58 + label: "原航班号",
59 + prop: "fltNo",
60 + align: "center",
61 + minWidth: 100,
62 + },
63 + {
77 label: "顺位航班", 64 label: "顺位航班",
78 prop: "flightRand", 65 prop: "flightRand",
79 align: "center", 66 align: "center",
80 minWidth: 100, 67 minWidth: 100,
81 }, 68 },
82 { 69 {
70 + label: "URSA包含",
71 + prop: "includeUrsa",
72 + align: "center",
73 + minWidth: 100,
74 + },
75 + {
76 + label: "URSA不包含",
77 + prop: "notIncludeUrsa",
78 + align: "center",
79 + minWidth: 100,
80 + },
81 + {
83 label: "状态", 82 label: "状态",
84 prop: "status", 83 prop: "status",
85 align: "center", 84 align: "center",
...@@ -98,14 +97,14 @@ export const columnHeader = (editRow, deleteRow, viewRow) => [ ...@@ -98,14 +97,14 @@ export const columnHeader = (editRow, deleteRow, viewRow) => [
98 "sort-method": (a, b) => b.createTime - a.createTime, 97 "sort-method": (a, b) => b.createTime - a.createTime,
99 }, 98 },
100 { 99 {
101 - label: "修改时间", 100 + label: "创建人",
102 - prop: "updateTime", 101 + prop: "createUserName",
103 align: "center", 102 align: "center",
104 minWidth: 100, 103 minWidth: 100,
105 }, 104 },
106 { 105 {
107 - label: "创建人", 106 + label: "修改时间",
108 - prop: "createUserName", 107 + prop: "updateTime",
109 align: "center", 108 align: "center",
110 minWidth: 100, 109 minWidth: 100,
111 }, 110 },
...@@ -129,50 +128,50 @@ export const columnHeader = (editRow, deleteRow, viewRow) => [ ...@@ -129,50 +128,50 @@ export const columnHeader = (editRow, deleteRow, viewRow) => [
129 props: { 128 props: {
130 type: "text", 129 type: "text",
131 size: "mini", 130 size: "mini",
132 - icon: "el-icon-edit", 131 + icon: "el-icon-view",
133 }, 132 },
134 on: { 133 on: {
135 click() { 134 click() {
136 - editRow(params); 135 + viewRow(params);
137 }, 136 },
138 }, 137 },
139 }, 138 },
140 - "修改" 139 + "查看"
141 ), 140 ),
142 h( 141 h(
143 "el-button", 142 "el-button",
144 { 143 {
145 - style: {
146 - color: "#ff4949",
147 - },
148 props: { 144 props: {
149 type: "text", 145 type: "text",
150 size: "mini", 146 size: "mini",
151 - icon: "el-icon-delete", 147 + icon: "el-icon-edit",
152 }, 148 },
153 on: { 149 on: {
154 click() { 150 click() {
155 - deleteRow(params); 151 + editRow(params);
156 }, 152 },
157 }, 153 },
158 }, 154 },
159 - "删除" 155 + "修改"
160 ), 156 ),
161 h( 157 h(
162 "el-button", 158 "el-button",
163 { 159 {
160 + style: {
161 + color: "#ff4949",
162 + },
164 props: { 163 props: {
165 type: "text", 164 type: "text",
166 size: "mini", 165 size: "mini",
167 - icon: "el-icon-view", 166 + icon: "el-icon-delete",
168 }, 167 },
169 on: { 168 on: {
170 click() { 169 click() {
171 - viewRow(params); 170 + deleteRow(params);
172 }, 171 },
173 }, 172 },
174 }, 173 },
175 - "查看" 174 + "删除"
176 ), 175 ),
177 ]); 176 ]);
178 }, 177 },
...@@ -184,81 +183,108 @@ export const tableData = [ ...@@ -184,81 +183,108 @@ export const tableData = [
184 id: "1", 183 id: "1",
185 flightRand: "LZ003;LZ00", 184 flightRand: "LZ003;LZ00",
186 status: "1", 185 status: "1",
187 - createTime: "2023-08-11", 186 + fltNo: "FX0090",
188 - updateTime: "2023-08-11", 187 + includeUrsa: "URSACODE191",
188 + notIncludeUrsa: "P_3",
189 + createTime: "2023-08-14",
189 createUserName: "wjh", 190 createUserName: "wjh",
191 + updateTime: "2023-08-14",
190 updateUserName: "wjh", 192 updateUserName: "wjh",
191 }, 193 },
192 { 194 {
193 id: "2", 195 id: "2",
194 flightRand: "LP001;LP004+1", 196 flightRand: "LP001;LP004+1",
195 status: "3", 197 status: "3",
196 - createTime: "2023-08-11", 198 + fltNo: "FX0090",
197 - updateTime: "2023-08-11", 199 + includeUrsa: "P_;URSACODE105",
200 + notIncludeUrsa: "P_21",
201 + createTime: "2023-08-14",
198 createUserName: "wjh", 202 createUserName: "wjh",
203 + updateTime: "2023-08-14",
199 updateUserName: "wjh", 204 updateUserName: "wjh",
200 }, 205 },
201 { 206 {
202 id: "3", 207 id: "3",
203 - flightRand: "LZ002;LZ003;LZ001", 208 + flightRand: "CQ00;LZ003;CS0004",
204 status: "1", 209 status: "1",
205 - createTime: "2023-08-10", 210 + fltNo: "CS0002",
206 - updateTime: "2023-08-10", 211 + includeUrsa: "URSACODE12",
212 + notIncludeUrsa: "P_2",
213 + createTime: "2023-08-14",
207 createUserName: "wjh", 214 createUserName: "wjh",
215 + updateTime: "2023-08-14",
208 updateUserName: "wjh", 216 updateUserName: "wjh",
209 }, 217 },
210 { 218 {
211 id: "4", 219 id: "4",
212 flightRand: "LZ001;LZ002;LZ004", 220 flightRand: "LZ001;LZ002;LZ004",
213 - status: "2", 221 + status: "1",
222 + fltNo: "FX0090",
223 + includeUrsa: "URSACODE192",
224 + notIncludeUrsa: "P_17",
214 createTime: "2023-08-11", 225 createTime: "2023-08-11",
215 - updateTime: "2023-08-11",
216 createUserName: "wjh", 226 createUserName: "wjh",
227 + updateTime: "2023-08-11",
217 updateUserName: "wjh", 228 updateUserName: "wjh",
218 }, 229 },
219 { 230 {
220 id: "5", 231 id: "5",
221 flightRand: "PS001;PS003", 232 flightRand: "PS001;PS003",
222 status: "1", 233 status: "1",
234 + fltNo: "FX0091",
235 + includeUrsa: "URSACODE10",
236 + notIncludeUrsa: "P_28",
223 createTime: "2023-08-11", 237 createTime: "2023-08-11",
224 - updateTime: "2023-08-11",
225 createUserName: "wjh", 238 createUserName: "wjh",
239 + updateTime: "2023-08-11",
226 updateUserName: "wjh", 240 updateUserName: "wjh",
227 }, 241 },
228 { 242 {
229 id: "6", 243 id: "6",
230 flightRand: "PS002;PS003", 244 flightRand: "PS002;PS003",
231 status: "3", 245 status: "3",
246 + fltNo: "XN007",
247 + includeUrsa: "URSACODE27",
248 + notIncludeUrsa: "P_4",
232 createTime: "2023-08-11", 249 createTime: "2023-08-11",
233 - updateTime: "2023-08-11",
234 createUserName: "wjh", 250 createUserName: "wjh",
251 + updateTime: "2023-08-11",
235 updateUserName: "wjh", 252 updateUserName: "wjh",
236 }, 253 },
237 { 254 {
238 id: "7", 255 id: "7",
239 - flightRand: "FX0092;FX0095;FX0094;FX0090", 256 + flightRand: "XN001;XN002;XN003;XN004",
240 status: "1", 257 status: "1",
258 + fltNo: "XN001",
259 + includeUrsa: "URSACODE34",
260 + notIncludeUrsa: "P_7",
241 createTime: "2023-08-10", 261 createTime: "2023-08-10",
242 - updateTime: "2023-08-10",
243 createUserName: "wjh", 262 createUserName: "wjh",
263 + updateTime: "2023-08-10",
244 updateUserName: "wjh", 264 updateUserName: "wjh",
245 }, 265 },
246 { 266 {
247 id: "8", 267 id: "8",
248 - flightRand: "AB060;AC005;AC204", 268 + flightRand: "HA004",
249 - status: "2", 269 + status: "3",
270 + fltNo: "LZ007",
271 + includeUrsa: "URSACODE71",
272 + notIncludeUrsa: "P_2",
250 createTime: "2023-08-10", 273 createTime: "2023-08-10",
251 - updateTime: "2023-08-10",
252 createUserName: "wjh", 274 createUserName: "wjh",
275 + updateTime: "2023-08-10",
253 updateUserName: "wjh", 276 updateUserName: "wjh",
254 }, 277 },
255 { 278 {
256 id: "9", 279 id: "9",
257 - flightRand: "FX0090;FX0092", 280 + flightRand: "AB0001;AB123",
258 status: "1", 281 status: "1",
282 + fltNo: "AB0001",
283 + includeUrsa: "URSACODE87",
284 + notIncludeUrsa: "P_26",
259 createTime: "2023-08-10", 285 createTime: "2023-08-10",
260 - updateTime: "2023-08-10",
261 createUserName: "wjh", 286 createUserName: "wjh",
287 + updateTime: "2023-08-10",
262 updateUserName: "wjh", 288 updateUserName: "wjh",
263 }, 289 },
264 ]; 290 ];
......