Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
5f942ddb 1 parent eda2564b

航班信息维护按钮新增，字段新增，bug修复

Expand all
Inline Side-by-side
Showing 9 changed files with 116 additions and 140 deletions
1 let ductLabels = { 1 let ductLabels = {
2 + "cargo": {//货物查询
2 "cargoRulesStatus": { 3 "cargoRulesStatus": {
3 "1": "手动", 4 "1": "手动",
4 "2": "自动" 5 "2": "自动"
5 }, 6 },
7 + "releasing": {
8 + "1": "正在释放"
9 + }
10 + },
11 + "menu": {//菜单设置
6 "menuType": { 12 "menuType": {
7 "M": "菜单", 13 "M": "菜单",
8 "C": "菜单", 14 "C": "菜单",
...@@ -12,14 +18,20 @@ let ductLabels = { ...@@ -12,14 +18,20 @@ let ductLabels = {
12 "1": "启用", 18 "1": "启用",
13 "2": "停用", 19 "2": "停用",
14 }, 20 },
21 + },
22 + "role": {//角色设置
15 "valid": { 23 "valid": {
16 "1": "开启", 24 "1": "开启",
17 "2": "关闭", 25 "2": "关闭",
18 }, 26 },
27 + },
28 + "user": {//用户设置
19 "isValid": { 29 "isValid": {
20 "1": "开启", 30 "1": "开启",
21 "2": "关闭", 31 "2": "关闭",
22 }, 32 },
33 + },
34 + "FlightInformation": {//航班信息维护
23 "ticketToPiece": { 35 "ticketToPiece": {
24 "1": "是", 36 "1": "是",
25 "0": "否", 37 "0": "否",
...@@ -31,8 +43,20 @@ let ductLabels = { ...@@ -31,8 +43,20 @@ let ductLabels = {
31 "highLowPriceFlg": { 43 "highLowPriceFlg": {
32 "1": "开启", 44 "1": "开启",
33 "0": "未开启", 45 "0": "未开启",
46 + },
47 + "pushDateSwitch": {
48 + "1": "是",
49 + "2": "否",
50 + },
51 + },
52 + "logDmData": {//DM数据
53 + "status": {
54 + "0": "未处理",
55 + "1": "已处理",
56 + "2": "处理失败",
57 + "3": "无需处理",
58 + },
34 } 59 }
35 -
36 } 60 }
37 61
38 export default ductLabels; 62 export default ductLabels;
...\ No newline at end of file ...\ No newline at end of file
......
This diff is collapsed. Click to expand it.
...@@ -37,12 +37,14 @@ ...@@ -37,12 +37,14 @@
37 label-position="right" 37 label-position="right"
38 label-width="auto" 38 label-width="auto"
39 style="width: 400px; margin: 30px auto" 39 style="width: 400px; margin: 30px auto"
40 + v-model="formData"
40 > 41 >
41 <el-form-item label="航班号" prop="fltNo"> 42 <el-form-item label="航班号" prop="fltNo">
42 <el-input 43 <el-input
43 v-model="fltNo" 44 v-model="fltNo"
44 size="medium" 45 size="medium"
45 placeholder="请输入航班号" 46 placeholder="请输入航班号"
47 + maxlength="10"
46 style="width: 350px" 48 style="width: 350px"
47 ></el-input> 49 ></el-input>
48 </el-form-item> 50 </el-form-item>
...@@ -134,7 +136,7 @@ export default { ...@@ -134,7 +136,7 @@ export default {
134 }, 136 },
135 //确定配舱 137 //确定配舱
136 submit() { 138 submit() {
137 - this.loading= true; 139 + this.loading =true;
138 let arr = []; 140 let arr = [];
139 this.tableData.forEach((item) => { 141 this.tableData.forEach((item) => {
140 arr.push(item.id); 142 arr.push(item.id);
...@@ -142,6 +144,7 @@ export default { ...@@ -142,6 +144,7 @@ export default {
142 this.formData.ids = arr; 144 this.formData.ids = arr;
143 if (this.formData.fltNo && this.formData.fltDate) { 145 if (this.formData.fltNo && this.formData.fltDate) {
144 allocationFlight(this.formData).then((res) => { 146 allocationFlight(this.formData).then((res) => {
147 + this.loading = false;
145 //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg 148 //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg
146 if (res.code === 200) { 149 if (res.code === 200) {
147 this.$message({ 150 this.$message({
...@@ -149,7 +152,6 @@ export default { ...@@ -149,7 +152,6 @@ export default {
149 type: "success", 152 type: "success",
150 }); 153 });
151 this.cleaerForm(); 154 this.cleaerForm();
152 - this.loading = false;
153 this.$emit("dialogBeforeClose", { close: false, reload: true }); 155 this.$emit("dialogBeforeClose", { close: false, reload: true });
154 } else if (res.code === 202) { 156 } else if (res.code === 202) {
155 MessageBox.confirm(res.msg, "提示", { 157 MessageBox.confirm(res.msg, "提示", {
...@@ -173,7 +175,6 @@ export default { ...@@ -173,7 +175,6 @@ export default {
173 } 175 }
174 }); 176 });
175 this.cleaerForm(); 177 this.cleaerForm();
176 - this.loading = false;
177 this.$emit("dialogBeforeClose", { close: false, reload: true }); 178 this.$emit("dialogBeforeClose", { close: false, reload: true });
178 }) 179 })
179 .catch(() => { 180 .catch(() => {
...@@ -183,7 +184,6 @@ export default { ...@@ -183,7 +184,6 @@ export default {
183 type: "success", 184 type: "success",
184 }); 185 });
185 this.cleaerForm(); 186 this.cleaerForm();
186 - this.loading = false;
187 this.$emit("dialogBeforeClose", { 187 this.$emit("dialogBeforeClose", {
188 close: false, 188 close: false,
189 reload: true, 189 reload: true,
...@@ -209,6 +209,7 @@ export default { ...@@ -209,6 +209,7 @@ export default {
209 }, 209 },
210 dialogBeforeClose() { 210 dialogBeforeClose() {
211 this.cleaerForm(); 211 this.cleaerForm();
212 + this.$refs['form'].clearValidate();
212 this.$emit("dialogBeforeClose", { close: false, reload: true }); 213 this.$emit("dialogBeforeClose", { close: false, reload: true });
213 }, 214 },
214 formatter(row, column, cellValue, index){ 215 formatter(row, column, cellValue, index){
......
...@@ -232,15 +232,21 @@ ...@@ -232,15 +232,21 @@
232 </el-form> 232 </el-form>
233 <Tables 233 <Tables
234 ref="newTables" 234 ref="newTables"
235 + ductName="cargo"
235 :data="tableData" 236 :data="tableData"
236 :headerData="tableHeader" 237 :headerData="tableHeader"
238 + :infoData="tableHeader"
239 + :selection="true"
237 :totalCount="totalCount" 240 :totalCount="totalCount"
238 :loading="tableLoading" 241 :loading="tableLoading"
239 :limitSize="limitSize" 242 :limitSize="limitSize"
240 :limitStart="limitStart" 243 :limitStart="limitStart"
241 :page="page" 244 :page="page"
242 :shiftKey="shiftKey" 245 :shiftKey="shiftKey"
246 + :infoShow="false"
247 + :pageSizes="[100]"
243 :height="tableHeight" 248 :height="tableHeight"
249 + @sizeChange="sizeChange"
244 @tableSelect="tableSelect" 250 @tableSelect="tableSelect"
245 @tableSelectAll="tableSelectAll" 251 @tableSelectAll="tableSelectAll"
246 @currentChange="currentChange" 252 @currentChange="currentChange"
...@@ -288,27 +294,6 @@ export default { ...@@ -288,27 +294,6 @@ export default {
288 }, //表单数据 294 }, //表单数据
289 tableHeader: [ 295 tableHeader: [
290 { 296 {
291 - type: "selection",
292 - name: "",
293 - value: "",
294 - width: "50",
295 - align: "center",
296 - sorTable: false,
297 - fixed: true,
298 - disabled:true
299 - },
300 - {
301 - type: "index",
302 - name: "",
303 - value: "",
304 - width: "50",
305 - align: "center",
306 - sorTable: false,
307 - fixed: false,
308 - disabled:true
309 - },
310 - {
311 - type: "",
312 name: "口岸代码", 297 name: "口岸代码",
313 value: "portName", 298 value: "portName",
314 width: "120", 299 width: "120",
...@@ -318,7 +303,6 @@ export default { ...@@ -318,7 +303,6 @@ export default {
318 disabled:true 303 disabled:true
319 }, 304 },
320 { 305 {
321 - type: "",
322 name: "取件日期", 306 name: "取件日期",
323 value: "pickUpDate", 307 value: "pickUpDate",
324 width: "120", 308 width: "120",
...@@ -328,7 +312,6 @@ export default { ...@@ -328,7 +312,6 @@ export default {
328 disabled:true 312 disabled:true
329 }, 313 },
330 { 314 {
331 - type: "",
332 name: "取件扫描号", 315 name: "取件扫描号",
333 value: "pickUpScanNo", 316 value: "pickUpScanNo",
334 width: "120", 317 width: "120",
...@@ -338,7 +321,6 @@ export default { ...@@ -338,7 +321,6 @@ export default {
338 disabled:true 321 disabled:true
339 }, 322 },
340 { 323 {
341 - type: "",
342 name: "站点", 324 name: "站点",
343 value: "siteName", 325 value: "siteName",
344 width: "80", 326 width: "80",
...@@ -348,7 +330,6 @@ export default { ...@@ -348,7 +330,6 @@ export default {
348 disabled:true 330 disabled:true
349 }, 331 },
350 { 332 {
351 - type: "",
352 name: "运单号", 333 name: "运单号",
353 value: "waybillNo", 334 value: "waybillNo",
354 width: "150", 335 width: "150",
...@@ -358,7 +339,6 @@ export default { ...@@ -358,7 +339,6 @@ export default {
358 disabled:true 339 disabled:true
359 }, 340 },
360 { 341 {
361 - type: "",
362 name: "总单号", 342 name: "总单号",
363 value: "totalWaybillNo", 343 value: "totalWaybillNo",
364 width: "150", 344 width: "150",
...@@ -368,7 +348,6 @@ export default { ...@@ -368,7 +348,6 @@ export default {
368 disabled:true 348 disabled:true
369 }, 349 },
370 { 350 {
371 - type: "",
372 name: "服务类型", 351 name: "服务类型",
373 value: "serviceTypeName", 352 value: "serviceTypeName",
374 width: "100", 353 width: "100",
...@@ -378,7 +357,6 @@ export default { ...@@ -378,7 +357,6 @@ export default {
378 disabled:true 357 disabled:true
379 }, 358 },
380 { 359 {
381 - type: "",
382 name: "服务代码", 360 name: "服务代码",
383 value: "serviceCode", 361 value: "serviceCode",
384 width: "90", 362 width: "90",
...@@ -388,7 +366,6 @@ export default { ...@@ -388,7 +366,6 @@ export default {
388 disabled:true 366 disabled:true
389 }, 367 },
390 { 368 {
391 - type: "",
392 name: "URSA", 369 name: "URSA",
393 value: "ursa", 370 value: "ursa",
394 width: "100", 371 width: "100",
...@@ -398,7 +375,6 @@ export default { ...@@ -398,7 +375,6 @@ export default {
398 disabled:true 375 disabled:true
399 }, 376 },
400 { 377 {
401 - type: "",
402 name: "申报类型", 378 name: "申报类型",
403 value: "typeName", 379 value: "typeName",
404 width: "100", 380 width: "100",
...@@ -408,7 +384,6 @@ export default { ...@@ -408,7 +384,6 @@ export default {
408 disabled:true 384 disabled:true
409 }, 385 },
410 { 386 {
411 - type: "",
412 name: "HandlingCode", 387 name: "HandlingCode",
413 value: "handingCode", 388 value: "handingCode",
414 width: "150", 389 width: "150",
...@@ -418,7 +393,6 @@ export default { ...@@ -418,7 +393,6 @@ export default {
418 disabled:true 393 disabled:true
419 }, 394 },
420 { 395 {
421 - type: "",
422 name: "subcategory", 396 name: "subcategory",
423 value: "subCategory", 397 value: "subCategory",
424 width: "150", 398 width: "150",
...@@ -428,7 +402,6 @@ export default { ...@@ -428,7 +402,6 @@ export default {
428 disabled:true 402 disabled:true
429 }, 403 },
430 { 404 {
431 - type: "",
432 name: "件数", 405 name: "件数",
433 value: "qty", 406 value: "qty",
434 width: "80", 407 width: "80",
...@@ -438,7 +411,6 @@ export default { ...@@ -438,7 +411,6 @@ export default {
438 disabled:true 411 disabled:true
439 }, 412 },
440 { 413 {
441 - type: "",
442 name: "实际重量", 414 name: "实际重量",
443 value: "actualWeight", 415 value: "actualWeight",
444 width: "100", 416 width: "100",
...@@ -448,7 +420,6 @@ export default { ...@@ -448,7 +420,6 @@ export default {
448 disabled:true 420 disabled:true
449 }, 421 },
450 { 422 {
451 - type: "",
452 name: "收件人国家代码", 423 name: "收件人国家代码",
453 value: "consigneeCountry", 424 value: "consigneeCountry",
454 width: "150", 425 width: "150",
...@@ -458,7 +429,6 @@ export default { ...@@ -458,7 +429,6 @@ export default {
458 disabled:true 429 disabled:true
459 }, 430 },
460 { 431 {
461 - type: "",
462 name: "品名描述", 432 name: "品名描述",
463 value: "nameDescription", 433 value: "nameDescription",
464 width: "100", 434 width: "100",
...@@ -468,7 +438,6 @@ export default { ...@@ -468,7 +438,6 @@ export default {
468 disabled:true 438 disabled:true
469 }, 439 },
470 { 440 {
471 - type: "",
472 name: "海关回执状态", 441 name: "海关回执状态",
473 value: "customsReceiptStatusName", 442 value: "customsReceiptStatusName",
474 width: "140", 443 width: "140",
...@@ -478,7 +447,6 @@ export default { ...@@ -478,7 +447,6 @@ export default {
478 disabled:true 447 disabled:true
479 }, 448 },
480 { 449 {
481 - type: "",
482 name: "预审状态", 450 name: "预审状态",
483 value: "preQualificationStatus", 451 value: "preQualificationStatus",
484 width: "100", 452 width: "100",
...@@ -488,7 +456,6 @@ export default { ...@@ -488,7 +456,6 @@ export default {
488 disabled:true 456 disabled:true
489 }, 457 },
490 { 458 {
491 - type: "",
492 name: "航班预审意见", 459 name: "航班预审意见",
493 value: "caPretrialOpinion", 460 value: "caPretrialOpinion",
494 width: "140", 461 width: "140",
...@@ -498,7 +465,6 @@ export default { ...@@ -498,7 +465,6 @@ export default {
498 disabled:true 465 disabled:true
499 }, 466 },
500 { 467 {
501 - type: "",
502 name: "货物状态", 468 name: "货物状态",
503 value: "statusName", 469 value: "statusName",
504 width: "100", 470 width: "100",
...@@ -508,7 +474,6 @@ export default { ...@@ -508,7 +474,6 @@ export default {
508 disabled:true 474 disabled:true
509 }, 475 },
510 { 476 {
511 - type: "",
512 name: "终配航班号", 477 name: "终配航班号",
513 value: "finalFlightNo", 478 value: "finalFlightNo",
514 width: "130", 479 width: "130",
...@@ -518,7 +483,6 @@ export default { ...@@ -518,7 +483,6 @@ export default {
518 disabled:true 483 disabled:true
519 }, 484 },
520 { 485 {
521 - type: "",
522 name: "终配航班日期", 486 name: "终配航班日期",
523 value: "finalFlightTime", 487 value: "finalFlightTime",
524 width: "150", 488 width: "150",
...@@ -528,7 +492,6 @@ export default { ...@@ -528,7 +492,6 @@ export default {
528 disabled:true 492 disabled:true
529 }, 493 },
530 { 494 {
531 - type: "",
532 name: "二配航班号", 495 name: "二配航班号",
533 value: "twoMatchFlightNo", 496 value: "twoMatchFlightNo",
534 width: "130", 497 width: "130",
...@@ -538,7 +501,6 @@ export default { ...@@ -538,7 +501,6 @@ export default {
538 disabled:true 501 disabled:true
539 }, 502 },
540 { 503 {
541 - type: "",
542 name: "二配航班日期", 504 name: "二配航班日期",
543 value: "twoMatchFlightTime", 505 value: "twoMatchFlightTime",
544 width: "150", 506 width: "150",
...@@ -548,7 +510,6 @@ export default { ...@@ -548,7 +510,6 @@ export default {
548 disabled:true 510 disabled:true
549 }, 511 },
550 { 512 {
551 - type: "",
552 name: "预配航班号", 513 name: "预配航班号",
553 value: "preplanFlightNo", 514 value: "preplanFlightNo",
554 width: "130", 515 width: "130",
...@@ -558,7 +519,6 @@ export default { ...@@ -558,7 +519,6 @@ export default {
558 disabled:true 519 disabled:true
559 }, 520 },
560 { 521 {
561 - type: "",
562 name: "预配航班日期", 522 name: "预配航班日期",
563 value: "preplanFlightTime", 523 value: "preplanFlightTime",
564 width: "150", 524 width: "150",
...@@ -568,7 +528,6 @@ export default { ...@@ -568,7 +528,6 @@ export default {
568 disabled:true 528 disabled:true
569 }, 529 },
570 { 530 {
571 - type: "",
572 name: "ACCS原航班号", 531 name: "ACCS原航班号",
573 value: "fltNoAccs", 532 value: "fltNoAccs",
574 width: "140", 533 width: "140",
...@@ -578,7 +537,6 @@ export default { ...@@ -578,7 +537,6 @@ export default {
578 disabled:true 537 disabled:true
579 }, 538 },
580 { 539 {
581 - type: "",
582 name: "ACCS原航班日期", 540 name: "ACCS原航班日期",
583 value: "fltDateAccs", 541 value: "fltDateAccs",
584 width: "150", 542 width: "150",
...@@ -588,7 +546,6 @@ export default { ...@@ -588,7 +546,6 @@ export default {
588 disabled:true 546 disabled:true
589 }, 547 },
590 { 548 {
591 - type: "",
592 name: "ACCS原航线", 549 name: "ACCS原航线",
593 value: "accsFlightRoute", 550 value: "accsFlightRoute",
594 width: "150", 551 width: "150",
...@@ -598,7 +555,6 @@ export default { ...@@ -598,7 +555,6 @@ export default {
598 disabled:true 555 disabled:true
599 }, 556 },
600 { 557 {
601 - type: "",
602 name: "是否RDE手工录入", 558 name: "是否RDE手工录入",
603 value: "manualRde", 559 value: "manualRde",
604 width: "170", 560 width: "170",
...@@ -608,7 +564,6 @@ export default { ...@@ -608,7 +564,6 @@ export default {
608 disabled:true 564 disabled:true
609 }, 565 },
610 { 566 {
611 - type: "",
612 name: "是否自动", 567 name: "是否自动",
613 value: "cargoRulesStatus", 568 value: "cargoRulesStatus",
614 width: "100", 569 width: "100",
...@@ -618,7 +573,6 @@ export default { ...@@ -618,7 +573,6 @@ export default {
618 disabled:true 573 disabled:true
619 }, 574 },
620 { 575 {
621 - type: "",
622 name: "发件人账号", 576 name: "发件人账号",
623 value: "shipperAccount", 577 value: "shipperAccount",
624 width: "150", 578 width: "150",
...@@ -628,7 +582,6 @@ export default { ...@@ -628,7 +582,6 @@ export default {
628 disabled:true 582 disabled:true
629 }, 583 },
630 { 584 {
631 - type: "",
632 name: "发件公司中文名称", 585 name: "发件公司中文名称",
633 value: "shipperCompany", 586 value: "shipperCompany",
634 width: "150", 587 width: "150",
...@@ -638,7 +591,6 @@ export default { ...@@ -638,7 +591,6 @@ export default {
638 disabled:true 591 disabled:true
639 }, 592 },
640 { 593 {
641 - type: "",
642 name: "始发地城市名称", 594 name: "始发地城市名称",
643 value: "originCity", 595 value: "originCity",
644 width: "150", 596 width: "150",
...@@ -648,7 +600,6 @@ export default { ...@@ -648,7 +600,6 @@ export default {
648 disabled:true 600 disabled:true
649 }, 601 },
650 { 602 {
651 - type: "",
652 name: "收件地", 603 name: "收件地",
653 value: "destinationSiteName", 604 value: "destinationSiteName",
654 width: "90", 605 width: "90",
...@@ -658,7 +609,6 @@ export default { ...@@ -658,7 +609,6 @@ export default {
658 disabled:true 609 disabled:true
659 }, 610 },
660 { 611 {
661 - type: "",
662 name: "尺寸", 612 name: "尺寸",
663 value: "sizeStr", 613 value: "sizeStr",
664 width: "80", 614 width: "80",
...@@ -668,7 +618,6 @@ export default { ...@@ -668,7 +618,6 @@ export default {
668 disabled:true 618 disabled:true
669 }, 619 },
670 { 620 {
671 - type: "",
672 name: "大货预审意见（是否可以配置航班）", 621 name: "大货预审意见（是否可以配置航班）",
673 value: "bigPretrialOpinion", 622 value: "bigPretrialOpinion",
674 width: "250", 623 width: "250",
...@@ -678,7 +627,6 @@ export default { ...@@ -678,7 +627,6 @@ export default {
678 disabled:true 627 disabled:true
679 }, 628 },
680 { 629 {
681 - type: "",
682 name: "大货预审时间", 630 name: "大货预审时间",
683 value: "bigPretrialTime", 631 value: "bigPretrialTime",
684 width: "150", 632 width: "150",
...@@ -688,7 +636,6 @@ export default { ...@@ -688,7 +636,6 @@ export default {
688 disabled:true 636 disabled:true
689 }, 637 },
690 { 638 {
691 - type: "",
692 name: "海关回执时间", 639 name: "海关回执时间",
693 value: "customsReceiptTime", 640 value: "customsReceiptTime",
694 width: "150", 641 width: "150",
...@@ -698,7 +645,6 @@ export default { ...@@ -698,7 +645,6 @@ export default {
698 disabled:true 645 disabled:true
699 }, 646 },
700 { 647 {
701 - type: "",
702 name: "航班预审时间", 648 name: "航班预审时间",
703 value: "caPretrialTime", 649 value: "caPretrialTime",
704 width: "150", 650 width: "150",
...@@ -708,7 +654,6 @@ export default { ...@@ -708,7 +654,6 @@ export default {
708 disabled:true 654 disabled:true
709 }, 655 },
710 { 656 {
711 - type: "",
712 name: "创建人", 657 name: "创建人",
713 value: "createUserName", 658 value: "createUserName",
714 width: "90", 659 width: "90",
...@@ -718,7 +663,6 @@ export default { ...@@ -718,7 +663,6 @@ export default {
718 disabled:true 663 disabled:true
719 }, 664 },
720 { 665 {
721 - type: "",
722 name: "创建时间", 666 name: "创建时间",
723 value: "createTime", 667 value: "createTime",
724 width: "120", 668 width: "120",
...@@ -928,6 +872,10 @@ export default { ...@@ -928,6 +872,10 @@ export default {
928 item.index = index; 872 item.index = index;
929 }); 873 });
930 }, 874 },
875 + sizeChange(val){
876 + this.limitSize = val
877 + this.select(0);
878 + },
931 // 导出表格 879 // 导出表格
932 xlse(page) { 880 xlse(page) {
933 this.progress = 1; 881 this.progress = 1;
......
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
19 default-expand-all 19 default-expand-all
20 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" 20 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
21 > 21 >
22 + <template v-for="(item, index) in tableHeader">
22 <el-table-column 23 <el-table-column
23 - v-for="(item, index) in tableHeader" 24 + v-if="item.value === 'menuType'"
24 :prop="item.value" 25 :prop="item.value"
25 :label="item.name" 26 :label="item.name"
26 :key="index" 27 :key="index"
...@@ -31,11 +32,26 @@ ...@@ -31,11 +32,26 @@
31 :formatter="formatter" 32 :formatter="formatter"
32 > 33 >
33 <template slot-scope="scope"> 34 <template slot-scope="scope">
34 - <el-tag v-if="item.value === 'menuType'" :type="scope.row.menuType === 'B'?'':'success'" 35 + <el-tag
35 - disable-transitions>{{scope.row.menuType === 'B'?'按钮':'菜单'}}</el-tag> 36 + :type="scope.row.menuType === 'B' ? '' : 'success'"
36 - <span v-else>{{scope.row.title}}</span> 37 + disable-transitions
38 + >{{ scope.row.menuType === "B" ? "按钮" : "菜单" }}</el-tag
39 + >
37 </template> 40 </template>
38 </el-table-column> 41 </el-table-column>
42 + <el-table-column
43 + v-else
44 + :prop="item.value"
45 + :label="item.name"
46 + :key="index"
47 + :align="item.align"
48 + header-align="center"
49 + showOverflowTooltip
50 + :width="item.width"
51 + :formatter="formatter"
52 + >
53 + </el-table-column>
54 + </template>
39 55
40 <el-table-column 56 <el-table-column
41 header-align="center" 57 header-align="center"
...@@ -112,7 +128,7 @@ import dictLabels from "@/assets/languages/dictLabels.js"; ...@@ -112,7 +128,7 @@ import dictLabels from "@/assets/languages/dictLabels.js";
112 import Drawer from "./drawer.vue"; 128 import Drawer from "./drawer.vue";
113 import { MessageBox } from "element-ui"; 129 import { MessageBox } from "element-ui";
114 export default { 130 export default {
115 - name:"MenuConfig", 131 + name: "MenuConfig",
116 components: { 132 components: {
117 Drawer, 133 Drawer,
118 }, 134 },
...@@ -120,13 +136,12 @@ export default { ...@@ -120,13 +136,12 @@ export default {
120 return { 136 return {
121 drawer: false, 137 drawer: false,
122 menuFormDisabled: false, 138 menuFormDisabled: false,
123 - loading:false, 139 + loading: false,
124 drawerTitle: "", 140 drawerTitle: "",
125 menuData: {}, 141 menuData: {},
126 data: [], 142 data: [],
127 tableHeader: [ 143 tableHeader: [
128 { 144 {
129 - type: "",
130 name: "菜单名", 145 name: "菜单名",
131 value: "title", 146 value: "title",
132 width: "200", 147 width: "200",
...@@ -134,7 +149,6 @@ export default { ...@@ -134,7 +149,6 @@ export default {
134 sorTable: false, 149 sorTable: false,
135 }, 150 },
136 { 151 {
137 - type: "",
138 name: "菜单类型", 152 name: "菜单类型",
139 value: "menuType", 153 value: "menuType",
140 width: "100", 154 width: "100",
...@@ -142,7 +156,6 @@ export default { ...@@ -142,7 +156,6 @@ export default {
142 sortable: false, 156 sortable: false,
143 }, 157 },
144 { 158 {
145 - type: "",
146 name: "权限标识", 159 name: "权限标识",
147 value: "permissionKey", 160 value: "permissionKey",
148 width: "auto", 161 width: "auto",
...@@ -150,7 +163,6 @@ export default { ...@@ -150,7 +163,6 @@ export default {
150 sortable: false, 163 sortable: false,
151 }, 164 },
152 { 165 {
153 - type: "",
154 name: "菜单状态", 166 name: "菜单状态",
155 value: "status", 167 value: "status",
156 width: "100", 168 width: "100",
...@@ -158,7 +170,6 @@ export default { ...@@ -158,7 +170,6 @@ export default {
158 sorTable: false, 170 sorTable: false,
159 }, 171 },
160 { 172 {
161 - type: "",
162 name: "菜单路由", 173 name: "菜单路由",
163 value: "path", 174 value: "path",
164 width: "auto", 175 width: "auto",
...@@ -169,15 +180,15 @@ export default { ...@@ -169,15 +180,15 @@ export default {
169 }; 180 };
170 }, 181 },
171 created() { 182 created() {
172 - if(this.$store.state.tagsView.cachedViews.length == 0){ 183 + if (this.$store.state.tagsView.cachedViews.length == 0) {
173 this.menuAll(); 184 this.menuAll();
174 } 185 }
175 }, 186 },
176 - activated(){ 187 + activated() {
177 this.menuAll(); 188 this.menuAll();
178 }, 189 },
179 - deactivated(){ 190 + deactivated() {
180 - this.data = [] 191 + this.data = [];
181 }, 192 },
182 methods: { 193 methods: {
183 addMenu() { 194 addMenu() {
...@@ -202,7 +213,8 @@ export default { ...@@ -202,7 +213,8 @@ export default {
202 //表格数据 213 //表格数据
203 menuAll() { 214 menuAll() {
204 this.loading = true; 215 this.loading = true;
205 - getAllAuth().then((res) => { 216 + getAllAuth()
217 + .then((res) => {
206 this.loading = false; 218 this.loading = false;
207 if (res.code === 200) { 219 if (res.code === 200) {
208 res.data.length > 0 220 res.data.length > 0
...@@ -217,7 +229,8 @@ export default { ...@@ -217,7 +229,8 @@ export default {
217 type: "warning", 229 type: "warning",
218 }); 230 });
219 } 231 }
220 - }).catch(()=>{ 232 + })
233 + .catch(() => {
221 this.loading = false; 234 this.loading = false;
222 }); 235 });
223 }, 236 },
...@@ -232,7 +245,7 @@ export default { ...@@ -232,7 +245,7 @@ export default {
232 message: "操作成功", 245 message: "操作成功",
233 type: "success", 246 type: "success",
234 }); 247 });
235 - location.reload() 248 + location.reload();
236 } else { 249 } else {
237 this.$message({ 250 this.$message({
238 message: res.msg, 251 message: res.msg,
...@@ -282,9 +295,9 @@ export default { ...@@ -282,9 +295,9 @@ export default {
282 }, 295 },
283 296
284 formatter(row, column, cellValue, index) { 297 formatter(row, column, cellValue, index) {
285 - if (dictLabels[column.property]) { 298 + if (dictLabels["menu"][column.property]) {
286 - if (dictLabels[column.property][cellValue]) { 299 + if (dictLabels["menu"][column.property][cellValue]) {
287 - return dictLabels[column.property][cellValue]; 300 + return dictLabels["menu"][column.property][cellValue];
288 } 301 }
289 } 302 }
290 return cellValue; 303 return cellValue;
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
65 :props="defaultProps" 65 :props="defaultProps"
66 :show-checkbox="true" 66 :show-checkbox="true"
67 :default-checked-keys="roleData.menuIds" 67 :default-checked-keys="roleData.menuIds"
68 - check-strictly
69 accordion 68 accordion
70 > 69 >
71 </el-tree> 70 </el-tree>
...@@ -138,7 +137,7 @@ export default { ...@@ -138,7 +137,7 @@ export default {
138 getAllAuth() 137 getAllAuth()
139 .then((res) => { 138 .then((res) => {
140 if (res.code === 200) { 139 if (res.code === 200) {
141 - this.treeData = res.data; 140 + this.treeData = this.treeDataInfo(res.data);
142 } else { 141 } else {
143 this.$message({ 142 this.$message({
144 message: res.msg, 143 message: res.msg,
...@@ -150,22 +149,22 @@ export default { ...@@ -150,22 +149,22 @@ export default {
150 console.log(err); 149 console.log(err);
151 }); 150 });
152 }, 151 },
153 - watch:{ 152 + watch: {
154 - roleFormDisabled(){ 153 + roleFormDisabled() {
155 - this.treeData = this.treeDisabled(this.treeData) 154 + this.treeData = this.treeDisabled(this.treeData);
156 }, 155 },
157 - drawer(val,oldVal){ 156 + drawer(val, oldVal) {
158 - if(val){ 157 + if (val) {
159 this.roleForm = this.roleData; 158 this.roleForm = this.roleData;
160 - }else{ 159 + } else {
161 this.loading = false; 160 this.loading = false;
162 } 161 }
163 - } 162 + },
164 }, 163 },
165 methods: { 164 methods: {
166 //关闭 165 //关闭
167 handleClose() { 166 handleClose() {
168 - this.$refs['roleForm'].clearValidate(); 167 + this.$refs["roleForm"].clearValidate();
169 this.$emit("handleClose", false); 168 this.$emit("handleClose", false);
170 }, 169 },
171 170
...@@ -173,7 +172,11 @@ export default { ...@@ -173,7 +172,11 @@ export default {
173 submit() { 172 submit() {
174 let formData = {}; 173 let formData = {};
175 this.loading = true; 174 this.loading = true;
176 - formData.menuIdList = this.$refs.tree.getCheckedKeys(); 175 + let arr = [];
176 + arr = this.$refs.tree.getCheckedKeys().filter((item,index)=>{
177 + return this.$refs.tree.getCheckedKeys().indexOf(item) == index
178 + })
179 + formData.menuIdList = arr;
177 this.roleData ? (formData.id = this.roleData.id) : ""; 180 this.roleData ? (formData.id = this.roleData.id) : "";
178 formData.remark = this.roleForm.remark; 181 formData.remark = this.roleForm.remark;
179 formData.valid = this.roleForm.valid; 182 formData.valid = this.roleForm.valid;
...@@ -204,9 +207,24 @@ export default { ...@@ -204,9 +207,24 @@ export default {
204 let data = []; 207 let data = [];
205 val.forEach((item) => { 208 val.forEach((item) => {
206 item.disabled = this.roleFormDisabled; 209 item.disabled = this.roleFormDisabled;
207 - data.push(item) 210 + data.push(item);
211 + if (item.children && item.children.length) {
212 + item.children = this.treeDisabled(item.children);
213 + }
214 + });
215 + return data;
216 + },
217 +
218 + treeDataInfo(val) {
219 + let data = [];
220 + val.forEach((item) => {
221 + let menuItem = {};
222 + menuItem.id = item.id;
223 + menuItem.title = item.title;
224 + data.push(menuItem)
208 if (item.children && item.children.length) { 225 if (item.children && item.children.length) {
209 - item.children = this.treeDisabled(item.children) 226 + menuItem.children = this.treeDataInfo(item.children);
227 + menuItem.children.unshift({id:item.id,title:`${item.title}(菜单)`})
210 } 228 }
211 }); 229 });
212 return data; 230 return data;
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
28 <el-col :span="6"> 28 <el-col :span="6">
29 <el-form-item label="状态"> 29 <el-form-item label="状态">
30 <el-select v-model="formData.valid" placeholder="角色状态" clearable> 30 <el-select v-model="formData.valid" placeholder="角色状态" clearable>
31 - <el-option label="开启" value="1"> </el-option> 31 + <el-option label="启用" value="1"> </el-option>
32 - <el-option label="关闭" value="2"> </el-option> 32 + <el-option label="停用" value="2"> </el-option>
33 </el-select> 33 </el-select>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
...@@ -49,19 +49,21 @@ ...@@ -49,19 +49,21 @@
49 > 49 >
50 </div> 50 </div>
51 <Tables 51 <Tables
52 + ductName="role"
52 :data="data" 53 :data="data"
53 :headerData="tableHeader" 54 :headerData="tableHeader"
54 :infoData="tableHeader" 55 :infoData="tableHeader"
55 :totalCount="total" 56 :totalCount="total"
56 :limitSize="formData.size" 57 :limitSize="formData.size"
57 :page="formData.page" 58 :page="formData.page"
59 + :infoShow="false"
58 :pageSizes="[20,30,40,50]" 60 :pageSizes="[20,30,40,50]"
59 :loading="tableLoading" 61 :loading="tableLoading"
60 height="600" 62 height="600"
61 @sizeChange="sizeChange" 63 @sizeChange="sizeChange"
62 @currentChange="currentChange" 64 @currentChange="currentChange"
63 > 65 >
64 - <template> 66 + <template slot="optionColumn">
65 <el-table-column header-align="center" align="center" label="操作"> 67 <el-table-column header-align="center" align="center" label="操作">
66 <template slot-scope="scope"> 68 <template slot-scope="scope">
67 <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" 69 <el-button type="primary" size="mini" @click="buttonClick(scope, 0)"
...@@ -120,16 +122,6 @@ export default { ...@@ -120,16 +122,6 @@ export default {
120 data: [], //表格数据 122 data: [], //表格数据
121 tableHeader: [ 123 tableHeader: [
122 { 124 {
123 - type: "index",
124 - name: "",
125 - value: "",
126 - width: "",
127 - align: "center",
128 - sorTable: false,
129 - disabled:true
130 - },
131 - {
132 - type: "",
133 name: "角色名称", 125 name: "角色名称",
134 value: "name", 126 value: "name",
135 width: "150px", 127 width: "150px",
...@@ -138,7 +130,6 @@ export default { ...@@ -138,7 +130,6 @@ export default {
138 disabled:true 130 disabled:true
139 }, 131 },
140 { 132 {
141 - type: "",
142 name: "角色状态", 133 name: "角色状态",
143 value: "valid", 134 value: "valid",
144 width: "150px", 135 width: "150px",
...@@ -147,7 +138,6 @@ export default { ...@@ -147,7 +138,6 @@ export default {
147 disabled:true 138 disabled:true
148 }, 139 },
149 { 140 {
150 - type: "",
151 name: "创建人", 141 name: "创建人",
152 value: "createUserName", 142 value: "createUserName",
153 width: "150px", 143 width: "150px",
...@@ -156,7 +146,6 @@ export default { ...@@ -156,7 +146,6 @@ export default {
156 disabled:true 146 disabled:true
157 }, 147 },
158 { 148 {
159 - type: "",
160 name: "创建时间", 149 name: "创建时间",
161 value: "createTime", 150 value: "createTime",
162 width: "150px", 151 width: "150px",
...@@ -165,7 +154,6 @@ export default { ...@@ -165,7 +154,6 @@ export default {
165 disabled:true 154 disabled:true
166 }, 155 },
167 { 156 {
168 - type: "",
169 name: "修改时间", 157 name: "修改时间",
170 value: "updateTime", 158 value: "updateTime",
171 width: "150px", 159 width: "150px",
...@@ -174,7 +162,6 @@ export default { ...@@ -174,7 +162,6 @@ export default {
174 disabled:true 162 disabled:true
175 }, 163 },
176 { 164 {
177 - type: "",
178 name: "备注", 165 name: "备注",
179 value: "remark", 166 value: "remark",
180 width: "400px", 167 width: "400px",
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 <el-col :span="6"> 23 <el-col :span="6">
24 <el-form-item label="状态"> 24 <el-form-item label="状态">
25 <el-select placeholder="用户状态" v-model="formData.isValid" clearable> 25 <el-select placeholder="用户状态" v-model="formData.isValid" clearable>
26 - <el-option label="开启" value="1"> </el-option> 26 + <el-option label="启用" value="1"> </el-option>
27 - <el-option label="关闭" value="2"> </el-option> 27 + <el-option label="停用" value="2"> </el-option>
28 </el-select> 28 </el-select>
29 </el-form-item> 29 </el-form-item>
30 </el-col> 30 </el-col>
...@@ -44,18 +44,20 @@ ...@@ -44,18 +44,20 @@
44 > 44 >
45 </div> 45 </div>
46 <Tables 46 <Tables
47 + ductName="user"
47 :data="data" 48 :data="data"
48 :headerData="tableHeader" 49 :headerData="tableHeader"
49 :limitSize="formData.size" 50 :limitSize="formData.size"
50 :totalCount="total" 51 :totalCount="total"
51 :loading="loading" 52 :loading="loading"
52 :page="formData.page" 53 :page="formData.page"
54 + :infoShow="false"
53 :pageSizes="[20,30,40,50]" 55 :pageSizes="[20,30,40,50]"
54 height="600" 56 height="600"
55 @sizeChange="sizeChange" 57 @sizeChange="sizeChange"
56 @currentChange="currentChange" 58 @currentChange="currentChange"
57 > 59 >
58 - <template> 60 + <template slot="optionColumn">
59 <el-table-column 61 <el-table-column
60 header-align="center" 62 header-align="center"
61 align="center" 63 align="center"
...@@ -147,16 +149,6 @@ export default { ...@@ -147,16 +149,6 @@ export default {
147 }, //查询条件 149 }, //查询条件
148 tableHeader: [ 150 tableHeader: [
149 { 151 {
150 - type: "index",
151 - name: "",
152 - value: "",
153 - width: "",
154 - align: "center",
155 - sorTable: false,
156 - disabled:true
157 - },
158 - {
159 - type: "",
160 name: "员工号", 152 name: "员工号",
161 value: "loginName", 153 value: "loginName",
162 width: "150px", 154 width: "150px",
...@@ -165,7 +157,6 @@ export default { ...@@ -165,7 +157,6 @@ export default {
165 disabled:true 157 disabled:true
166 }, 158 },
167 { 159 {
168 - type: "",
169 name: "用户姓名", 160 name: "用户姓名",
170 value: "username", 161 value: "username",
171 width: "150px", 162 width: "150px",
...@@ -174,7 +165,6 @@ export default { ...@@ -174,7 +165,6 @@ export default {
174 disabled:true 165 disabled:true
175 }, 166 },
176 { 167 {
177 - type: "",
178 name: "所属口岸", 168 name: "所属口岸",
179 value: "portName", 169 value: "portName",
180 width: "150px", 170 width: "150px",
...@@ -183,7 +173,6 @@ export default { ...@@ -183,7 +173,6 @@ export default {
183 disabled:true 173 disabled:true
184 }, 174 },
185 { 175 {
186 - type: "",
187 name: "所属角色", 176 name: "所属角色",
188 value: "roleNames", 177 value: "roleNames",
189 width: "150px", 178 width: "150px",
...@@ -192,7 +181,6 @@ export default { ...@@ -192,7 +181,6 @@ export default {
192 disabled:true 181 disabled:true
193 }, 182 },
194 { 183 {
195 - type: "",
196 name: "电子邮箱", 184 name: "电子邮箱",
197 value: "email", 185 value: "email",
198 width: "150px", 186 width: "150px",
...@@ -201,16 +189,14 @@ export default { ...@@ -201,16 +189,14 @@ export default {
201 disabled:true 189 disabled:true
202 }, 190 },
203 { 191 {
204 - type: "",
205 name: "用户状态", 192 name: "用户状态",
206 value: "isValid", 193 value: "isValid",
207 width: "100px", 194 width: "100px",
208 align: "center", 195 align: "center",
209 sorTable: false, 196 sorTable: false,
210 - disabled:true 197 + disabled:true,
211 }, 198 },
212 { 199 {
213 - type: "",
214 name: "修改时间", 200 name: "修改时间",
215 value: "updateTime", 201 value: "updateTime",
216 width: "150px", 202 width: "150px",
...@@ -219,7 +205,6 @@ export default { ...@@ -219,7 +205,6 @@ export default {
219 disabled:true 205 disabled:true
220 }, 206 },
221 { 207 {
222 - type: "",
223 name: "备注", 208 name: "备注",
224 value: "remark", 209 value: "remark",
225 width: "150px", 210 width: "150px",
......