朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 530c107fb12077c2f845552ea46366945939c179 1 个父辈 26bdef13

优化出港 预配 理货 运抵

内嵌 并排对比
正在显示 5 个修改的文件 包含 170 行增加 和 109 行删除
@@ -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"
  13535 + }
  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"
13514 } 13553 }
13515 }, 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 }
@@ -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)
@@ -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)