朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 bbb06507eead1fcec1fa057b6caad152c455473f 2 个父辈 c7d30d55 4c56d789

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 16 个修改的文件 包含 459 行增加 和 307 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 <head> 4 <head>
5 <meta charset="utf-8"> 5 <meta charset="utf-8">
6 - <title>易通快速通关申报管理系统</title> 6 + <title>易通链快速通关申报平台</title>
7 <link rel="shortcut icon" type="image/x-icon" href="favicon.ico"> 7 <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
8 </head> 8 </head>
9 9
@@ -2276,49 +2276,57 @@ @@ -2276,49 +2276,57 @@
2276 "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" 2276 "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
2277 }, 2277 },
2278 "cliui": { 2278 "cliui": {
2279 - "version": "3.2.0",  
2280 - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",  
2281 - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", 2279 + "version": "5.0.0",
  2280 + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
  2281 + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
2282 "dev": true, 2282 "dev": true,
2283 "requires": { 2283 "requires": {
2284 - "string-width": "^1.0.1",  
2285 - "strip-ansi": "^3.0.1",  
2286 - "wrap-ansi": "^2.0.0" 2284 + "string-width": "^3.1.0",
  2285 + "strip-ansi": "^5.2.0",
  2286 + "wrap-ansi": "^5.1.0"
2287 }, 2287 },
2288 "dependencies": { 2288 "dependencies": {
2289 - "ansi-regex": {  
2290 - "version": "2.1.1",  
2291 - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",  
2292 - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", 2289 + "emoji-regex": {
  2290 + "version": "7.0.3",
  2291 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
  2292 + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
2293 "dev": true 2293 "dev": true
2294 }, 2294 },
2295 "is-fullwidth-code-point": { 2295 "is-fullwidth-code-point": {
2296 - "version": "1.0.0",  
2297 - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",  
2298 - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", 2296 + "version": "2.0.0",
  2297 + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
  2298 + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
  2299 + "dev": true
  2300 + },
  2301 + "string-width": {
  2302 + "version": "3.1.0",
  2303 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
  2304 + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
2299 "dev": true, 2305 "dev": true,
2300 "requires": { 2306 "requires": {
2301 - "number-is-nan": "^1.0.0" 2307 + "emoji-regex": "^7.0.1",
  2308 + "is-fullwidth-code-point": "^2.0.0",
  2309 + "strip-ansi": "^5.1.0"
2302 } 2310 }
2303 }, 2311 },
2304 - "string-width": {  
2305 - "version": "1.0.2",  
2306 - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",  
2307 - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", 2312 + "strip-ansi": {
  2313 + "version": "5.2.0",
  2314 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
  2315 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
2308 "dev": true, 2316 "dev": true,
2309 "requires": { 2317 "requires": {
2310 - "code-point-at": "^1.0.0",  
2311 - "is-fullwidth-code-point": "^1.0.0",  
2312 - "strip-ansi": "^3.0.0" 2318 + "ansi-regex": "^4.1.0"
2313 } 2319 }
2314 }, 2320 },
2315 - "strip-ansi": {  
2316 - "version": "3.0.1",  
2317 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",  
2318 - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", 2321 + "wrap-ansi": {
  2322 + "version": "5.1.0",
  2323 + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
  2324 + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
2319 "dev": true, 2325 "dev": true,
2320 "requires": { 2326 "requires": {
2321 - "ansi-regex": "^2.0.0" 2327 + "ansi-styles": "^3.2.0",
  2328 + "string-width": "^3.0.0",
  2329 + "strip-ansi": "^5.0.0"
2322 } 2330 }
2323 } 2331 }
2324 } 2332 }
@@ -4846,9 +4854,9 @@ @@ -4846,9 +4854,9 @@
4846 } 4854 }
4847 }, 4855 },
4848 "globule": { 4856 "globule": {
4849 - "version": "1.2.1",  
4850 - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",  
4851 - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", 4857 + "version": "1.3.2",
  4858 + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
  4859 + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
4852 "dev": true, 4860 "dev": true,
4853 "requires": { 4861 "requires": {
4854 "glob": "~7.1.1", 4862 "glob": "~7.1.1",
@@ -5249,9 +5257,9 @@ @@ -5249,9 +5257,9 @@
5249 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" 5257 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
5250 }, 5258 },
5251 "in-publish": { 5259 "in-publish": {
5252 - "version": "2.0.0",  
5253 - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",  
5254 - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", 5260 + "version": "2.0.1",
  5261 + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
  5262 + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
5255 "dev": true 5263 "dev": true
5256 }, 5264 },
5257 "indent-string": { 5265 "indent-string": {
@@ -6023,9 +6031,9 @@ @@ -6023,9 +6031,9 @@
6023 }, 6031 },
6024 "dependencies": { 6032 "dependencies": {
6025 "minimist": { 6033 "minimist": {
6026 - "version": "1.2.0",  
6027 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
6028 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 6034 + "version": "1.2.5",
  6035 + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
  6036 + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
6029 "dev": true 6037 "dev": true
6030 } 6038 }
6031 } 6039 }
@@ -6377,9 +6385,9 @@ @@ -6377,9 +6385,9 @@
6377 } 6385 }
6378 }, 6386 },
6379 "node-sass": { 6387 "node-sass": {
6380 - "version": "4.12.0",  
6381 - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",  
6382 - "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", 6388 + "version": "4.14.1",
  6389 + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
  6390 + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
6383 "dev": true, 6391 "dev": true,
6384 "requires": { 6392 "requires": {
6385 "async-foreach": "^0.1.3", 6393 "async-foreach": "^0.1.3",
@@ -6389,14 +6397,14 @@ @@ -6389,14 +6397,14 @@
6389 "get-stdin": "^4.0.1", 6397 "get-stdin": "^4.0.1",
6390 "glob": "^7.0.3", 6398 "glob": "^7.0.3",
6391 "in-publish": "^2.0.0", 6399 "in-publish": "^2.0.0",
6392 - "lodash": "^4.17.11", 6400 + "lodash": "^4.17.15",
6393 "meow": "^3.7.0", 6401 "meow": "^3.7.0",
6394 "mkdirp": "^0.5.1", 6402 "mkdirp": "^0.5.1",
6395 "nan": "^2.13.2", 6403 "nan": "^2.13.2",
6396 "node-gyp": "^3.8.0", 6404 "node-gyp": "^3.8.0",
6397 "npmlog": "^4.0.0", 6405 "npmlog": "^4.0.0",
6398 "request": "^2.88.0", 6406 "request": "^2.88.0",
6399 - "sass-graph": "^2.2.4", 6407 + "sass-graph": "2.2.5",
6400 "stdout-stream": "^1.4.0", 6408 "stdout-stream": "^1.4.0",
6401 "true-case-path": "^1.0.2" 6409 "true-case-path": "^1.0.2"
6402 }, 6410 },
@@ -11461,15 +11469,15 @@ @@ -11461,15 +11469,15 @@
11461 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" 11469 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
11462 }, 11470 },
11463 "sass-graph": { 11471 "sass-graph": {
11464 - "version": "2.2.4",  
11465 - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",  
11466 - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", 11472 + "version": "2.2.5",
  11473 + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
  11474 + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
11467 "dev": true, 11475 "dev": true,
11468 "requires": { 11476 "requires": {
11469 "glob": "^7.0.0", 11477 "glob": "^7.0.0",
11470 "lodash": "^4.0.0", 11478 "lodash": "^4.0.0",
11471 "scss-tokenizer": "^0.2.3", 11479 "scss-tokenizer": "^0.2.3",
11472 - "yargs": "^7.0.0" 11480 + "yargs": "^13.3.2"
11473 } 11481 }
11474 }, 11482 },
11475 "sass-loader": { 11483 "sass-loader": {
@@ -13472,88 +13480,138 @@ @@ -13472,88 +13480,138 @@
13472 "dev": true 13480 "dev": true
13473 }, 13481 },
13474 "yargs": { 13482 "yargs": {
13475 - "version": "7.1.0",  
13476 - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",  
13477 - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", 13483 + "version": "13.3.2",
  13484 + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
  13485 + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
13478 "dev": true, 13486 "dev": true,
13479 "requires": { 13487 "requires": {
13480 - "camelcase": "^3.0.0",  
13481 - "cliui": "^3.2.0",  
13482 - "decamelize": "^1.1.1",  
13483 - "get-caller-file": "^1.0.1",  
13484 - "os-locale": "^1.4.0",  
13485 - "read-pkg-up": "^1.0.1", 13488 + "cliui": "^5.0.0",
  13489 + "find-up": "^3.0.0",
  13490 + "get-caller-file": "^2.0.1",
13486 "require-directory": "^2.1.1", 13491 "require-directory": "^2.1.1",
13487 - "require-main-filename": "^1.0.1", 13492 + "require-main-filename": "^2.0.0",
13488 "set-blocking": "^2.0.0", 13493 "set-blocking": "^2.0.0",
13489 - "string-width": "^1.0.2",  
13490 - "which-module": "^1.0.0",  
13491 - "y18n": "^3.2.1",  
13492 - "yargs-parser": "^5.0.0" 13494 + "string-width": "^3.0.0",
  13495 + "which-module": "^2.0.0",
  13496 + "y18n": "^4.0.0",
  13497 + "yargs-parser": "^13.1.2"
13493 }, 13498 },
13494 "dependencies": { 13499 "dependencies": {
13495 - "ansi-regex": {  
13496 - "version": "2.1.1",  
13497 - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",  
13498 - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", 13500 + "emoji-regex": {
  13501 + "version": "7.0.3",
  13502 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
  13503 + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
13499 "dev": true 13504 "dev": true
13500 }, 13505 },
13501 - "camelcase": { 13506 + "find-up": {
13502 "version": "3.0.0", 13507 "version": "3.0.0",
13503 - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",  
13504 - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", 13508 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
  13509 + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
  13510 + "dev": true,
  13511 + "requires": {
  13512 + "locate-path": "^3.0.0"
  13513 + }
  13514 + },
  13515 + "get-caller-file": {
  13516 + "version": "2.0.5",
  13517 + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
  13518 + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
13505 "dev": true 13519 "dev": true
13506 }, 13520 },
13507 "is-fullwidth-code-point": { 13521 "is-fullwidth-code-point": {
13508 - "version": "1.0.0",  
13509 - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",  
13510 - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", 13522 + "version": "2.0.0",
  13523 + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
  13524 + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
  13525 + "dev": true
  13526 + },
  13527 + "locate-path": {
  13528 + "version": "3.0.0",
  13529 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
  13530 + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
13511 "dev": true, 13531 "dev": true,
13512 "requires": { 13532 "requires": {
13513 - "number-is-nan": "^1.0.0" 13533 + "p-locate": "^3.0.0",
  13534 + "path-exists": "^3.0.0"
13514 } 13535 }
13515 }, 13536 },
  13537 + "p-limit": {
  13538 + "version": "2.3.0",
  13539 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
  13540 + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
  13541 + "dev": true,
  13542 + "requires": {
  13543 + "p-try": "^2.0.0"
  13544 + }
  13545 + },
  13546 + "p-locate": {
  13547 + "version": "3.0.0",
  13548 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
  13549 + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
  13550 + "dev": true,
  13551 + "requires": {
  13552 + "p-limit": "^2.0.0"
  13553 + }
  13554 + },
  13555 + "p-try": {
  13556 + "version": "2.2.0",
  13557 + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
  13558 + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
  13559 + "dev": true
  13560 + },
  13561 + "path-exists": {
  13562 + "version": "3.0.0",
  13563 + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
  13564 + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
  13565 + "dev": true
  13566 + },
  13567 + "require-main-filename": {
  13568 + "version": "2.0.0",
  13569 + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
  13570 + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
  13571 + "dev": true
  13572 + },
13516 "string-width": { 13573 "string-width": {
13517 - "version": "1.0.2",  
13518 - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",  
13519 - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", 13574 + "version": "3.1.0",
  13575 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
  13576 + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
13520 "dev": true, 13577 "dev": true,
13521 "requires": { 13578 "requires": {
13522 - "code-point-at": "^1.0.0",  
13523 - "is-fullwidth-code-point": "^1.0.0",  
13524 - "strip-ansi": "^3.0.0" 13579 + "emoji-regex": "^7.0.1",
  13580 + "is-fullwidth-code-point": "^2.0.0",
  13581 + "strip-ansi": "^5.1.0"
13525 } 13582 }
13526 }, 13583 },
13527 "strip-ansi": { 13584 "strip-ansi": {
13528 - "version": "3.0.1",  
13529 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",  
13530 - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", 13585 + "version": "5.2.0",
  13586 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
  13587 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
13531 "dev": true, 13588 "dev": true,
13532 "requires": { 13589 "requires": {
13533 - "ansi-regex": "^2.0.0" 13590 + "ansi-regex": "^4.1.0"
13534 } 13591 }
13535 }, 13592 },
13536 - "y18n": {  
13537 - "version": "3.2.1",  
13538 - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",  
13539 - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", 13593 + "which-module": {
  13594 + "version": "2.0.0",
  13595 + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
  13596 + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
13540 "dev": true 13597 "dev": true
13541 } 13598 }
13542 } 13599 }
13543 }, 13600 },
13544 "yargs-parser": { 13601 "yargs-parser": {
13545 - "version": "5.0.0",  
13546 - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",  
13547 - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", 13602 + "version": "13.1.2",
  13603 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
  13604 + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
13548 "dev": true, 13605 "dev": true,
13549 "requires": { 13606 "requires": {
13550 - "camelcase": "^3.0.0" 13607 + "camelcase": "^5.0.0",
  13608 + "decamelize": "^1.2.0"
13551 }, 13609 },
13552 "dependencies": { 13610 "dependencies": {
13553 "camelcase": { 13611 "camelcase": {
13554 - "version": "3.0.0",  
13555 - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",  
13556 - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", 13612 + "version": "5.3.1",
  13613 + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
  13614 + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
13557 "dev": true 13615 "dev": true
13558 } 13616 }
13559 } 13617 }
@@ -90,16 +90,17 @@ var axois_init = { @@ -90,16 +90,17 @@ var axois_init = {
90 sessionStorage.removeItem('user'); 90 sessionStorage.removeItem('user');
91 sessionStorage.removeItem('menu'); 91 sessionStorage.removeItem('menu');
92 sessionStorage.removeItem('token'); 92 sessionStorage.removeItem('token');
  93 + }else{
  94 + let user = JSON.parse(sessionStorage.getItem('user'));
  95 + if(sessionStorage.getItem('token')){
  96 + axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');
  97 + }
  98 +
  99 + if (!jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {
  100 + next({ path: '/login' })
  101 + }
93 } 102 }
94 - let user = JSON.parse(sessionStorage.getItem('user'));  
95 - if(sessionStorage.getItem('token')){  
96 - axios.defaults.headers.common['Authorization'] = sessionStorage.getItem('token');  
97 - }  
98 - if (jsutil.checkNull(user) && to.path != '/login' && !sessionStorage.getItem('menu') && !sessionStorage.getItem('token')) {  
99 - next({ path: '/login' })  
100 - } else {  
101 - next()  
102 - } 103 + next()
103 }); 104 });
104 } 105 }
105 } 106 }
不能预览此文件类型
@@ -260,7 +260,7 @@ let routes = [ @@ -260,7 +260,7 @@ let routes = [
260 { 260 {
261 path: '/out', 261 path: '/out',
262 component: Home, 262 component: Home,
263 - name: '出港航班申报', 263 + name: '出港申报',
264 iconCls:'el-icon-goods', 264 iconCls:'el-icon-goods',
265 children:[ 265 children:[
266 {path:'/departure',component:departure,name:'出港预报申报'}, 266 {path:'/departure',component:departure,name:'出港预报申报'},
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 } 146 }
147 }; 147 };
148 return { 148 return {
149 - sysName:'易通快速通关申报管理系统', 149 + sysName:'易通链快速通关申报平台',
150 collapsed:false, 150 collapsed:false,
151 sysUserName: '', 151 sysUserName: '',
152 sysUserId:'', 152 sysUserId:'',
@@ -333,8 +333,8 @@ @@ -333,8 +333,8 @@
333 //width:230px; 333 //width:230px;
334 height:60px; 334 height:60px;
335 font-size: 22px; 335 font-size: 22px;
336 - padding-left:20px;  
337 - padding-right:20px; 336 + padding-left:10px;
  337 + padding-right:10px;
338 border-color: rgba(238,241,146,0.3); 338 border-color: rgba(238,241,146,0.3);
339 border-right-width: 1px; 339 border-right-width: 1px;
340 border-right-style: solid; 340 border-right-style: solid;
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 17
18 <!--列表--> 18 <!--列表-->
19 <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;" 19 <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"
20 - row-key="permissionId"  
21 - border  
22 - :tree-props="{children: 'children', hasChildren: 'hasChildren'}" 20 + row-key="permissionId"
  21 + border
  22 + :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
23 > 23 >
24 <el-table-column type="selection" width="55"> 24 <el-table-column type="selection" width="55">
25 </el-table-column> 25 </el-table-column>
@@ -50,86 +50,109 @@ @@ -50,86 +50,109 @@
50 </el-pagination> 50 </el-pagination>
51 </el-col> 51 </el-col>
52 52
53 - <!--编辑界面-->  
54 - <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">  
55 - <el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">  
56 - <el-form-item label="ID">  
57 - <span>{{editForm.permissionId}}</span>  
58 - </el-form-item>  
59 - <el-form-item label="权限名称" prop="name">  
60 - <el-input v-model="editForm.name" auto-complete="off" placeholder="请输入权限名称：例如:用户新增权限"></el-input>  
61 - </el-form-item>  
62 - <el-form-item label="权限描述" prop="description">  
63 - <el-input v-model="editForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>  
64 - </el-form-item>  
65 - <el-form-item label="权限总路径" prop="path">  
66 - <el-input v-model="editForm.path" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>  
67 - </el-form-item>  
68 - <el-form-item label="权限路径" prop="url">  
69 - <el-input v-model="editForm.url" auto-complete="off" placeholder="请输入权限描述：例如:/user/update"></el-input>  
70 - </el-form-item>  
71 - <el-form-item label="权限排序" prop="permissionOrder">  
72 - <el-input v-model="editForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>  
73 - </el-form-item>  
74 - <el-form-item label="父目录ID" prop="parentId">  
75 - <el-input v-model="editForm.parentId" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>  
76 - </el-form-item>  
77 - <el-form-item label="ismenu" prop="ismenu">  
78 - <el-switch  
79 - v-model="editForm.ismenu"  
80 - active-color="#13ce66"  
81 - inactive-color="#ff4949"  
82 - active-text="是"  
83 - inactive-text="否"  
84 - active-value="1"  
85 - inactive-value="0">  
86 - </el-switch>  
87 - </el-form-item>  
88 - </el-form>  
89 - <div slot="footer" class="dialog-footer">  
90 - <el-button @click.native="editFormVisible = false">取消</el-button>  
91 - <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>  
92 - </div>  
93 - </el-dialog>  
94 53
95 <!--新增界面--> 54 <!--新增界面-->
96 - <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">  
97 - <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">  
98 - <el-form-item label="权限名称" prop="name">  
99 - <el-input v-model="addForm.name" auto-complete="off" placeholder="请输入权限名称：例如:用户新增权限"></el-input>  
100 - </el-form-item>  
101 - <el-form-item label="权限描述" prop="description">  
102 - <el-input v-model="addForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>  
103 - </el-form-item>  
104 - <el-form-item label="权限总路径" prop="path">  
105 - <el-input v-model="addForm.path" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>  
106 - </el-form-item>  
107 - <el-form-item label="权限路径" prop="url">  
108 - <el-input v-model="addForm.url" auto-complete="off" placeholder="请输入权限描述：例如:/user/update"></el-input>  
109 - </el-form-item>  
110 - <el-form-item label="权限排序" prop="permissionOrder">  
111 - <el-input v-model="addForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input> 55 + <el-dialog :title="dialogMap[dialogStatus]" :visible.sync="addFormVisible" :close-on-click-modal="false">
  56 + <el-form :model="addForm" label-width="110px" :rules="addFormRules" ref="addForm">
  57 +
  58 + <el-form-item label="ID">
  59 + <span>{{addForm.permissionId}}</span>
112 </el-form-item> 60 </el-form-item>
113 - <el-form-item label="父目录ID" prop="parentId">  
114 - <el-input v-model="addForm.parentId" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input> 61 + <el-row :gutter="20">
  62 + <el-col :span="12">
  63 + <el-form-item label="权限名称" prop="name">
  64 + <el-input v-model="addForm.name" auto-complete="off" placeholder="请输入权限名称：例如:用户新增权限"></el-input>
  65 + </el-form-item>
  66 + </el-col>
  67 + <el-col :span="12">
  68 + <el-form-item label="权限描述" prop="description">
  69 + <el-input v-model="addForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>
  70 + </el-form-item>
  71 + </el-col>
  72 + </el-row>
  73 + <el-row :gutter="20">
  74 + <el-col>
  75 + <el-form-item label="权限总路径" prop="path">
  76 + <el-input v-model="addForm.path" auto-complete="off" placeholder="设置为前端router的path值"></el-input>
  77 + <el-cascader-panel
  78 + v-model="addForm.path"
  79 + :options="cascaderOptions"
  80 + :props="pannelProps"
  81 + ></el-cascader-panel>
  82 + </el-form-item>
  83 + </el-col>
  84 + </el-row>
  85 + <el-form-item label="具体访问路径" prop="url">
  86 + <el-input v-model="addForm.url" auto-complete="off" placeholder="设置为后端微服务路径：例如:/cloud-user-center/user/update"></el-input>
  87 + <el-cascader-panel
  88 + v-model="addForm.url"
  89 + :options="tableList"
  90 + :props="pannelUrlProps"
  91 + ></el-cascader-panel>
115 </el-form-item> 92 </el-form-item>
116 - <el-form-item label="ismenu" prop="ismenu"> 93 + <el-row :gutter="20">
  94 + <el-col :span="8">
  95 + <el-form-item label="权限排序" prop="permissionOrder">
  96 + <el-input v-model="addForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>
  97 + </el-form-item>
  98 + </el-col>
  99 + <el-col :span="8">
  100 + <el-form-item label="设置权限上级" prop="parentId">
  101 + <el-input v-model="addForm.parentId" auto-complete="off" placeholder="请输入或者选择适配权限"></el-input>
  102 + </el-form-item>
  103 + </el-col>
  104 + <el-col :span="8">
  105 + <el-button type="info" size="mini" @click="drawer = true">设置权限上级</el-button>
  106 + </el-col>
  107 + </el-row>
  108 +
  109 +
  110 + <el-form-item label="是否是目录" prop="ismenu">
117 <el-switch 111 <el-switch
118 v-model="addForm.ismenu" 112 v-model="addForm.ismenu"
119 active-color="#13ce66" 113 active-color="#13ce66"
120 inactive-color="#ff4949" 114 inactive-color="#ff4949"
121 active-text="是" 115 active-text="是"
122 inactive-text="否" 116 inactive-text="否"
123 - active-value="1"  
124 - inactive-value="0"> 117 + >
125 </el-switch> 118 </el-switch>
126 </el-form-item> 119 </el-form-item>
127 </el-form> 120 </el-form>
128 <div slot="footer" class="dialog-footer"> 121 <div slot="footer" class="dialog-footer">
129 <el-button @click.native="addFormVisible = false">取消</el-button> 122 <el-button @click.native="addFormVisible = false">取消</el-button>
130 - <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button> 123 + <el-button type="primary" @click.native="dialogStatus==='create'?addSubmit():editSubmit()" :loading="addLoading">提交</el-button>
131 </div> 124 </div>
132 </el-dialog> 125 </el-dialog>
  126 +
  127 + <el-drawer
  128 + title="设置权限上级"
  129 + :visible.sync="drawer"
  130 + append-to-body
  131 + withHeader>
  132 + <el-row>
  133 + <el-col :span="7" :offset="1">
  134 + <span style="color:#E6A23C">不设置为顶级权限</span>
  135 + </el-col>
  136 + <el-col :span="8" >
  137 + <el-button type="primary" @click.native="treeMerge(false)">合并节点</el-button>
  138 + </el-col>
  139 + <el-col :span="8">
  140 + <el-button type="primary" @click.native="treeMerge(true)">展开节点</el-button>
  141 + </el-col>
  142 +
  143 +
  144 +
  145 +
  146 + </el-row>
  147 + <el-tree :data="tableList" :props="treeDefaultProps"
  148 + @check="clickDeal"
  149 + :default-expand-all = "treeExpand"
  150 + show-checkbox
  151 + highlight-current
  152 + check-strictly
  153 + node-key="permissionId" ref="tree">
  154 + </el-tree>
  155 + </el-drawer>
133 </section> 156 </section>
134 </template> 157 </template>
135 158
@@ -137,71 +160,73 @@ @@ -137,71 +160,73 @@
137 import util from '../../common/js/util' 160 import util from '../../common/js/util'
138 //import NProgress from 'nprogress' 161 //import NProgress from 'nprogress'
139 import { getList, remove, batchRemove, edit, add } from '../../api/perm_api'; 162 import { getList, remove, batchRemove, edit, add } from '../../api/perm_api';
140 - import moment from 'moment' 163 + import moment from 'moment'
141 export default { 164 export default {
142 data() { 165 data() {
143 return { 166 return {
144 filters: { 167 filters: {
145 - name: '' 168 + name: ''
146 }, 169 },
  170 + cascaderOptions:[],
147 tableList: [], 171 tableList: [],
148 total: 0, 172 total: 0,
149 - pageNum: 1,  
150 - pageSize: 100, 173 + pageNum: 1,
  174 + pageSize: 500,
151 listLoading: false, 175 listLoading: false,
152 sels: [],//列表选中列 176 sels: [],//列表选中列
153 - //编辑界面是否显示  
154 - editFormVisible: false,  
155 - editLoading: false,  
156 - editFormRules: {  
157 - roleName: [  
158 - { required: true, message: '请输入权限名称', trigger: 'blur' }  
159 - ] 177 + treeDefaultProps: {
  178 + children: 'children',
  179 + label: 'name',
160 }, 180 },
161 - //编辑界面数据  
162 - editForm: {  
163 - permissionId:'',  
164 - description: '',  
165 - name: '',  
166 - url: '',  
167 - path: '',  
168 - parentId: '',  
169 - ismenu: '',  
170 - permissionOrder:'' 181 + pannelProps: {
  182 + children: 'children',
  183 + label: 'name',
  184 + value: 'path',
  185 + checkStrictly: true,
171 }, 186 },
172 - 187 + pannelUrlProps: {
  188 + children: 'children',
  189 + label: 'name',
  190 + value: 'url',
  191 + checkStrictly: true,
  192 + emitPath: false
  193 + },
  194 + treeExpand: true,
173 addFormVisible: false,//新增界面是否显示 195 addFormVisible: false,//新增界面是否显示
  196 + dialogMap: {
  197 + update: '编辑',
  198 + create: '新增',
  199 + },
  200 + dialogStatus: 'create',
  201 + drawer: false,
174 addLoading: false, 202 addLoading: false,
175 addFormRules: { 203 addFormRules: {
176 - name: [ 204 + name: [
177 { required: true, message: '请输入权限名称', trigger: 'blur' } 205 { required: true, message: '请输入权限名称', trigger: 'blur' }
178 ], 206 ],
179 - description: [  
180 - { required: true, message: '请输入权限描述', trigger: 'blur' } 207 + path: [
  208 + { required: true, message: '请输入总路径', trigger: 'blur' }
  209 + ],
  210 + url: [
  211 + { required: true, message: '请输入权限路径', trigger: 'blur' }
181 ], 212 ],
182 - paht: [  
183 - { required: true, message: '请输入总路径', trigger: 'blur' }  
184 - ],  
185 - url: [  
186 - { required: true, message: '请输入权限路径', trigger: 'blur' }  
187 - ],  
188 - permissionOrder: [  
189 - { required: true, message: '请输入排序字段', trigger: 'blur' }  
190 - ],  
191 - parentId: [  
192 - { required: true, message: '请输入父类ID', trigger: 'blur' }  
193 - ] 213 + permissionOrder: [
  214 + { required: true, message: '请输入排序字段', trigger: 'blur' }
  215 + ]
194 }, 216 },
195 //新增界面数据 217 //新增界面数据
196 addForm: { 218 addForm: {
197 - description: '',  
198 - name: '',  
199 - url: '', 219 + permissionId:'',
  220 + description: '',
  221 + name: '',
  222 + url: '',
200 path: '', 223 path: '',
201 - parentId: '',  
202 - ismenu: '',  
203 - permissionOrder:''  
204 - 224 + parentId: 0,
  225 + ismenu: true,
  226 + permissionOrder: '0',
  227 + chidren: [],
  228 + component: '',
  229 + method: ''
205 } 230 }
206 231
207 } 232 }
@@ -211,9 +236,9 @@ @@ -211,9 +236,9 @@
211 formatSex: function (row, column) { 236 formatSex: function (row, column) {
212 return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知'; 237 return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
213 }, 238 },
214 - formatState: function (row, column) {  
215 - return row.ismenu == true ? '是' : row.ismenu == false ? '否' : '未知';  
216 - }, 239 + formatState: function (row, column) {
  240 + return row.ismenu == true ? '是' : row.ismenu == false ? '否' : '未知';
  241 + },
217 handleCurrentChange(val) { 242 handleCurrentChange(val) {
218 this.pageNum = val; 243 this.pageNum = val;
219 this.getTableList(); 244 this.getTableList();
@@ -221,30 +246,26 @@ @@ -221,30 +246,26 @@
221 //获取列表 246 //获取列表
222 getTableList() { 247 getTableList() {
223 let para = { 248 let para = {
224 - pageNum: this.pageNum,  
225 - pageSize: this.pageSize,  
226 - name: this.filters.name 249 + pageNum: this.pageNum,
  250 + pageSize: this.pageSize,
  251 + name: this.filters.name
227 }; 252 };
228 this.listLoading = true; 253 this.listLoading = true;
229 //NProgress.start(); 254 //NProgress.start();
230 - getList(para).then((res) => { 255 + getList(para).then((res) => {
231 this.total = res.data.total; 256 this.total = res.data.total;
232 this.tableList = res.data.list; 257 this.tableList = res.data.list;
233 this.listLoading = false; 258 this.listLoading = false;
234 //NProgress.done(); 259 //NProgress.done();
235 }).catch((error) => { 260 }).catch((error) => {
236 -  
237 - this.listLoading = false;  
238 - if(null!= error.response && error.response!==undefined){  
239 - let status= error.response.status;  
240 - let msg = error.response.statusText;  
241 - alert(status+msg); 261 + this.listLoading = false;
  262 + if(null!= error.response && error.response!==undefined){
  263 + let status= error.response.status;
  264 + let msg = error.response.statusText;
  265 + alert(status+msg);
242 }else { 266 }else {
243 - alert(error); 267 + alert(error);
244 } 268 }
245 -  
246 -  
247 -  
248 }); 269 });
249 270
250 }, 271 },
@@ -256,7 +277,7 @@ @@ -256,7 +277,7 @@
256 this.listLoading = true; 277 this.listLoading = true;
257 //NProgress.start(); 278 //NProgress.start();
258 let para = { permissionId: row.permissionId }; 279 let para = { permissionId: row.permissionId };
259 - remove(para).then((res) => { 280 + remove(para).then((res) => {
260 this.listLoading = false; 281 this.listLoading = false;
261 //NProgress.done(); 282 //NProgress.done();
262 this.$message({ 283 this.$message({
@@ -265,53 +286,55 @@ @@ -265,53 +286,55 @@
265 }); 286 });
266 this.getTableList(); 287 this.getTableList();
267 }).catch((error) => { 288 }).catch((error) => {
268 - this.listLoading = false;  
269 - alert(error); 289 + this.listLoading = false;
  290 + alert(error);
270 }); 291 });
271 }).catch(); 292 }).catch();
272 }, 293 },
273 - /** 294 + /**
274 * 显示编辑界面 295 * 显示编辑界面
275 - * @param index  
276 - * @param row 为这行的数据对象  
277 - */ 296 + * @param index
  297 + * @param row 为这行的数据对象
  298 + */
278 handleEdit: function (index, row) { 299 handleEdit: function (index, row) {
279 - this.editFormVisible = true;  
280 - this.editForm = Object.assign({}, row); 300 + this.addFormVisible = true;
  301 + this.dialogStatus= 'update',
  302 + this.addForm = Object.assign({}, row);
281 }, 303 },
282 //显示新增界面，每次点开初始化数据 304 //显示新增界面，每次点开初始化数据
283 handleAdd: function () { 305 handleAdd: function () {
284 this.addFormVisible = true; 306 this.addFormVisible = true;
  307 + this.dialogStatus= 'create',
285 this.addForm = { 308 this.addForm = {
286 - username: '',  
287 - password: '',  
288 - sex: 1,  
289 - address: '',  
290 - realname: '',  
291 - email: '',  
292 - mobilephone: '',  
293 - age: 1 309 + description: '',
  310 + name: '',
  311 + url: '',
  312 + path: '',
  313 + parentId: 0,
  314 + ismenu: '',
  315 + permissionOrder:'0'
  316 +
294 }; 317 };
295 }, 318 },
296 //编辑 319 //编辑
297 editSubmit: function () { 320 editSubmit: function () {
298 - this.$refs.editForm.validate((valid) => { 321 + this.$refs.addForm.validate((valid) => {
299 if (valid) { 322 if (valid) {
300 this.$confirm('确认提交吗？', '提示', {}).then(() => { 323 this.$confirm('确认提交吗？', '提示', {}).then(() => {
301 - this.editLoading = true; 324 + this.addLoading = true;
302 //NProgress.start(); 325 //NProgress.start();
303 - let para = Object.assign({}, this.editForm);  
304 - para.creattime = moment(para.creattime).format('YYYY-MM-DD HH:mm:ss');  
305 - this.editLoading = false;  
306 - edit(para).then((res) => { 326 + let para = Object.assign({}, this.addForm);
  327 + para.creattime = moment(para.creattime).format('YYYY-MM-DD HH:mm:ss');
  328 + this.addLoading = false;
  329 + edit(para).then((res) => {
307 330
308 //NProgress.done(); 331 //NProgress.done();
309 this.$message({ 332 this.$message({
310 message: '提交成功', 333 message: '提交成功',
311 type: 'success' 334 type: 'success'
312 }); 335 });
313 - this.$refs['editForm'].resetFields();  
314 - this.editFormVisible = false; 336 + this.$refs['addForm'].resetFields();
  337 + this.addFormVisible = false;
315 this.getTableList(); 338 this.getTableList();
316 }).catch(error => alert(error)); 339 }).catch(error => alert(error));
317 }); 340 });
@@ -327,7 +350,7 @@ @@ -327,7 +350,7 @@
327 //NProgress.start(); 350 //NProgress.start();
328 let para = Object.assign({}, this.addForm); 351 let para = Object.assign({}, this.addForm);
329 para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd'); 352 para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
330 - add(para).then((res) => { 353 + add(para).then((res) => {
331 this.addLoading = false; 354 this.addLoading = false;
332 //NProgress.done(); 355 //NProgress.done();
333 this.$message({ 356 this.$message({
@@ -354,7 +377,7 @@ @@ -354,7 +377,7 @@
354 this.listLoading = true; 377 this.listLoading = true;
355 //NProgress.start(); 378 //NProgress.start();
356 let para = { ids: ids }; 379 let para = { ids: ids };
357 - batchRemove(para).then((res) => { 380 + batchRemove(para).then((res) => {
358 this.listLoading = false; 381 this.listLoading = false;
359 //NProgress.done(); 382 //NProgress.done();
360 this.$message({ 383 this.$message({
@@ -366,15 +389,43 @@ @@ -366,15 +389,43 @@
366 }).catch(() => { 389 }).catch(() => {
367 390
368 }); 391 });
  392 + },
  393 + showDrawer: function(){
  394 + this.drawer = true;
  395 + this.$nextTick(() => {
  396 + //反向适配
  397 + this.$refs.tree.setCheckedKeys([this.addForm.parentId]);
  398 + });
  399 + },
  400 + clickDeal: function (currentObj, treeStatus) {
  401 + this.addForm.parentId = currentObj.permissionId;
  402 + this.$refs.tree.setCheckedKeys([currentObj.permissionId]);
  403 + // this.drawer = false;
  404 + },
  405 + treeMerge: function (expand) {
  406 + this.treeExpand = expand;
  407 + for(var i=0;i<this.$refs.tree.store._getAllNodes().length;i++){
  408 + this.$refs.tree.store._getAllNodes()[i].expanded=this.treeExpand;
  409 + }
369 } 410 }
370 }, 411 },
371 mounted() { 412 mounted() {
372 this.getTableList(); 413 this.getTableList();
  414 + this.cascaderOptions = this.$router.options.routes;
373 } 415 }
374 } 416 }
375 417
376 </script> 418 </script>
377 419
378 -<style scoped> 420 +<style rel="stylesheet/scss" lang="scss">
  421 + .el-drawer.rtl {
  422 + overflow: scroll
  423 + }
  424 + .el-row{
  425 + .el-col {
  426 + margin-right: 0px;
  427 + }
  428 + }
  429 +
379 430
380 </style> 431 </style>
@@ -195,13 +195,6 @@ @@ -195,13 +195,6 @@
195 } 195 }
196 }, 196 },
197 methods: { 197 methods: {
198 - //性别显示转换  
199 - formatSex: function (row, column) {  
200 - return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';  
201 - },  
202 - formatState: function (row, column) {  
203 - return row.state == true ? '是' : row.state == false ? '否' : '未知';  
204 - },  
205 handleCurrentChange(val) { 198 handleCurrentChange(val) {
206 this.pageNum = val; 199 this.pageNum = val;
207 this.getRoles(); 200 this.getRoles();
@@ -63,6 +63,17 @@ @@ -63,6 +63,17 @@
63 <!--编辑界面--> 63 <!--编辑界面-->
64 <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false"> 64 <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">
65 <el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm"> 65 <el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
  66 +
  67 + <el-form-item label="所属公司" prop="companyId">
  68 + <el-select v-model="editForm.companyId" filterable placeholder="请选择">
  69 + <el-option
  70 + v-for="item in options"
  71 + :key="item.roleId"
  72 + :label="item.roleName"
  73 + :value="item.roleId">
  74 + </el-option>
  75 + </el-select>
  76 + </el-form-item>
66 <el-form-item label="ID"> 77 <el-form-item label="ID">
67 <span>{{editForm.userId}}</span> 78 <span>{{editForm.userId}}</span>
68 </el-form-item> 79 </el-form-item>
@@ -125,6 +136,17 @@ @@ -125,6 +136,17 @@
125 <!--新增界面--> 136 <!--新增界面-->
126 <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false"> 137 <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">
127 <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm"> 138 <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
  139 +
  140 + <el-form-item label="所属公司" prop="companyId">
  141 + <el-select v-model="addForm.companyId" filterable placeholder="请选择">
  142 + <el-option
  143 + v-for="item in options"
  144 + :key="item.roleId"
  145 + :label="item.roleName"
  146 + :value="item.roleId">
  147 + </el-option>
  148 + </el-select>
  149 + </el-form-item>
128 <el-form-item label="账号" prop="username"> 150 <el-form-item label="账号" prop="username">
129 <el-input v-model="addForm.username" aria-placeholder="用户名长度在5-11位,支持英文和数字"></el-input> 151 <el-input v-model="addForm.username" aria-placeholder="用户名长度在5-11位,支持英文和数字"></el-input>
130 </el-form-item> 152 </el-form-item>
@@ -185,6 +207,7 @@ @@ -185,6 +207,7 @@
185 import NProgress from 'nprogress' 207 import NProgress from 'nprogress'
186 import { getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole } from '../../api/user'; 208 import { getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole } from '../../api/user';
187 import { getList} from '../../api/role_api'; 209 import { getList} from '../../api/role_api';
  210 + import { getList as getRoleList} from '../../api/role_api';
188 import moment from 'moment' 211 import moment from 'moment'
189 export default { 212 export default {
190 data() { 213 data() {
@@ -223,7 +246,8 @@ @@ -223,7 +246,8 @@
223 realname: '', 246 realname: '',
224 email: '', 247 email: '',
225 mobilephone: '', 248 mobilephone: '',
226 - state: 'true' 249 + state: 'true',
  250 + companyId:''
227 }, 251 },
228 252
229 addFormVisible: false,//新增界面是否显示 253 addFormVisible: false,//新增界面是否显示
@@ -234,6 +258,9 @@ @@ -234,6 +258,9 @@
234 ], 258 ],
235 password: [ 259 password: [
236 { required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'} 260 { required: true, message: '请输入密码,用户名长度在6-18位,支持英文和数字和非空字符', trigger: 'blur'}
  261 + ],
  262 + companyId: [
  263 + { required: true, message: '请选择所属您的所属公司', trigger: 'blur' },
237 ] 264 ]
238 }, 265 },
239 //用户角色配置 266 //用户角色配置
@@ -247,7 +274,8 @@ @@ -247,7 +274,8 @@
247 realname: '', 274 realname: '',
248 email: '', 275 email: '',
249 mobilephone: '', 276 mobilephone: '',
250 - age: 1 277 + age: 1,
  278 + companyId:''
251 }, 279 },
252 roleEditForm: { 280 roleEditForm: {
253 userId: 1, 281 userId: 1,
@@ -255,7 +283,8 @@ @@ -255,7 +283,8 @@
255 roles: [] 283 roles: []
256 }, 284 },
257 roles: [], 285 roles: [],
258 - roleIds: [] 286 + roleIds: [],
  287 + options: []
259 288
260 } 289 }
261 }, 290 },
@@ -292,6 +321,20 @@ @@ -292,6 +321,20 @@
292 }); 321 });
293 322
294 }, 323 },
  324 +
  325 + // 获取公司列表
  326 + getCompanyNmae(){
  327 + let para = {
  328 + type: "公司"
  329 + };
  330 + getRoleList(para).then((res) => {
  331 + this.options = res.data.list;
  332 + this.listLoading = false;
  333 + //NProgress.done();
  334 + }).catch(() => {
  335 +
  336 + });
  337 + },
295 //删除 338 //删除
296 handleDel: function (index, row) { 339 handleDel: function (index, row) {
297 this.$confirm('确认删除该记录吗?', '提示', { 340 this.$confirm('确认删除该记录吗?', '提示', {
@@ -375,7 +418,8 @@ @@ -375,7 +418,8 @@
375 realname: '', 418 realname: '',
376 email: '', 419 email: '',
377 mobilephone: '', 420 mobilephone: '',
378 - age: 1 421 + age: 1,
  422 + companyId:''
379 }; 423 };
380 }, 424 },
381 //编辑 425 //编辑
@@ -444,6 +488,7 @@ @@ -444,6 +488,7 @@
444 } 488 }
445 }); 489 });
446 }, 490 },
  491 +
