刘建成 / 物流 · 提交

转到一个项目

作者 倪静楠
提交 01791bfd27ce954742a0e7515f268347eaea0667 2 个父辈 5b5abfdf 3d9315f4

Merge branch 'master' of http://114.215.101.231:8099/liujiancheng/wuliu into nijingnan

内嵌 并排对比
正在显示 6 个修改的文件 包含 380 行增加 和 228 行删除
... ... @@ -80,7 +80,7 @@
},
"ansi-html": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
"resolved": "https://registry.npm.taobao.org/ansi-html/download/ansi-html-0.0.7.tgz",
"integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
"dev": true
},
... ... @@ -145,7 +145,7 @@
},
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true
},
... ... @@ -1206,7 +1206,7 @@
},
"batch": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
"resolved": "https://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz",
"integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
"dev": true
},
... ... @@ -1276,7 +1276,7 @@
},
"bonjour": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
"resolved": "https://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz",
"integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
"dev": true,
"requires": {
... ... @@ -1561,7 +1561,7 @@
},
"camelcase-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true,
"requires": {
... ... @@ -1571,7 +1571,7 @@
"dependencies": {
"camelcase": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
"resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz",
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
"dev": true
}
... ... @@ -1911,7 +1911,7 @@
"dependencies": {
"bytes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz",
"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
"dev": true
}
... ... @@ -3093,7 +3093,7 @@
},
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
"resolved": "https://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
"dev": true,
"requires": {
... ... @@ -3226,7 +3226,7 @@
},
"del": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/del/download/del-3.0.0.tgz?cache=0&sync_timestamp=1601076806416&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-3.0.0.tgz",
"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
"dev": true,
"requires": {
... ... @@ -3240,7 +3240,7 @@
"dependencies": {
"globby": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz",
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true,
"requires": {
... ... @@ -3253,7 +3253,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
... ... @@ -3328,7 +3328,7 @@
},
"dns-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz",
"integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
"dev": true
},
... ... @@ -3344,7 +3344,7 @@
},
"dns-txt": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz",
"integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
"dev": true,
"requires": {
... ... @@ -3774,7 +3774,7 @@
},
"eventsource": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
"resolved": "https://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz",
"integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
"dev": true,
"requires": {
... ... @@ -4020,7 +4020,7 @@
},
"faye-websocket": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
"resolved": "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz",
"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
"dev": true,
"requires": {
... ... @@ -4278,7 +4278,7 @@
},
"get-stdin": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz",
"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
"dev": true
},
... ... @@ -4535,7 +4535,7 @@
},
"hpack.js": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
"resolved": "https://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz",
"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
"dev": true,
"requires": {
... ... @@ -4659,7 +4659,7 @@
},
"http-deceiver": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
"resolved": "https://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz",
"integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
"dev": true
},
... ... @@ -4807,7 +4807,7 @@
},
"indent-string": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"dev": true,
"requires": {
... ... @@ -4838,7 +4838,7 @@
},
"internal-ip": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/internal-ip/download/internal-ip-1.2.0.tgz",
"integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
"dev": true,
"requires": {
... ... @@ -4868,7 +4868,7 @@
},
"ip": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
"resolved": "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz",
"integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
"dev": true
},
... ... @@ -5047,7 +5047,7 @@
},
"is-path-cwd": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz",
"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
"dev": true
},
... ... @@ -5062,7 +5062,7 @@
},
"is-path-inside": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/is-path-inside/download/is-path-inside-1.0.1.tgz",
"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
"dev": true,
"requires": {
... ... @@ -5131,7 +5131,7 @@
},
"is-utf8": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
"resolved": "https://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
"dev": true
},
... ... @@ -5391,7 +5391,7 @@
},
"loud-rejection": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
"resolved": "https://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz",
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
"dev": true,
"requires": {
... ... @@ -5432,7 +5432,7 @@
},
"map-obj": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
"dev": true
},
... ... @@ -5495,7 +5495,7 @@
},
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"resolved": "https://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz?cache=0&sync_timestamp=1603923086669&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmeow%2Fdownload%2Fmeow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true,
"requires": {
... ... @@ -5513,7 +5513,7 @@
"dependencies": {
"find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz?cache=0&sync_timestamp=1597170071453&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
... ... @@ -5523,7 +5523,7 @@
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
... ... @@ -5536,7 +5536,7 @@
},
"parse-json": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz?cache=0&sync_timestamp=1598130878813&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-2.2.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"dev": true,
"requires": {
... ... @@ -5545,7 +5545,7 @@
},
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
... ... @@ -5554,7 +5554,7 @@
},
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true,
"requires": {
... ... @@ -5565,13 +5565,13 @@
},
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
},
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true,
"requires": {
... ... @@ -5582,7 +5582,7 @@
},
"read-pkg-up": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true,
"requires": {
... ... @@ -5592,7 +5592,7 @@
},
"strip-bom": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true,
"requires": {
... ... @@ -5876,7 +5876,7 @@
},
"multicast-dns-service-types": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/multicast-dns-service-types/download/multicast-dns-service-types-1.1.0.tgz",
"integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
"dev": true
},
... ... @@ -6450,7 +6450,7 @@
},
"path-is-inside": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz",
"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
"dev": true
},
... ... @@ -6509,13 +6509,13 @@
},
"pinkie": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
"resolved": "https://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz",
"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
"dev": true
},
"pinkie-promise": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": {
... ... @@ -9143,7 +9143,7 @@
},
"redent": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz",
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
"dev": true,
"requires": {
... ... @@ -9344,7 +9344,7 @@
},
"requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz",
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"dev": true
},
... ... @@ -9365,7 +9365,7 @@
},
"resolve-cwd": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz",
"integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
"dev": true,
"requires": {
... ... @@ -9487,7 +9487,7 @@
},
"select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
"integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
"dev": true
},
... ... @@ -9543,7 +9543,7 @@
},
"serve-index": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
"resolved": "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz",
"integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
"dev": true,
"requires": {
... ... @@ -9558,7 +9558,7 @@
"dependencies": {
"http-errors": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"resolved": "https://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1593407611415&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"dev": true,
"requires": {
... ... @@ -9570,7 +9570,7 @@
},
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true
},
... ... @@ -9826,7 +9826,7 @@
},
"sockjs-client": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz",
"resolved": "https://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.1.5.tgz?cache=0&sync_timestamp=1596409908572&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsockjs-client%2Fdownload%2Fsockjs-client-1.1.5.tgz",
"integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
"dev": true,
"requires": {
... ... @@ -10073,6 +10073,11 @@
"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
"dev": true
},
"store": {
"version": "2.0.12",
"resolved": "https://registry.npm.taobao.org/store/download/store-2.0.12.tgz",
"integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM="
},
"stream-browserify": {
"version": "2.0.2",
"resolved": "https://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.2.tgz",
... ... @@ -10197,7 +10202,7 @@
},
"strip-indent": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz",
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
"dev": true,
"requires": {
... ... @@ -10390,7 +10395,7 @@
},
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz",
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
"dev": true
},
... ... @@ -10903,6 +10908,11 @@
"integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
"dev": true
},
"vuex": {
"version": "3.6.2",
"resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.6.2.tgz?cache=0&sync_timestamp=1612277442796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.6.2.tgz",
"integrity": "sha1-I2vAhqhww655lG8QfxbeWdWJXnE="
},
"watchpack": {
"version": "1.7.5",
"resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.5.tgz?cache=0&sync_timestamp=1607687453840&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.5.tgz",
... ... @@ -11299,7 +11309,7 @@
"dependencies": {
"normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
... ... @@ -11334,7 +11344,7 @@
},
"camelcase": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz?cache=0&sync_timestamp=1603921799543&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
"dev": true
},
... ... @@ -11360,7 +11370,7 @@
},
"cliui": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz?cache=0&sync_timestamp=1604880017635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-3.2.0.tgz",
"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"dev": true,
"requires": {
... ... @@ -11380,7 +11390,7 @@
},
"extend-shallow": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
... ... @@ -11389,7 +11399,7 @@
},
"fill-range": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"dev": true,
"requires": {
... ... @@ -11401,7 +11411,7 @@
},
"find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz?cache=0&sync_timestamp=1597170071453&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
... ... @@ -11422,7 +11432,7 @@
},
"glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz",
"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
"dev": true,
"requires": {
... ... @@ -11432,7 +11442,7 @@
"dependencies": {
"is-glob": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz",
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"dev": true,
"requires": {
... ... @@ -11443,7 +11453,7 @@
},
"is-binary-path": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz",
"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
"dev": true,
"requires": {
... ... @@ -11452,7 +11462,7 @@
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
... ... @@ -11461,7 +11471,7 @@
},
"is-number": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
... ... @@ -11470,7 +11480,7 @@
},
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
... ... @@ -11489,7 +11499,7 @@
},
"os-locale": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true,
"requires": {
... ... @@ -11498,7 +11508,7 @@
},
"parse-json": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz?cache=0&sync_timestamp=1598130878813&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-json%2Fdownload%2Fparse-json-2.2.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"dev": true,
"requires": {
... ... @@ -11507,7 +11517,7 @@
},
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
... ... @@ -11516,7 +11526,7 @@
},
"path-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true,
"requires": {
... ... @@ -11527,13 +11537,13 @@
},
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"resolved": "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
},
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true,
"requires": {
... ... @@ -11544,7 +11554,7 @@
},
"read-pkg-up": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true,
"requires": {
... ... @@ -11565,7 +11575,7 @@
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"resolved": "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
... ... @@ -11576,7 +11586,7 @@
},
"strip-bom": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true,
"requires": {
... ... @@ -11585,7 +11595,7 @@
},
"to-regex-range": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
"resolved": "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-2.1.1.tgz",
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
"dev": true,
"requires": {
... ... @@ -11595,7 +11605,7 @@
},
"which-module": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
"resolved": "https://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
"dev": true
},
... ... @@ -11607,7 +11617,7 @@
},
"yargs": {
"version": "6.6.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
"resolved": "https://registry.npm.taobao.org/yargs/download/yargs-6.6.0.tgz?cache=0&sync_timestamp=1607208154489&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-6.6.0.tgz",
"integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
"dev": true,
"requires": {
... ... @@ -11628,7 +11638,7 @@
},
"yargs-parser": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
"resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-4.2.1.tgz?cache=0&sync_timestamp=1604886709178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-4.2.1.tgz",
"integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
"dev": true,
"requires": {
... ...
... ... @@ -12,8 +12,10 @@
"dependencies": {
"element-china-area-data": "^5.0.2",
"element-ui": "^2.14.1",
"store": "^2.0.12",
"vue": "^2.5.2",
"vue-router": "^3.0.1"
"vue-router": "^3.0.1",
"vuex": "^3.6.2"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
... ...
... ... @@ -16,6 +16,21 @@ export default {
methods: {
},
created () {
var store = require('store');
//在页面加载时读取sessionStorage里的状态信息
if (sessionStorage.getItem("storedata") ) {
this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("storedata"))))
} //在页面刷新时将vuex里的信息保存到sessionStorage里
window.addEventListener("beforeunload",()=>{
sessionStorage.setItem("storedata",JSON.stringify(this.$store.state))
});
// 兼容iphone手机
window.addEventListener("pagehide",()=>{
sessionStorage.setItem("storedata",JSON.stringify(this.$store.state))
});
},
};
</script>
<style>
... ...
... ... @@ -20,33 +20,30 @@
</div>
<div class="fahuos">
<div class="fas-text">电站</div>
<input type="text" placeholder="请输入电站" class="fa-input" />
</div>
<div class="fahuos">
<div class="fas-text">承运单位</div>
<input
type="text"
placeholder="请输入电站"
placeholder="请输入承运单位"
class="fa-input"
/>
</div>
<div class="fahuos">
<div class="fas-text">承运单位</div>
<input type="text" placeholder="请输入承运单位" class="fa-input" />
</div>
<div class="fahuos">
<div class="fas-text">状态</div>
<input type="text" placeholder="请输入状态" class="fa-input" />
</div>
<div class="fahuos">
<div class="fas-text">制单人</div>
<input
type="text"
placeholder="请输入制单人"
class="fa-input"
/>
<input type="text" placeholder="请输入制单人" class="fa-input" />
</div>
<div class="chaxun">
<img src="../../assets/chaxun.png" class="cha-imgs" alt="">
<img src="../../assets/chaxun.png" class="cha-imgs" alt="" />
</div>
</div>
</div>
<!-- 显示列表 -->
<div class="zhonlist">
<el-table
:data="tableData"
... ... @@ -68,18 +65,19 @@
<el-table-column prop="zip" label="承运单位" width="280">
</el-table-column>
<el-table-column fixed="right" label="操作" width="256">
<template>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="dialogVisible = true"
@click="safiingList(scope.$index)"
>编制货运单</el-button
>
<el-button type="text" size="small" @click="dialogVisibleg = true">打印</el-button>
<el-button type="text" size="small" @click="plot(scope.$index)"
>打印</el-button
>
<!-- <el-button type="text" size="small" @click="cha"
>审核</el-button
> -->
</template>
</el-table-column>
</el-table>
... ... @@ -104,68 +102,117 @@
title="编制产品货运单"
:visible.sync="dialogVisible"
width="80%"
style="margin-top: 20px;"
style="margin-top: 20px"
:append-to-body="true"
>
<div class="liebiao" style="margin-top: 24px;">
<div class="liebiao" style="margin-top: 24px">
<div class="fahuo-li">
<div class="a">
<div class="sd">
<div class="fa-ji">产品货运单号</div>
<input type="text" placeholder="请输入产品货运单号" class="input" />
<input
type="text"
placeholder="请输入产品货运单号"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">联系人</div>
<input
type="text"
v-model="linkman"
placeholder="请输入联系人"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">承运单位</div>
<input type="text" placeholder="请输入承运单位" class="input" />
<input
type="text"
v-model="carrier"
placeholder="请输入承运单位"
class="input"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">电站</div>
<input type="text" placeholder="请输入电站" class="input" />
<input
type="text"
v-model="powerPlant"
placeholder="请输入电站"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">联系人电话</div>
<input type="text" placeholder="请输入联系人电话" class="input" />
<input
type="text"
v-model="linkmanPhone"
placeholder="请输入联系人电话"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">车辆牌号</div>
<input type="text" placeholder="请输入车辆牌号" class="input" />
<input
type="text"
v-model="carnum"
placeholder="请输入车辆牌号"
class="input"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">售货员</div>
<input type="text" placeholder="请输入售货员" class="input" />
<input
type="text"
v-model="salesman"
placeholder="请输入售货员"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">派车单编码</div>
<input type="text" placeholder="请输入派车单编码" class="input" />
<input
type="text"
v-model="sectCarList"
placeholder="请输入派车单编码"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">车辆负责人</div>
<input type="text" placeholder="请输入车辆负责人" class="input" />
<input
type="text"
v-model="carPearson"
placeholder="请输入车辆负责人"
class="input"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">售货员电话</div>
<input type="text" placeholder="请输入售货员电话" class="input" />
<input
type="text"
v-model="salePhone"
placeholder="请输入售货员电话"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">合同号</div>
<input type="text" placeholder="请输入合同号" class="input" />
<input
type="text"
v-model="pact"
placeholder="请输入合同号"
class="input"
/>
</div>
</div>
</div>
... ... @@ -175,19 +222,19 @@
</div>
<div class="lista">
<el-table
:data="tablelist"
:data="tableData"
border
style="width: 100%"
height="100%"
:header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
>
<el-table-column fixed prop="date" label="产品型号" width="292">
<el-table-column fixed :prop="date" label="产品型号" width="292">
</el-table-column>
<el-table-column prop="name" label="产品编号" width="292">
<el-table-column :prop="name" label="产品编号" width="292">
</el-table-column>
<el-table-column prop="province" label="产品数量" width="292">
<el-table-column :prop="province" label="产品数量" width="292">
</el-table-column>
<el-table-column prop="city" label="要求到货时间" width="292">
<el-table-column :prop="city" label="要求到货时间" width="292">
</el-table-column>
<el-table-column fixed="right" label="操作" width="292">
... ... @@ -206,40 +253,68 @@
<div class="a">
<div class="sd">
<div class="fa-ji">总件数</div>
<input type="text" placeholder="请输入总件数" class="input" />
<input
type="text"
v-model="allTotals"
placeholder="请输入总件数"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">制单人</div>
<input type="text" placeholder="请输入制单人" class="input" />
<input
type="text"
v-model="madeListman"
placeholder="请输入制单人"
class="input"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">发货单位电话</div>
<input type="text" placeholder="请输入发货单位电话" class="input" />
<input
v-model="shippingPhone"
type="text"
placeholder="请输入发货单位电话"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">制单时间</div>
<input type="text" placeholder="请输入制单时间" class="input" />
<input
type="text"
v-model="madeListTime"
placeholder="请输入制单时间"
class="input"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">发货单位传真</div>
<input type="text" placeholder="请输入发货单位传真" class="input" />
<input
type="text"
placeholder="请输入发货单位传真"
class="input"
v-model="shippingFax"
/>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">打印状态</div>
<input type="text" placeholder="请输入打印状态" class="input" />
<input type="radio" v-model="plotState" value="已打印" />已打印
<br />
<br />
<input type="radio" v-model="plotState" value="未打印" />未打印
</div>
</div>
</div>
<div class="queren">
<el-button type="primary" round @click="dialogVisible = false"
<el-button type="primary" round @click="sureSafingList"
>确认</el-button
>
<el-button round @click="dialogVisible = false">取消</el-button>
... ... @@ -251,64 +326,67 @@
title="产品货运单"
:visible.sync="dialogVisibleg"
width="80%"
style="margin-top: 60px;"
style="margin-top: 60px"
:append-to-body="true"
>
<div class="liebiao" style="margin-top: 24px;">
<div class="liebiao" style="margin-top: 24px">
<div class="fahuo-li">
<div class="a">
<div class="sd">
<div class="fa-ji">产品货运单号</div>
<input type="text" placeholder="请输入产品货运单号" class="input" />
<input
type="text"
placeholder="请输入产品货运单号"
class="input"
/>
</div>
<div class="sd">
<div class="fa-ji">联系人</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.linkman }}</div>
</div>
<div class="sd">
<div class="fa-ji">承运单位</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.carrier }}</div>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">电站</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.powerPlant }}</div>
</div>
<div class="sd">
<div class="fa-ji">联系人电话</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.linkmanPhone }}</div>
</div>
<div class="sd">
<div class="fa-ji">车辆牌号</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.carnum }}</div>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">售货员</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.salesman }}</div>
</div>
<div class="sd">
<div class="fa-ji">派车单编码</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.sectCarList }}</div>
</div>
<div class="sd">
<div class="fa-ji">车辆负责人</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.carPearson }}</div>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">售货员电话</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.salePhone }}</div>
</div>
<div class="sd">
<div class="fa-ji">合同号</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.pact }}</div>
</div>
</div>
</div>
... ... @@ -324,13 +402,18 @@
height="100%"
:header-cell-style="{ background: '#F4F4F5', color: '#303133' }"
>
<el-table-column fixed prop="date" label="产品型号" width="292">
<el-table-column
fixed
prop="item.date"
label="产品型号"
width="292"
>
</el-table-column>
<el-table-column prop="name" label="产品编号" width="292">
<el-table-column prop="item.name" label="产品编号" width="292">
</el-table-column>
<el-table-column prop="province" label="产品数量" width="292">
<el-table-column prop="item.province" label="产品数量" width="292">
</el-table-column>
<el-table-column prop="city" label="要求到货时间" width="292">
<el-table-column prop="item.city" label="要求到货时间" width="292">
</el-table-column>
<el-table-column fixed="right" label="操作" width="292">
... ... @@ -349,50 +432,48 @@
<div class="a">
<div class="sd">
<div class="fa-ji">总件数</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.allTotals }}</div>
</div>
<div class="sd">
<div class="fa-ji">制单人</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.madeListman }}</div>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">发货单位电话</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.shippingPhone }}</div>
</div>
<div class="sd">
<div class="fa-ji">制单时间</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.madeListTime }}</div>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">发货单位传真</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.shippingFax }}</div>
</div>
</div>
<div class="a">
<div class="sd">
<div class="fa-ji">打印状态</div>
<div class="conrt">内容文字</div>
<div class="conrt">{{ poltShippingList.plotState }}</div>
</div>
</div>
</div>
<div class="queren">
<el-button type="primary" round @click="dialogVisibleg = false"
<el-button type="primary" round @click="dialogVisibleg = false"
>打印</el-button
>
<el-button type="primary" round @click="dialogVisibleg = false"
>确认</el-button
>
</div>
</div>
</el-dialog>
</div>
</template>
... ... @@ -400,6 +481,26 @@
export default {
data() {
return {
linkman: '',
salesman: '',
sectCarList: '',
carPearson: '',
salePhone: '',
pact: '',
carrier: '',
powerPlant: '',
linkmanPhone: '',
carnum: '',
allTotals: '',
madeListman: '',
shippingPhone: '',
madeListTime: '',
shippingFax: '',
plotState: '',
listIndex: '',
/**打印货运单 */
poltShippingList: {},
/**********************************************/
tableData: [
{
date: "P2112020092300",
... ... @@ -415,82 +516,9 @@ export default {
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
zip: "重庆市南岸区长生桥镇长生路46号附2号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
},
],
tableData: [
{
date: "P2112020092300",
name: "P2112020092300",
province: "北京电站",
city: "赵吾光",
address: "178 2038 0191",
zip: "重庆市南岸区长生桥镇长生路46号附1号",
}
],
dialogVisible: false,
dialogVisibleg: false,
... ... @@ -501,7 +529,7 @@ export default {
dialogVisiblex: false,
};
},
mounted(){
mounted() {
console.log('111')
},
methods: {
... ... @@ -531,15 +559,83 @@ export default {
this.dialogVisibleyu = true;
},
//返回上一层
fanhuis(){
fanhuis() {
this.dialogVisibleh = false;
this.dialogVisibleyu = true;
},
//* 确定编写运货单 *
sureSafingList() {
let safinglistObj = [
{
linkman: this.linkman,
salesman: this.salesman,
sectCarList: this.sectCarList,
carPearson: this.carPearson,
salePhone: this.salePhone,
pact: this.pact,
carrier: this.carrier,
powerPlant: this.powerPlant,
linkmanPhone: this.linkmanPhone,
carnum: this.carnum,
allTotals: this.allTotals,
madeListman: this.madeListman,
shippingPhone: this.shippingPhone,
madeListTime: this.madeListTime,
shippingFax: this.shippingFax,
plotState: this.plotState
}
]
let listIndex = this.listIndex
this.$store.commit('upSafingList', { safinglistObj, listIndex })
this.linkman = '',
this.salesman = '',
this.sectCarList = '',
this.carPearson = '',
this.salePhone = '',
this.pact = '',
this.carrier = '',
this.powerPlant = '',
this.linkmanPhone = '',
this.carnum = '',
this.allTotals = '',
this.madeListman = '',
this.shippingPhone = '',
this.madeListTime = '',
this.shippingFax = '',
this.plotState = '',
this.listIndex = ''
this.dialogVisible = false;
this.$message({
showClose: true,
type: 'success',
message: '编写成功'
})
},
//编写yun'da
safiingList(idx) {
this.dialogVisible = true
this.listIndex = idx
},
//打印货运单
plot(idx) {
if (this.$store.state.safiingList[idx]) {
this.poltShippingList = this.$store.state.safiingList[idx][0]
this.dialogVisibleg = true
} else {
this.$message({
showClose: true,
type: 'error',
message: '还未编辑'
})
}
}
},
};
</script>
<style>
.el-dialog__title {
font-size: 29px !important;
color: #000000 !important;
... ... @@ -555,10 +651,10 @@ export default {
height: 107px !important;
line-height: 107px !important;
}
.el-carousel__container{
margin-top: 52px;
height: 629px;
}
.el-carousel__container {
margin-top: 52px;
height: 629px;
}
</style>
<style scoped>
@import "../../css/fa.css";
... ...
... ... @@ -5,21 +5,28 @@ import App from './App'
import router from './router'
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import store from './vuex/store'
Vue.use(ElementUI);
Vue.config.productionTip = false
import axios from "./common.js";
Vue.prototype.$axios = axios;
Vue.config.productionTip = false
if (sessionStorage.getItem("token")) {
axios.defaults.headers.common["Authorization"] = sessionStorage.getItem("token");
axios.defaults.headers.common["Authorization"] = sessionStorage.getItem("token");
}
/* eslint-disable no-new */
new Vue({
el: '#app',
router,
components: { App },
store,
components: {
App
},
template: '<App/>'
})
console.log(process.env.VUE_APP_URL)
\ No newline at end of file
console.log(process.env.VUE_APP_URL)
... ...
import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
export default new Vuex.Store({
state: {
safiingList: {}
},
getters: {
},
//改变state
mutations: {
/**** 发货订单 ***/
upSafingList(state, obj) {
state.safiingList[obj.listIndex] = obj.safinglistObj
}
}
})
... ...