447 selsChange: function (sels) { 492 selsChange: function (sels) {
448 this.sels = sels; 493 this.sels = sels;
449 }, 494 },
@@ -508,6 +553,7 @@ @@ -508,6 +553,7 @@
508 }, 553 },
509 mounted() { 554 mounted() {
510 this.getUsers(); 555 this.getUsers();
  556 + this.getCompanyNmae();
511 }, 557 },
512 computed: { 558 computed: {
513 hideShow() {//当图片多于一张的时候，就隐藏上传框 559 hideShow() {//当图片多于一张的时候，就隐藏上传框
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 <span>{{scope.row.weight}}</span> 84 <span>{{scope.row.weight}}</span>
85 </template> 85 </template>
86 </el-table-column> 86 </el-table-column>
87 - <el-table-column label="货物描述" width="120" align="center"> 87 + <el-table-column label="货物描述" width="120" style="height: 20px" align="center">
88 <template slot-scope="scope"> 88 <template slot-scope="scope">
89 <span>{{scope.row.goodsname}}</span> 89 <span>{{scope.row.goodsname}}</span>
90 </template> 90 </template>
@@ -565,9 +565,9 @@ @@ -565,9 +565,9 @@
565 this.listLoading = true 565 this.listLoading = true
566 if (this.arriveQuery.awba !== undefined) { 566 if (this.arriveQuery.awba !== undefined) {
567 getMt3201ListForParam(this.arriveQuery).then(res => { 567 getMt3201ListForParam(this.arriveQuery).then(res => {
568 - this.arriveData = res.data.dataList  
569 - this.total = res.data.count  
570 - if (res.data.dataList.length > 0){ 568 + this.arriveData = res.data.data.list
  569 + this.total = res.data.data.total
  570 + if (res.data.data.list.length > 0){
571 this.arriveQuery.carrier = this.arriveData[0].carrier 571 this.arriveQuery.carrier = this.arriveData[0].carrier
572 this.arriveQuery.flightno = this.arriveData[0].flightno 572 this.arriveQuery.flightno = this.arriveData[0].flightno
573 this.arriveQuery.flightdate = this.arriveData[0].flightdate 573 this.arriveQuery.flightdate = this.arriveData[0].flightdate
@@ -581,8 +581,8 @@ @@ -581,8 +581,8 @@
581 }) 581 })
582 } else { 582 } else {
583 getMt3201ListForParam(this.arriveQuery).then(res => { 583 getMt3201ListForParam(this.arriveQuery).then(res => {
584 - this.arriveData = res.data.dataList  
585 - this.total = res.data.count 584 + this.arriveData = res.data.data.list
  585 + this.total = res.data.data.total
586 setTimeout(() => { 586 setTimeout(() => {
587 this.listLoading = false 587 this.listLoading = false
588 }, 1.5 * 1000) 588 }, 1.5 * 1000)
@@ -12,13 +12,13 @@ @@ -12,13 +12,13 @@
12 <el-table :data="flightData" stripe style="font-size: 14px" border> 12 <el-table :data="flightData" stripe style="font-size: 14px" border>
13 <el-table-column label="航班号" width="180px" align="center"> 13 <el-table-column label="航班号" width="180px" align="center">
14 <template slot-scope="scope"> 14 <template slot-scope="scope">
15 - <span>{{ scope.row.carrier }}{{ scope.row.flightNo }}</span> 15 + <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
16 </template> 16 </template>
17 </el-table-column> 17 </el-table-column>
18 <el-table-column label="航班日期" width="190px" align="center"> 18 <el-table-column label="航班日期" width="190px" align="center">
19 <template slot-scope="scope"> 19 <template slot-scope="scope">
20 <i class="el-icon-time"></i> 20 <i class="el-icon-time"></i>
21 - <span>{{ scope.row.flightDate }}</span> 21 + <span>{{ scope.row.flightdate }}</span>
22 </template> 22 </template>
23 </el-table-column> 23 </el-table-column>
24 <el-table-column label="始发站" width="160px" align="center"> 24 <el-table-column label="始发站" width="160px" align="center">
@@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
75 }, 75 },
76 getList() { 76 getList() {
77 getFlightListForParam(this.listQuery).then(res => { 77 getFlightListForParam(this.listQuery).then(res => {
78 - this.flightData = res.data.dataList  
79 - this.total = res.data.count 78 + this.flightData = res.data.data.list
  79 + this.total = res.data.data.total
80 }) 80 })
81 }, 81 },
82 handleSearch() { 82 handleSearch() {
@@ -84,26 +84,26 @@ @@ -84,26 +84,26 @@
84 }, 84 },
85 handleLoading(row) { 85 handleLoading(row) {
86 row.messageType = 'MT4201' 86 row.messageType = 'MT4201'
87 - row.flightdate = row.flightDate  
88 - row.flightno = row.flightNo 87 + row.flightdate = row.flightdate
  88 + row.flightno = row.flightno
89 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 89 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
90 }, 90 },
91 handleTidy(row) { 91 handleTidy(row) {
92 row.messageType = 'MT5202' 92 row.messageType = 'MT5202'
93 - row.flightdate = row.flightDate  
94 - row.flightno = row.flightNo 93 + row.flightdate = row.flightdate
  94 + row.flightno = row.flightno
95 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 95 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
96 }, 96 },
97 handleArrive(row) { 97 handleArrive(row) {
98 row.messageType = 'MT3201' 98 row.messageType = 'MT3201'
99 - row.flightdate = row.flightDate  
100 - row.flightno = row.flightNo 99 + row.flightdate = row.flightdate
  100 + row.flightno = row.flightno
101 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 101 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
102 }, 102 },
103 handlePre(row) { 103 handlePre(row) {
104 row.messageType = 'MT2201' 104 row.messageType = 'MT2201'
105 - row.flightdate = row.flightDate  
106 - row.flightno = row.flightNo 105 + row.flightdate = row.flightdate
  106 + row.flightno = row.flightno
107 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 107 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
108 } 108 }
109 }, 109 },
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 this.flight.originstation = this.$route.params.scopeRow.originstation 117 this.flight.originstation = this.$route.params.scopeRow.originstation
118 this.flight.destinationstation = this.$route.params.scopeRow.destinationstation 118 this.flight.destinationstation = this.$route.params.scopeRow.destinationstation
119 this.flight.messageType = this.$route.params.scopeRow.messageType 119 this.flight.messageType = this.$route.params.scopeRow.messageType
120 - if (this.$route.params.scopeRow.awba !== undefined) { 120 + if (this.$route.params.scopeRow.awba !== undefined && this.$route.params.scopeRow.awba != null) {
121 this.flight.awba = this.$route.params.scopeRow.awba.replace('-', '') 121 this.flight.awba = this.$route.params.scopeRow.awba.replace('-', '')
122 } 122 }
123 } 123 }
@@ -556,9 +556,9 @@ @@ -556,9 +556,9 @@
556 this.listLoading = true 556 this.listLoading = true
557 if (this.loadingQuery.awba !== undefined && this.loadingQuery.awba !== '') { 557 if (this.loadingQuery.awba !== undefined && this.loadingQuery.awba !== '') {
558 getMt4201ListForParam(this.loadingQuery).then(res => { 558 getMt4201ListForParam(this.loadingQuery).then(res => {
559 - this.loadingData = res.data.dataList  
560 - this.total = res.data.count  
561 - if (res.data.count > 0) { 559 + this.loadingData = res.data.data.list
  560 + this.total = res.data.data.total
  561 + if (res.data.data.total > 0) {
562 this.loadingQuery.carrier = this.loadingData[0].carrier 562 this.loadingQuery.carrier = this.loadingData[0].carrier
563 this.loadingQuery.flightno = this.loadingData[0].flightno 563 this.loadingQuery.flightno = this.loadingData[0].flightno
564 this.loadingQuery.flightdate = this.loadingData[0].flightdate 564 this.loadingQuery.flightdate = this.loadingData[0].flightdate
@@ -572,8 +572,8 @@ @@ -572,8 +572,8 @@
572 }) 572 })
573 } else { 573 } else {
574 getMt4201ListForParam(this.loadingQuery).then(res => { 574 getMt4201ListForParam(this.loadingQuery).then(res => {
575 - this.loadingData = res.data.dataList  
576 - this.total = res.data.count 575 + this.loadingData = res.data.data.list
  576 + this.total = res.data.data.total
577 setTimeout(() => { 577 setTimeout(() => {
578 this.listLoading = false 578 this.listLoading = false
579 }, 1.5 * 1000) 579 }, 1.5 * 1000)
@@ -41,9 +41,10 @@ @@ -41,9 +41,10 @@
41 </el-col> 41 </el-col>
42 </el-row> 42 </el-row>
43 </div> 43 </div>
44 - <tree-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true" 44 + <el-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true"
45 style="font-size: 13px" border @selection-change="handleSelectionChange" 45 style="font-size: 13px" border @selection-change="handleSelectionChange"
46 :row-class-name="tableRowClassName"> 46 :row-class-name="tableRowClassName">
  47 + <el-table-column type="selection" width="60"></el-table-column>
47 <el-table-column label="航班号" width="80px" align="center"> 48 <el-table-column label="航班号" width="80px" align="center">
48 <template slot-scope="scope"> 49 <template slot-scope="scope">
49 <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span> 50 <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
@@ -127,10 +128,10 @@ @@ -127,10 +128,10 @@
127 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a> 128 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a>
128 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT4201'" @click="handleUpdate(scope.row)">出港装载</a> 129 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT4201'" @click="handleUpdate(scope.row)">出港装载</a>
129 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT5202'" @click="handleUpdate(scope.row)">出港理货</a> 130 <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT5202'" @click="handleUpdate(scope.row)">出港理货</a>
130 - <a style="color: #1d8ce0" @click="handleUpdateStatus(scope.row)">更改状态</a> 131 +<!-- <a style="color: #1d8ce0" @click="handleUpdateStatus(scope.row)">更改状态</a>-->
131 </template> 132 </template>
132 </el-table-column> 133 </el-table-column>
133 - </tree-table> 134 + </el-table>
134 <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageSize" :limit.sync="listQuery.limitSize" 135 <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageSize" :limit.sync="listQuery.limitSize"
135 @pagination="getList"/> 136 @pagination="getList"/>
136 </div> 137 </div>
@@ -212,6 +213,7 @@ @@ -212,6 +213,7 @@
212 213
213 }, 214 },
214 handleSearch(){ 215 handleSearch(){
  216 + this.listQuery.pageSize =1;
215 this.getList() 217 this.getList()
216 }, 218 },
217 handleUpdateStatus(row){ 219 handleUpdateStatus(row){
@@ -1103,9 +1103,9 @@ @@ -1103,9 +1103,9 @@
1103 this.listLoading = true 1103 this.listLoading = true
1104 if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') { 1104 if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {
1105 getMt2201ListForParam(this.preQuery).then(res => { 1105 getMt2201ListForParam(this.preQuery).then(res => {
1106 - this.preData = res.data.dataList  
1107 - this.total = res.data.count  
1108 - if (res.data.dataList.length > 0) { 1106 + this.preData = res.data.data.list
  1107 + this.total = res.data.data.total
  1108 + if (res.data.data.list.length > 0) {
1109 this.preQuery.carrier = this.preData[0].carrier 1109 this.preQuery.carrier = this.preData[0].carrier
1110 this.preQuery.flightno = this.preData[0].flightno 1110 this.preQuery.flightno = this.preData[0].flightno
1111 this.preQuery.flightdate = this.preData[0].flightdate 1111 this.preQuery.flightdate = this.preData[0].flightdate
@@ -1119,9 +1119,9 @@ @@ -1119,9 +1119,9 @@
1119 }) 1119 })
1120 } else { 1120 } else {
1121 getMt2201ListForParam(this.preQuery).then(res => { 1121 getMt2201ListForParam(this.preQuery).then(res => {
1122 - this.preData = res.data.dataList 1122 + this.preData = res.data.data.list
1123 1123
1124 - this.total = res.data.count 1124 + this.total = res.data.data.total
1125 setTimeout(() => { 1125 setTimeout(() => {
1126 this.listLoading = false 1126 this.listLoading = false
1127 }, 1500) 1127 }, 1500)
@@ -1535,6 +1535,7 @@ @@ -1535,6 +1535,7 @@
1535 let residuePiece = 0 1535 let residuePiece = 0
1536 let residueWeight = 0 1536 let residueWeight = 0
1537 const childrenList = res.data.dataList[0].children 1537 const childrenList = res.data.dataList[0].children
  1538 +
1538 if (childrenList.length < 1) { 1539 if (childrenList.length < 1) {
1539 this.awbPiece = res.data.dataList[0].piece 1540 this.awbPiece = res.data.dataList[0].piece
1540 this.awbWeight = res.data.dataList[0].weight 1541 this.awbWeight = res.data.dataList[0].weight
@@ -585,9 +585,9 @@ @@ -585,9 +585,9 @@
585 //根据是否有主单号 来给查询条件赋值 585 //根据是否有主单号 来给查询条件赋值
586 if (this.tidyQuery.awba !== undefined && this.tidyQuery.awba !== '') { 586 if (this.tidyQuery.awba !== undefined && this.tidyQuery.awba !== '') {
587 getMt520XListForParam(this.tidyQuery).then(res => { 587 getMt520XListForParam(this.tidyQuery).then(res => {
588 - this.tidyData = res.data.dataList  
589 - this.total = res.data.count  
590 - if (res.data.dataList.length > 0) { 588 + this.tidyData = res.data.data.list;
  589 + this.total = res.data.data.total
  590 + if (res.data.data.list.length > 0) {
591 this.tidyQuery.carrier = this.tidyData[0].carrier 591 this.tidyQuery.carrier = this.tidyData[0].carrier
592 this.tidyQuery.flightno = this.tidyData[0].flightno 592 this.tidyQuery.flightno = this.tidyData[0].flightno
593 this.tidyQuery.flightdate = this.tidyData[0].flightdate 593 this.tidyQuery.flightdate = this.tidyData[0].flightdate
@@ -601,8 +601,8 @@ @@ -601,8 +601,8 @@
601 }) 601 })
602 } else { 602 } else {
603 getMt520XListForParam(this.tidyQuery).then(res => { 603 getMt520XListForParam(this.tidyQuery).then(res => {
604 - this.tidyData = res.data.dataList  
605 - this.total = res.data.count 604 + this.tidyData = res.data.data.list;
  605 + this.total = res.data.data.total;
606 setTimeout(() => { 606 setTimeout(() => {
607 this.listLoading = false 607 this.listLoading = false
608 }, 1500) 608 }, 1500)